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=JTGOMXJe; 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 8D4E85A0280 for ; Mon, 26 May 2025 16:20:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748269208; 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=nW3iZeQH0BheI50lKz+Q/nWt7RpUKzgfKf7iZXrbGmg=; b=JTGOMXJeGgDTOpt/VhaKWVjcnttPWeqnhZenFh7ecklMkI6LY0a99S4LO/DcPDo/ArFcME 6i7CzMN/Kxro26p5yOHgdBj0cztbKQEHrM+XFhpCu31MJjuqq0D5EOpmhfdcF5WdWNldu1 suplRR1PtTzQ4FYNIQ5F3V5JtK/NkSw= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-48-bLMN9ya5MwmitRsMZCVg1g-1; Mon, 26 May 2025 10:20:07 -0400 X-MC-Unique: bLMN9ya5MwmitRsMZCVg1g-1 X-Mimecast-MFC-AGG-ID: bLMN9ya5MwmitRsMZCVg1g_1748269206 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-44b1f5b91c1so17409665e9.1 for ; Mon, 26 May 2025 07:20:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748269205; x=1748874005; h=content-transfer-encoding:mime-version:organization:references :in-reply-to:message-id:subject:cc:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=nW3iZeQH0BheI50lKz+Q/nWt7RpUKzgfKf7iZXrbGmg=; b=N9e1qtmB7gr8MwyB9dOzdtz+b9FdaOWizOA4dpmBwZpgOFc4RnkjTBkPDWwKwU0RNg jmghL/8Seai+ze0HaRZi+QaMHHpdO9Oan2Mmu21pQrLZ81++zc0iHCfsDKMR1ET4rxxW jvQ/IBSjAaIwqcmWrEV4Ubl2gJaWBn0yj+rjXcuKWPY5Kr7NWcpvKmlQRPyLLeqe+f03 R/ZJZjELchRqsz0WeLBzRJjmYciv9otrnWbN/TharEBj/htCerguQf+0RHHDJP6Ui6TY DXR4WFN/e7R8vR8TbioV5MMZJDCTb6zUCWZaoRDUou8aS0XJMNH9stFaSW7EaIv86lPy Pv/A== X-Gm-Message-State: AOJu0YzQLVFwh6GKiwHFsTl5kqB3sYZ1tOC1MdQOtZsXNgVHFQjHO/eO /vJqeCI1uF/a74oxjRYPdz1MvKG/lqB28BBOBXJZwn1s2IzOFDsaHnObuKMavCuoYLE+E2foUPE /tkE/HiW3dyxjaA8xoKTmzDiDdTmpxsqShF4/5UdalbC/Z5s+O31oEeR8E/+LZLiqHj0lG5dAIX sXkgTH1aTSl//uq4/XOXX385IKKVed9/whJg9F X-Gm-Gg: ASbGncvp8C+1LRswKCXUWHEOyPq6vQvZtWok35rzil8GRrGEYtf2SM7GeiNlpQqYdkQ ICP+ruVqEgDBud4uFDaBoJcdmQIG09ND+MHh2cQ4yMj4mrmpOwOOKfwst6dIrYqBzpHuqD6Q2lO I854wDe3zlNBGkfyClFduPspq+Eyvn9tJyB4FVfUYmmtBIJFHiHHsHwofwurNI3WYj7dcGT2iKr 6j56igoal47DPlv0WLIvEW7eJm1ToK9btF6MlcNKBHKZCVtfS6x/lQsOB/HHXOds6AAwhFfNrEL JQbMskNHSDFw1meoeOuGVpc= X-Received: by 2002:a05:600c:3f07:b0:442:f4d4:522 with SMTP id 5b1f17b1804b1-44c916072e2mr69015455e9.5.1748269205484; Mon, 26 May 2025 07:20:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFHgNlHVUGS/AMHUTCulg0lUjMk3YdHJPG4KhO4ugjrQh4595LP/RAcsbxiQRg2AELX9S06UQ== X-Received: by 2002:a05:600c:3f07:b0:442:f4d4:522 with SMTP id 5b1f17b1804b1-44c916072e2mr69015125e9.5.1748269205029; Mon, 26 May 2025 07:20:05 -0700 (PDT) Received: from maya.myfinge.rs (ifcgrfdd.trafficplex.cloud. [2a10:fc81:a806:d6a9::1]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-447f6f04334sm234546685e9.10.2025.05.26.07.20.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 May 2025 07:20:04 -0700 (PDT) Date: Mon, 26 May 2025 16:20:03 +0200 From: Stefano Brivio To: Laurent Vivier Subject: Re: [PATCH v5 09/29] icmp: Convert to iov_tail Message-ID: <20250526162003.1a10b9d6@elisabeth> In-Reply-To: <20250417165136.2688884-10-lvivier@redhat.com> References: <20250417165136.2688884-1-lvivier@redhat.com> <20250417165136.2688884-10-lvivier@redhat.com> Organization: Red Hat X-Mailer: Claws Mail 4.2.0 (GTK 3.24.49; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: d_MzXBdB2ZEaSN504PFnFIthLm3Sid74fwM89PFOMmU_1748269206 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Message-ID-Hash: HDIN24CTJXLYMAHFOERCIRCEDNRRRE4Y X-Message-ID-Hash: HDIN24CTJXLYMAHFOERCIRCEDNRRRE4Y X-MailFrom: sbrivio@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: passt-dev@passt.top 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: On Thu, 17 Apr 2025 18:51:16 +0200 Laurent Vivier wrote: > Use packet_data() 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 | 25 ++++++++++++++----------- > iov.c | 23 +++++++++++++++++++++++ > iov.h | 2 ++ > 3 files changed, 39 insertions(+), 11 deletions(-) > > diff --git a/icmp.c b/icmp.c > index 7e2b3423a8d1..d27d860b4af4 100644 > --- a/icmp.c > +++ b/icmp.c > @@ -241,25 +241,27 @@ 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_data(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))) > + ih = IOV_PEEK_HEADER(&data, ihc); > + if (!ih) > return 1; > > - ih = (struct icmphdr *)pkt; > - l4len = dlen + sizeof(*ih); > - > if (ih->type != ICMP_ECHO) > return 1; > > @@ -268,13 +270,12 @@ 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))) > + ih = IOV_PEEK_HEADER(&data, ihc); > + if (!ih) > return 1; > > - ih = (struct icmp6hdr *)pkt; > - l4len = dlen + sizeof(*ih); > - > if (ih->icmp6_type != ICMPV6_ECHO_REQUEST) > return 1; > > @@ -298,8 +299,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, sl); > + 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 334551833edc..bb095634246e 100644 > --- a/iov.c > +++ b/iov.c > @@ -210,6 +210,29 @@ ssize_t 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 Nit: I think "to source msg_iov and msg_iovlen from" would be clearer because it clearly indicates how iov_tail is used. Then I realised that this goes away in 24/29 so... never mind. > + * @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 b15a300131b9..ffbcb0bac350 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, 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); -- Stefano