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=hzzB+DZ2; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 9D0045A0008 for ; Fri, 04 Apr 2025 01:27:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202502; t=1743722810; bh=F7nnY5lGi8Ze0aANOJDlR5rUsaiKIC//LUDNWiJ7Hqw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=hzzB+DZ2Gz1VUsqFPaLtuOz25CQeWM2Gin0U8gkKx8qdxlmmVH9KSzkwzhIdk1kw5 +46wCMkAYCf4Rl8LHuWL5xhzES4WJgyY7drGv4/hj2pdf4H27zAKfvSYB8KZh2U4Ut EDkNxo7vRsVQ8E0rY5KBMAK6amTqDBofI9WIz3FDFKpmj0dxp3JpKlZKOV9nXHnLK9 L/0nATE0053fy3uZm0B/aDU5JWfm5Gd6iOkxAqMcCXyzLxV7xKokpDakfqhcVLL89i pnFXL6L34jQ5hiDkiD4KhUxRD17OGrNG7jINPt7nGYABakKrW24Itz3W7TLSMOIrwJ vG5pTuEkI9rIg== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4ZTHty6wZMz4x4d; Fri, 4 Apr 2025 10:26:50 +1100 (AEDT) Date: Fri, 4 Apr 2025 10:21:58 +1100 From: David Gibson To: Laurent Vivier Subject: Re: [PATCH 17/18] ip: Use iov_tail in ipv6_l4hdr() Message-ID: References: <20250402172343.858187-1-lvivier@redhat.com> <20250402172343.858187-18-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="avBle4Uf0MUoXchg" Content-Disposition: inline In-Reply-To: <20250402172343.858187-18-lvivier@redhat.com> Message-ID-Hash: KUU637AULPXI2N3OO3ST37JQE5MISJAG X-Message-ID-Hash: KUU637AULPXI2N3OO3ST37JQE5MISJAG 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: --avBle4Uf0MUoXchg Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Apr 02, 2025 at 07:23:42PM +0200, Laurent Vivier wrote: > Use packet_base() and extract headers using IOV_REMOVE_HEADER() > and IOV_PEEK_HEADER() rather than packet_get(). >=20 > Signed-off-by: Laurent Vivier > --- > ip.c | 27 ++++++++++++--------------- > ip.h | 3 +-- > tap.c | 4 +++- > 3 files changed, 16 insertions(+), 18 deletions(-) >=20 > diff --git a/ip.c b/ip.c > index 2cc7f6548aff..f13aae08f918 100644 > --- a/ip.c > +++ b/ip.c > @@ -23,40 +23,37 @@ > =20 > /** > * ipv6_l4hdr() - Find pointer to L4 header in IPv6 packet and extract p= rotocol > - * @p: Packet pool, packet number @idx has IPv6 header at @offset > - * @idx: Index of packet in pool > - * @offset: Pre-calculated IPv6 header offset > + * @data: IPv6 packet > * @proto: Filled with L4 protocol number > * @dlen: Data length (payload excluding header extensions), set on retu= rn > * > * Return: pointer to L4 header, NULL if not found > */ > -char *ipv6_l4hdr(const struct pool *p, int idx, size_t offset, uint8_t *= proto, > - size_t *dlen) > +bool ipv6_l4hdr(struct iov_tail *data, uint8_t *proto, size_t *dlen) > { > const struct ipv6_opt_hdr *o; > + struct ipv6_opt_hdr oc; > const struct ipv6hdr *ip6h; > - char *base; > + struct ipv6hdr ip6hc; > int hdrlen; > uint8_t nh; > =20 > - base =3D packet_get(p, idx, 0, 0, NULL); > - ip6h =3D packet_get(p, idx, offset, sizeof(*ip6h), dlen); > + ip6h =3D IOV_REMOVE_HEADER(data, ip6hc); > if (!ip6h) > - return NULL; > - > - offset +=3D sizeof(*ip6h); > + return false; > + *dlen =3D iov_tail_size(data); > =20 > nh =3D ip6h->nexthdr; > if (!IPV6_NH_OPT(nh)) > goto found; > =20 > - while ((o =3D packet_get_try(p, idx, offset, sizeof(*o), dlen))) { > + while ((o =3D IOV_PEEK_HEADER(data, oc))) { > + *dlen =3D iov_tail_size(data) - sizeof(*o); > nh =3D o->nexthdr; > hdrlen =3D (o->hdrlen + 1) * 8; > =20 > if (IPV6_NH_OPT(nh)) > - offset +=3D hdrlen; > + data->off +=3D hdrlen; iov_drop() > else > goto found; > } > @@ -65,8 +62,8 @@ char *ipv6_l4hdr(const struct pool *p, int idx, size_t = offset, uint8_t *proto, > =20 > found: > if (nh =3D=3D 59) > - return NULL; > + return false; > =20 > *proto =3D nh; > - return base + offset; > + return true; > } > diff --git a/ip.h b/ip.h > index 471c57ee4c71..874cbe476a6b 100644 > --- a/ip.h > +++ b/ip.h > @@ -115,8 +115,7 @@ static inline uint32_t ip6_get_flow_lbl(const struct = ipv6hdr *ip6h) > ip6h->flow_lbl[2]; > } > =20 > -char *ipv6_l4hdr(const struct pool *p, int idx, size_t offset, uint8_t *= proto, > - size_t *dlen); > +bool ipv6_l4hdr(struct iov_tail *data, uint8_t *proto, size_t *dlen); > =20 > /* IPv6 link-local all-nodes multicast adddress, ff02::1 */ > static const struct in6_addr in6addr_ll_all_nodes =3D { > diff --git a/tap.c b/tap.c > index bb4e23df226e..280a04981954 100644 > --- a/tap.c > +++ b/tap.c > @@ -888,8 +888,10 @@ resume: > if (plen !=3D check) > continue; > =20 > - if (!(l4h =3D ipv6_l4hdr(in, i, sizeof(*eh), &proto, &l4len))) > + data =3D IOV_TAIL_FROM_BUF(ip6h, sizeof(*ip6h) + check, 0); > + if (!ipv6_l4hdr(&data, &proto, &l4len)) > continue; > + l4h =3D (char *)data.iov[0].iov_base + data.off; > =20 > if (IN6_IS_ADDR_LOOPBACK(saddr) || IN6_IS_ADDR_LOOPBACK(daddr)) { > char sstr[INET6_ADDRSTRLEN], dstr[INET6_ADDRSTRLEN]; --=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 --avBle4Uf0MUoXchg Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmfvGBUACgkQzQJF27ox 2Gd2NQ/8DGB1yILDfbyMChrRieepf0VLiK+h54OqWb1CIWntqhYLn9kv+wCGryV9 dvoNjLiCAzgSfevq8zd5rHUZOpxv4kkKXYmrCO+3Fc6/aiS0c3QPhvn5QuN/Lzhw A/q+3zdJ3Zl069nqcxUVIXe9gTLcholq85TKrazuBxByc+hI7sRU8sG7Ayn7Xb/Q MgQPuwVu+ifnhEGUW86Syz8F2ojSRQsWQZddH5t3yH4fkds/oV/jsFF2ubxRLl5r 8zr/G8xERfpUcrh5CF4qWomoIGBUqnhob1nrQbL4dE6krCblTJwHh53o/FASMXXb Z7F+cvExlHTovmlQtPd2WEH/5PUS9VAI1pL1YXSQwCUu0IMxJzYL0oMNRmfeEumL I1a750tkvo9tLBR3YHJ6K5h6rLE/MItQL7lJq7ram8mlbVznFshW+fUw4waEwug8 Bym/n0wU9QJh59F2CWqWy3Da7sy9DpCIlqGzfNii8C/100HBztAbwD01DSHoO/rU fNxYNdJm1eaL/spdNHr1Zbiw7nc2iUa4c5/zVsFaAgvjtoNakrpLMNeb+XiGYGMU 44cy+PFnfzKKc/VUlZ5d1BZ29ebEcfVVhrfudgeFWJElo0L7w3g+Jxca1wc1BbQs hYhEzKvM7OmUyIZrr5dtHtdQyd9A9OFhQsJy+Ih3S1LDesVjYhQ= =Wo3I -----END PGP SIGNATURE----- --avBle4Uf0MUoXchg--