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=LIL1u7K7; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTPS id 06F855A0288 for ; Mon, 23 Jun 2025 13:07:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750676849; 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=osXKgY92zBuibXrEXF/4CV1Ym4CXQXWvMBNNIQzYSnw=; b=LIL1u7K7kokrfwzdQJmuZxuLdtf/gQ74nBQGpY8A0lj/jnKkoYZBEejtoCPGVSDQQdruIg uY6X2QY5kxgORikICkG23tUuxZ7xd9g2JBeklOeraWyxCigwBg2PjBZRmRz9VTM9o+cJQy kMlchmKjJiN0unzkIaYstDyqj6bUZ78= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-448-Q2oKddm8MjuZ5r_bP3uhIg-1; Mon, 23 Jun 2025 07:07:27 -0400 X-MC-Unique: Q2oKddm8MjuZ5r_bP3uhIg-1 X-Mimecast-MFC-AGG-ID: Q2oKddm8MjuZ5r_bP3uhIg_1750676847 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EE92019560B6 for ; Mon, 23 Jun 2025 11:07:26 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.45.224.132]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DC09F1956096; Mon, 23 Jun 2025 11:07:25 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH v7 26/31] icmp: use iov_tail rather than pool Date: Mon, 23 Jun 2025 13:06:30 +0200 Message-ID: <20250623110635.1478625-27-lvivier@redhat.com> In-Reply-To: <20250623110635.1478625-1-lvivier@redhat.com> References: <20250623110635.1478625-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: qQrCUTrqsY-_GFBz9hDQvfwGZ--8QFmH8aj38A9nKyY_1750676847 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: I2VQ7UB434PQORK2PR5STXU4UWROXBTN X-Message-ID-Hash: I2VQ7UB434PQORK2PR5STXU4UWROXBTN 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 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: As the iov_tail has a non zero offset (because of the presence of packet headers in the iov array), we must copy it to a new iov array (using iov_tail_splice()) to pass it to sendmsg(). We cannot use anymore iov_tail_msghdr(), so remove it. Signed-off-by: Laurent Vivier --- icmp.c | 30 +++++++++++++++++++----------- icmp.h | 2 +- iov.c | 23 ----------------------- iov.h | 2 -- tap.c | 7 ++----- 5 files changed, 22 insertions(+), 42 deletions(-) diff --git a/icmp.c b/icmp.c index 71c496540310..be800e30c369 100644 --- a/icmp.c +++ b/icmp.c @@ -44,6 +44,7 @@ #define ICMP_ECHO_TIMEOUT 60 /* s, timeout for ICMP socket activity */ #define ICMP_NUM_IDS (1U << 16) +#define MAX_IOV_ICMP 16 /* Arbitrary, should be enough */ /** * ping_at_sidx() - Get ping specific flow at given sidx @@ -229,36 +230,33 @@ 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; uint8_t proto; - socklen_t sl; + int cnt; (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; @@ -272,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; @@ -286,6 +284,10 @@ 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); + if (cnt < 0) + return 1; + flow = flow_at_sidx(flow_lookup_af(c, proto, PIF_TAP, af, saddr, daddr, id, id)); @@ -300,8 +302,14 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, pingf->ts = now->tv_sec; - pif_sockaddr(c, &sa, &sl, PIF_HOST, &tgt->eaddr, 0); - iov_tail_msghdr(&msh, &data, &sa, sl); + pif_sockaddr(c, &sa, &msh.msg_namelen, PIF_HOST, &tgt->eaddr, 0); + msh.msg_name = &sa; + msh.msg_iov = iov; + msh.msg_iovlen = cnt; + msh.msg_control = NULL; + msh.msg_controllen = 0; + msh.msg_flags = 0; + if (sendmsg(pingf->sock, &msh, MSG_NOSIGNAL) < 0) { flow_dbg_perror(pingf, "failed to relay request to socket"); } else { 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/iov.c b/iov.c index c9b32befeb83..98350fb9690e 100644 --- a/iov.c +++ b/iov.c @@ -157,29 +157,6 @@ size_t iov_size(const struct iovec *iov, size_t iov_cnt) return len; } -/** - * iov_tail_msghdr - Initialize a msghdr from an IOV tail structure - * @msh: msghdr to initialize - * @tail: iov_tail to use to set msg_iov and msg_iovlen - * @msg_name: Pointer to set to msg_name - * @msg_namelen: Size of @msg_name - */ -void iov_tail_msghdr(struct msghdr *msh, struct iov_tail *tail, - void *msg_name, socklen_t msg_namelen) -{ - iov_tail_prune(tail); - - ASSERT(tail->off == 0); - - msh->msg_name = msg_name; - msh->msg_namelen = msg_namelen; - msh->msg_iov = (struct iovec *)tail->iov; - msh->msg_iovlen = tail->cnt; - msh->msg_control = NULL; - msh->msg_controllen = 0; - msh->msg_flags = 0; -} - /** * iov_tail_prune() - Remove any unneeded buffers from an IOV tail * @tail: IO vector tail (modified) diff --git a/iov.h b/iov.h index 75c3b07a87e3..ccdb690ef3f1 100644 --- a/iov.h +++ b/iov.h @@ -82,8 +82,6 @@ struct iov_tail { 1, \ (off_)) -void iov_tail_msghdr(struct msghdr *msh, struct iov_tail *tail, - void *msg_name, socklen_t msg_namelen); bool iov_tail_prune(struct iov_tail *tail); size_t iov_tail_size(struct iov_tail *tail); bool iov_tail_drop(struct iov_tail *tail, size_t len); 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