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=HA6+MG64; 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 604665A0008 for ; Fri, 11 Apr 2025 15:10:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744377053; 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=k/kXFL8B2Xigpdm2SoAu3w32LwW+IvvCuTf+QNz6/e8=; b=HA6+MG64Vagfzw1RWDmVxCHb54bVp9DpzDYZc5pV3STQxbF9pac5xQ/cvdJ8npOZh8SoCh SZeoYtEVaAtBtpKNOVzRio8DHLRMhZkZ3emfF59yFfWG9cuYm7gkrBYWl5srm7iUbeIyG4 lMFbE0BrUSC1E5AP47DinpNK+1dk5xM= Received: from mx-prod-mc-02.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-14-L1Vjeje6Mla0QedTDkncSg-1; Fri, 11 Apr 2025 09:10:52 -0400 X-MC-Unique: L1Vjeje6Mla0QedTDkncSg-1 X-Mimecast-MFC-AGG-ID: L1Vjeje6Mla0QedTDkncSg_1744377051 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 75C2219560AB for ; Fri, 11 Apr 2025 13:10:51 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.44.32.165]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5734019560AD; Fri, 11 Apr 2025 13:10:50 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH v2 09/20] icmp: Convert to iov_tail Date: Fri, 11 Apr 2025 15:10:19 +0200 Message-ID: <20250411131031.1398006-10-lvivier@redhat.com> In-Reply-To: <20250411131031.1398006-1-lvivier@redhat.com> References: <20250411131031.1398006-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: S38TqcUu58XvBZROv2cHpLbZ5docsoS7HXTLQ54cMiw_1744377051 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: Q6U7IDMFKAPBRRKGNNC536EPWGNOEEON X-Message-ID-Hash: Q6U7IDMFKAPBRRKGNNC536EPWGNOEEON 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: Use packet_base() and extract headers using IOV_PEEK_HEADER() rather than packet_get(). Introduce iov_tail_msghdr() to convert iov_tail to msghdr Signed-off-by: Laurent Vivier --- icmp.c | 32 +++++++++++++++++--------------- iov.c | 21 +++++++++++++++++++++ iov.h | 2 ++ 3 files changed, 40 insertions(+), 15 deletions(-) diff --git a/icmp.c b/icmp.c index 7e2b3423a8d1..64ad738b6809 100644 --- a/icmp.c +++ b/icmp.c @@ -241,24 +241,25 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, struct icmp_ping_flow *pingf; const struct flowside *tgt; union sockaddr_inany sa; - size_t dlen, l4len; + struct iov_tail data; + struct msghdr msh; uint16_t id, seq; union flow *flow; uint8_t proto; - socklen_t sl; - void *pkt; (void)saddr; ASSERT(pif == PIF_TAP); + if (!packet_base(p, 0, &data)) + return -1; + if (af == AF_INET) { const struct icmphdr *ih; + struct icmphdr ihc; - if (!(pkt = packet_get(p, 0, 0, sizeof(*ih), &dlen))) - return 1; - - ih = (struct icmphdr *)pkt; - l4len = dlen + sizeof(*ih); + ih = IOV_PEEK_HEADER(&data, ihc); + if (!ih) + return -1; if (ih->type != ICMP_ECHO) return 1; @@ -268,12 +269,11 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, seq = ntohs(ih->un.echo.sequence); } else if (af == AF_INET6) { const struct icmp6hdr *ih; + struct icmp6hdr ihc; - if (!(pkt = packet_get(p, 0, 0, sizeof(*ih), &dlen))) - return 1; - - ih = (struct icmp6hdr *)pkt; - l4len = dlen + sizeof(*ih); + ih = IOV_PEEK_HEADER(&data, ihc); + if (!ih) + return -1; if (ih->icmp6_type != ICMPV6_ECHO_REQUEST) return 1; @@ -298,8 +298,10 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, sa_family_t af, ASSERT(flow_proto[pingf->f.type] == proto); pingf->ts = now->tv_sec; - pif_sockaddr(c, &sa, &sl, PIF_HOST, &tgt->eaddr, 0); - if (sendto(pingf->sock, pkt, l4len, MSG_NOSIGNAL, &sa.sa, sl) < 0) { + iov_tail_msghdr(&msh, &data, &sa); + + pif_sockaddr(c, &sa, &msh.msg_namelen, PIF_HOST, &tgt->eaddr, 0); + if (sendmsg(pingf->sock, &msh, MSG_NOSIGNAL) < 0) { flow_dbg_perror(pingf, "failed to relay request to socket"); } else { flow_dbg(pingf, diff --git a/iov.c b/iov.c index 98d5fecbdc8f..9e3786e6efe8 100644 --- a/iov.c +++ b/iov.c @@ -210,6 +210,27 @@ int iov_slice(struct iovec *dst_iov, size_t dst_iov_cnt, return j; } +/** + * 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 + */ +void iov_tail_msghdr(struct msghdr *msh, struct iov_tail *tail, + void *msg_name) +{ + iov_tail_prune(tail); + + ASSERT(tail->off == 0); + + msh->msg_name = msg_name; + 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 b412a96b1090..acba2ea4240b 100644 --- a/iov.h +++ b/iov.h @@ -83,6 +83,8 @@ struct iov_tail { #define IOV_TAIL_FROM_BUF(buf_, len_, off_) \ IOV_TAIL((&(const struct iovec){ .iov_base = (buf_), .iov_len = (len_) }), 1, (off_)) +void iov_tail_msghdr(struct msghdr *msh, struct iov_tail *tail, + void *msg_name); 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); -- 2.49.0