From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Z/rtuRA2; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by passt.top (Postfix) with ESMTPS id D1DB85A0288 for ; Fri, 08 Aug 2025 16:03:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754661780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l+ScgVcyOCHGqy05cyZ/cQk2CAxQlZSf/+OpIdlwxB4=; b=Z/rtuRA2tgjMIEG9KNXZNti4fJM4Qxf2Q6ydtkHM0PB70eZYjHqGSdU6oVqtm4yvoy48Io QhBCI0b68vVjS0pDZ1uy5JhqGDeqIpnmzqK8oQD3eXps1snxhWAnrDKT0xDT8rIlooFh/8 e83hw3xcIaEeCZT898HC8F9UE5xagF8= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-591-IqhKH9uCPGiynqcjxq4BPA-1; Fri, 08 Aug 2025 10:02:57 -0400 X-MC-Unique: IqhKH9uCPGiynqcjxq4BPA-1 X-Mimecast-MFC-AGG-ID: IqhKH9uCPGiynqcjxq4BPA_1754661776 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5A79D180AD7E; Fri, 8 Aug 2025 14:02:41 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.45.225.81]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F334A1954199; Fri, 8 Aug 2025 14:02:39 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH v9 25/30] icmp: use iov_tail rather than pool Date: Fri, 8 Aug 2025 16:01:37 +0200 Message-ID: <20250808140142.3404325-26-lvivier@redhat.com> In-Reply-To: <20250808140142.3404325-1-lvivier@redhat.com> References: <20250808140142.3404325-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: pk8xK8oCwpHWFP7IjcWj5jo1QwEgRxil_lrc9gzxppY_1754661776 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: WLV3I22NKFZK3JKSZPWP7LXN7Z3UDI2D X-Message-ID-Hash: WLV3I22NKFZK3JKSZPWP7LXN7Z3UDI2D X-MailFrom: lvivier@redhat.com 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: Laurent Vivier , 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: This patch refactors the icmp_tap_handler() function to accept `struct iov_tail *data` directly as its packet input, replacing the `const struct pool *p` parameter. This change simplifies callers, such as tap4_handler(), which now pass the iov_tail representing the L4 ICMP message directly. This removes the need for intermediate packet pool handling. Signed-off-by: Laurent Vivier Reviewed-by: David Gibson --- icmp.c | 14 +++++--------- icmp.h | 2 +- tap.c | 7 ++----- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/icmp.c b/icmp.c index 9d90141542ff..6dffafb0bf54 100644 --- a/icmp.c +++ b/icmp.c @@ -230,20 +230,19 @@ cancel: * @af: Address family, AF_INET or AF_INET6 * @saddr: Source address * @daddr: Destination address - * @p: Packet pool, single packet with ICMP/ICMPv6 header + * @data: Single packet with ICMP/ICMPv6 header * @now: Current timestamp * * Return: count of consumed packets (always 1, even if malformed) */ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, const void *saddr, const void *daddr, - const struct pool *p, const struct timespec *now) + struct iov_tail *data, const struct timespec *now) { struct iovec iov[MAX_IOV_ICMP]; struct icmp_ping_flow *pingf; const struct flowside *tgt; union sockaddr_inany sa; - struct iov_tail data; struct msghdr msh; uint16_t id, seq; union flow *flow; @@ -253,14 +252,11 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, (void)saddr; ASSERT(pif == PIF_TAP); - if (!packet_get(p, 0, &data)) - return -1; - if (af == AF_INET) { struct icmphdr ih_storage; const struct icmphdr *ih; - ih = IOV_PEEK_HEADER(&data, ih_storage); + ih = IOV_PEEK_HEADER(data, ih_storage); if (!ih) return 1; @@ -274,7 +270,7 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, struct icmp6hdr ih_storage; const struct icmp6hdr *ih; - ih = IOV_PEEK_HEADER(&data, ih_storage); + ih = IOV_PEEK_HEADER(data, ih_storage); if (!ih) return 1; @@ -288,7 +284,7 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, ASSERT(0); } - cnt = iov_tail_clone(&iov[0], MAX_IOV_ICMP, &data); + cnt = iov_tail_clone(&iov[0], MAX_IOV_ICMP, data); if (cnt < 0) return 1; diff --git a/icmp.h b/icmp.h index 5ce22b5eca1f..d1cecb20e29d 100644 --- a/icmp.h +++ b/icmp.h @@ -14,7 +14,7 @@ struct icmp_ping_flow; void icmp_sock_handler(const struct ctx *c, union epoll_ref ref); int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, const void *saddr, const void *daddr, - const struct pool *p, const struct timespec *now); + struct iov_tail *data, const struct timespec *now); void icmp_init(void); /** diff --git a/tap.c b/tap.c index 3262b44c4287..48152a84674c 100644 --- a/tap.c +++ b/tap.c @@ -764,17 +764,14 @@ resume: continue; if (iph->protocol == IPPROTO_ICMP) { - PACKET_POOL_P(pkt, 1, in->buf, in->buf_size); - if (c->no_icmp) continue; tap_packet_debug(iph, NULL, NULL, 0, NULL, 1); - packet_add(pkt, &data); icmp_tap_handler(c, PIF_TAP, AF_INET, &iph->saddr, &iph->daddr, - pkt, now); + &data, now); continue; } @@ -964,7 +961,7 @@ resume: tap_packet_debug(NULL, ip6h, NULL, proto, NULL, 1); icmp_tap_handler(c, PIF_TAP, AF_INET6, - saddr, daddr, pkt, now); + saddr, daddr, &data, now); continue; } -- 2.49.0