From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202502 header.b=Pb2rbQ5J; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 123265A0276 for ; Thu, 03 Apr 2025 07:38:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202502; t=1743658684; bh=4guQm0pRni0KPyWbLAKKTp7MiEEnH/WZ78WNyum4CoY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Pb2rbQ5Jt0k5dfCywPT1GtFsY9XdarFUYeq5VZ5FXPQE2x00y6A54QYNrDvw9rzlI gmjv9EaSNhrMVulkXgMnEMp9vF58XQGDw5KcwkxKfyDwN5qIXhnVyHn+JeUgvO8Af6 ivQ5iUvaf7FooieDjhtzSeax1RnjFWDEJTkRoaDQCPrYY/077ktAS63ENreJ5gE9/a q8iX2eQJZT4XlyCTlhDA65Gh/B1bEFsI0Ga1GvE979NNBPBd6P3Vv8XylnULtufDxT l2LLwVa4VP7NvyHspvC68gkDYA/IMxuRA8rV9i3S23RMVk2jE+S73s7q+VKDNdFhib bARXiLGOy+AEg== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4ZSr9m5QfQz4x8S; Thu, 3 Apr 2025 16:38:04 +1100 (AEDT) Date: Thu, 3 Apr 2025 16:04:03 +1100 From: David Gibson To: Laurent Vivier Subject: Re: [PATCH 08/18] icmp: Convert to iov_tail Message-ID: References: <20250402172343.858187-1-lvivier@redhat.com> <20250402172343.858187-9-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="K7O+bR9E2hR9zXGn" Content-Disposition: inline In-Reply-To: <20250402172343.858187-9-lvivier@redhat.com> Message-ID-Hash: Q7K6OMVA7GCM5KCCIPXANZVNUCJUFLMN X-Message-ID-Hash: Q7K6OMVA7GCM5KCCIPXANZVNUCJUFLMN 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: 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: --K7O+bR9E2hR9zXGn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Apr 02, 2025 at 07:23:33PM +0200, Laurent Vivier wrote: > Use packet_base() and extract headers using IOV_PEEK_HEADER() > rather than packet_get(). >=20 > Signed-off-by: Laurent Vivier > --- > icmp.c | 38 +++++++++++++++++++++++--------------- > 1 file changed, 23 insertions(+), 15 deletions(-) >=20 > diff --git a/icmp.c b/icmp.c > index 7e2b3423a8d1..119502c0c340 100644 > --- a/icmp.c > +++ b/icmp.c > @@ -241,24 +241,25 @@ int icmp_tap_handler(const struct ctx *c, uint8_t p= if, 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; > =20 > (void)saddr; > ASSERT(pif =3D=3D PIF_TAP); > =20 > + if (!packet_base(p, 0, &data)) > + return -1; > + > if (af =3D=3D AF_INET) { > const struct icmphdr *ih; > + struct icmphdr ihc; > =20 > - if (!(pkt =3D packet_get(p, 0, 0, sizeof(*ih), &dlen))) > - return 1; > - > - ih =3D (struct icmphdr *)pkt; > - l4len =3D dlen + sizeof(*ih); > + ih =3D IOV_PEEK_HEADER(&data, ihc); > + if (!ih) > + return -1; > =20 > if (ih->type !=3D ICMP_ECHO) > return 1; > @@ -268,12 +269,11 @@ int icmp_tap_handler(const struct ctx *c, uint8_t p= if, sa_family_t af, > seq =3D ntohs(ih->un.echo.sequence); > } else if (af =3D=3D AF_INET6) { > const struct icmp6hdr *ih; > + struct icmp6hdr ihc; > =20 > - if (!(pkt =3D packet_get(p, 0, 0, sizeof(*ih), &dlen))) > - return 1; > - > - ih =3D (struct icmp6hdr *)pkt; > - l4len =3D dlen + sizeof(*ih); > + ih =3D IOV_PEEK_HEADER(&data, ihc); > + if (!ih) > + return -1; > =20 > if (ih->icmp6_type !=3D ICMPV6_ECHO_REQUEST) > return 1; > @@ -298,8 +298,16 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pi= f, sa_family_t af, > ASSERT(flow_proto[pingf->f.type] =3D=3D proto); > pingf->ts =3D now->tv_sec; > =20 > - pif_sockaddr(c, &sa, &sl, PIF_HOST, &tgt->eaddr, 0); > - if (sendto(pingf->sock, pkt, l4len, MSG_NOSIGNAL, &sa.sa, sl) < 0) { > + ASSERT(data.off =3D=3D 0); > + msh.msg_name =3D &sa; > + msh.msg_iov =3D (struct iovec *)data.iov; > + msh.msg_iovlen =3D data.cnt; > + msh.msg_control =3D NULL; > + msh.msg_controllen =3D 0; > + msh.msg_flags =3D 0; I think we're going to want a helper to build a msghdr from an iov_tail. > + > + 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, --=20 David Gibson (he or they) | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you, not the other way | around. http://www.ozlabs.org/~dgibson --K7O+bR9E2hR9zXGn Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmfuFsIACgkQzQJF27ox 2GdMVg//etjz+2SsR/3AdtwQkjkwV6LD6SI20YvBHJKqoc8eGHMnUtfbG8aFBh6K 9pRx99h0xGywYT0JufvU0ILZcNHqyXi0Mty3rlJ5BWl24D4Y1nKQQnhfyCJK6BZw ws8vawVkXb9/XKWSOGxfQf5VoMPNWif+5zFq03Ii7UjG3byGEwd7p22DsVMDLbt1 iIfEU0d4oVZvBc1uZoCtvvF0pcDfuEiXnPtsVuoYC8bxvaT+uuJUDkVweVkD7jWK uqcR7DaMRt8YQ0Od62CM/4XYfLqWipBenRTI0kXSSGZZVlt4/JzYGLJc5qVq7Xw9 lQPWB2R7iLqI4l6uYFGk4FzSZOBy0s69b4kQqML798fKHpy2S+Rk03J1d1G7Ua6x roTjDuxOYN9YG72yj6lq1gWnABHT+0wr7Yr6yYJOoGdtOBp4dtfVbLzrXD3DKG/4 VRkv/qlYOPzcTq1asCTMGiYIhMpNS7SJgoHumE0lHtKOxCHFqIeY4XOVmvouVzq1 M2ZKsarDLmTudF6MV3DesbQCvlwD6SU1WEGLaa/5ddlRELWYtlRWlmBr+GstgF51 oRGTHIIV+uQtFB4VHPPACH2OiwFZBK8+gxdIF9H9rzeVlDERPgZPun9AFJacH6XE wotJ9hJA7jEyD5BcqQ+JwwBx8uZJDyZHnNT6TcIOB3YkE0GHLG4= =W6si -----END PGP SIGNATURE----- --K7O+bR9E2hR9zXGn--