From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 61E3C5A02FF for ; Fri, 3 May 2024 03:11:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1714698697; bh=MR7jSk6st3GiKYvRDD1TKeNFfFHYrkkEtjQblfqQG1A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OWkX6hBmTtcqRDPaRUNS8MNuesZwivoDD34yzHwkUnuzvSBRj+BJ5FbGnXtjsAePV YUBLNIKr+HDupL2IXYHRADzVTBXm3B6lbZwWe0VKrlkXZ1FadJLYqGfl4H7tiQQTYa B3deggcZZB2ewzqYwxgbUd5DhzlMrAeSAEPGfM037KQWY7tSUBnFCxCin2ONwubBX3 sD6N2g3Ec06d34Z69gkcjDKr0xUjoQsaiefbGt5riC261Nr10TA6fF/IMKLUZIgkJ6 o3K8w5lNZ3HkBSUVcBZNCGYxyStdrWF5fIyaqmSERIeKyhe6rkwbzNXr0d0soAwdfz GEuRHMESVS2+w== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4VVt6x6N59z4xPc; Fri, 3 May 2024 11:11:37 +1000 (AEST) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v4 13/16] icmp: Look up ping flows using flow hash Date: Fri, 3 May 2024 11:11:32 +1000 Message-ID: <20240503011135.2924437-14-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240503011135.2924437-1-david@gibson.dropbear.id.au> References: <20240503011135.2924437-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: Q52AFOOAEWV22QGZILU3YVCE43L4QUIA X-Message-ID-Hash: Q52AFOOAEWV22QGZILU3YVCE43L4QUIA X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: When we receive a ping packet from the tap interface, we currently locate the correct flow entry (if present) using an anciliary data structure, the icmp_id_map[] tables. However, we can look this up using the flow hash table - that's what it's for. Signed-off-by: David Gibson --- icmp.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/icmp.c b/icmp.c index e29416f..3b8f282 100644 --- a/icmp.c +++ b/icmp.c @@ -145,6 +145,7 @@ static void icmp_ping_close(const struct ctx *c, epoll_ctl(c->epollfd, EPOLL_CTL_DEL, pingf->sock, NULL); close(pingf->sock); + flow_hash_remove(c, FLOW_SIDX(pingf, TAPSIDE)); if (pingf->f.type == FLOW_PING4) icmp_id_map[V4][id] = NULL; @@ -213,6 +214,7 @@ static struct icmp_ping_flow *icmp_ping_new(const struct ctx *c, flow_dbg(pingf, "new socket %i for echo ID %"PRIu16, pingf->sock, id); + flow_hash_insert(c, FLOW_SIDX(pingf, TAPSIDE)); *id_sock = pingf; return pingf; @@ -243,6 +245,8 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, union sockaddr_inany sa; size_t dlen, l4len; uint16_t id, seq; + union flow *flow; + uint8_t proto; socklen_t sl; void *pkt; @@ -260,6 +264,7 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, if (ih->type != ICMP_ECHO) return 1; + proto = IPPROTO_ICMP; id = ntohs(ih->un.echo.id); id_sock = &icmp_id_map[V4][id]; seq = ntohs(ih->un.echo.sequence); @@ -275,6 +280,7 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, if (ih->icmp6_type != ICMPV6_ECHO_REQUEST) return 1; + proto = IPPROTO_ICMPV6; id = ntohs(ih->icmp6_identifier); id_sock = &icmp_id_map[V6][id]; seq = ntohs(ih->icmp6_sequence); @@ -282,12 +288,17 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, ASSERT(0); } - if (!(pingf = *id_sock)) - if (!(pingf = icmp_ping_new(c, id_sock, af, id, - pif, saddr, daddr))) - return 1; + flow = flow_at_sidx(flow_hash_lookup(c, proto, PIF_TAP, + af, saddr, daddr, id, id)); + + if (flow) + pingf = &flow->ping; + else if (!(pingf = icmp_ping_new(c, id_sock, af, id, pif, saddr, daddr))) + return 1; sockside = &pingf->f.side[SOCKSIDE]; + + ASSERT(flow_proto[pingf->f.type] == proto); pingf->ts = now->tv_sec; sockaddr_from_inany(&sa, &sl, &sockside->eaddr, 0, c->ifi6); -- 2.44.0