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=202508 header.b=BlzTAtCZ; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 93DFA5A027E for ; Wed, 13 Aug 2025 05:27:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202508; t=1755055626; bh=LVLpuP1a2kfqwKcKiTHoSK7uFTu/UqTyBv7cyOqq9WE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=BlzTAtCZH3FYeNe/8xO5k62xH4HI6AdoiPWyJa+YkoxKmIEOnsXTtaSPeryVTS0Ze 9vuned7E5g1xxt7Dw+A3HNWsV50va5Phm2BwgX0nYaouB9jDipFdfqWk7ym0huIye2 AOzFcdDdStMdyyVmNlrQUmZboAYUBy2OW8hONaxp8EjR55/SLp05Irz9ERDWc0ePIW nABEYgx5kdFve3Lyjyry8eRDF9iA6uNpn4Z1s93zdYr9eK15n/eYaf4dPvyOd0kfgm nYJDli4DqyB7nZDP0CoZGcfrq1OlwQM+WqWPYqJzYekEFqyFiUEveiOenMndKAh4hx AJRCshpmv3rtg== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4c1v1k5N4Nz4xTy; Wed, 13 Aug 2025 13:27:06 +1000 (AEST) Date: Wed, 13 Aug 2025 13:22:37 +1000 From: David Gibson To: Laurent Vivier Subject: Re: [PATCH v9 20/30] tap: Convert tap6_handler() to iov_tail Message-ID: References: <20250808140142.3404325-1-lvivier@redhat.com> <20250808140142.3404325-21-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="rl8MUGzyI0PTDfUy" Content-Disposition: inline In-Reply-To: <20250808140142.3404325-21-lvivier@redhat.com> Message-ID-Hash: E3QO26STIGCZE5AGHTDMNHZH6H3LKA7G X-Message-ID-Hash: E3QO26STIGCZE5AGHTDMNHZH6H3LKA7G 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: --rl8MUGzyI0PTDfUy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Aug 08, 2025 at 04:01:32PM +0200, Laurent Vivier wrote: > Use packet_data() and extract headers using IOV_REMOVE_HEADER() > and IOV_PEEK_HEADER() rather than packet_get(). >=20 > Remove packet_get() as it is not used anymore. >=20 > Signed-off-by: Laurent Vivier Reviewed-by: David Gibson > --- > packet.c | 70 -------------------------------------------------------- > packet.h | 11 --------- > tap.c | 25 ++++++++++++-------- > 3 files changed, 16 insertions(+), 90 deletions(-) >=20 > diff --git a/packet.c b/packet.c > index 014b353cdf8b..5da18bafa576 100644 > --- a/packet.c > +++ b/packet.c > @@ -121,76 +121,6 @@ void packet_add_do(struct pool *p, struct iov_tail *= data, > p->count++; > } > =20 > -/** > - * packet_get_try_do() - Get data range from packet descriptor from give= n pool > - * @p: Packet pool > - * @idx: Index of packet descriptor in pool > - * @offset: Offset of data range in packet descriptor > - * @len: Length of desired data range > - * @left: Length of available data after range, set on return, can be NU= LL > - * @func: For tracing: name of calling function > - * @line: For tracing: caller line of function call > - * > - * Return: pointer to start of data range, NULL on invalid range or desc= riptor > - */ > -/* cppcheck-suppress [staticFunction] */ > -void *packet_get_try_do(const struct pool *p, size_t idx, size_t offset, > - size_t len, size_t *left, const char *func, int line) > -{ > - char *ptr; > - > - ASSERT_WITH_MSG(p->count <=3D p->size, > - "Corrupt pool count: %zu, size: %zu, %s:%i", > - p->count, p->size, func, line); > - > - if (idx >=3D p->count) { > - debug("packet %zu from pool count: %zu, %s:%i", > - idx, p->count, func, line); > - return NULL; > - } > - > - if (offset > p->pkt[idx].iov_len || > - len > (p->pkt[idx].iov_len - offset)) > - return NULL; > - > - ptr =3D (char *)p->pkt[idx].iov_base + offset; > - > - ASSERT_WITH_MSG(!packet_check_range(p, ptr, len, func, line), > - "Corrupt packet pool, %s:%i", func, line); > - > - if (left) > - *left =3D p->pkt[idx].iov_len - offset - len; > - > - return ptr; > -} > - > -/** > - * packet_get_do() - Get data range from packet descriptor from given po= ol > - * @p: Packet pool > - * @idx: Index of packet descriptor in pool > - * @offset: Offset of data range in packet descriptor > - * @len: Length of desired data range > - * @left: Length of available data after range, set on return, can be NU= LL > - * @func: For tracing: name of calling function > - * @line: For tracing: caller line of function call > - * > - * Return: as packet_get_try_do() but log a trace message when returning= NULL > - */ > -void *packet_get_do(const struct pool *p, const size_t idx, > - size_t offset, size_t len, size_t *left, > - const char *func, int line) > -{ > - void *r =3D packet_get_try_do(p, idx, offset, len, left, func, line); > - > - if (!r) { > - trace("missing packet data length %zu, offset %zu from " > - "length %zu, %s:%i", > - len, offset, p->pkt[idx].iov_len, func, line); > - } > - > - return r; > -} > - > /** > * packet_data_do() - Get data range from packet descriptor from given p= ool > * @p: Packet pool > diff --git a/packet.h b/packet.h > index 062afb978124..dab8274fa5c5 100644 > --- a/packet.h > +++ b/packet.h > @@ -33,12 +33,6 @@ struct pool { > int vu_packet_check_range(void *buf, const char *ptr, size_t len); > void packet_add_do(struct pool *p, struct iov_tail *data, > const char *func, int line); > -void *packet_get_try_do(const struct pool *p, const size_t idx, > - size_t offset, size_t len, size_t *left, > - const char *func, int line); > -void *packet_get_do(const struct pool *p, const size_t idx, > - size_t offset, size_t len, size_t *left, > - const char *func, int line); > bool packet_data_do(const struct pool *p, const size_t idx, > struct iov_tail *data, > const char *func, int line); > @@ -47,11 +41,6 @@ void pool_flush(struct pool *p); > =20 > #define packet_add(p, data) \ > packet_add_do(p, data, __func__, __LINE__) > - > -#define packet_get_try(p, idx, offset, len, left) \ > - packet_get_try_do(p, idx, offset, len, left, __func__, __LINE__) > -#define packet_get(p, idx, offset, len, left) \ > - packet_get_do(p, idx, offset, len, left, __func__, __LINE__) > #define packet_data(p, idx, data) \ > packet_data_do(p, idx, data, __func__, __LINE__) > =20 > diff --git a/tap.c b/tap.c > index 4fbcad3b385f..983f39ee8ee8 100644 > --- a/tap.c > +++ b/tap.c > @@ -896,21 +896,28 @@ resume: > for (seq_count =3D 0, seq =3D NULL; i < in->count; i++) { > size_t l4len, plen, check; > struct in6_addr *saddr, *daddr; > + struct ipv6hdr ip6h_storage; > + struct ethhdr eh_storage; > + struct udphdr uh_storage; > const struct ethhdr *eh; > const struct udphdr *uh; > struct iov_tail data; > struct ipv6hdr *ip6h; > uint8_t proto; > - char *l4h; > =20 > - eh =3D packet_get(in, i, 0, sizeof(*eh), NULL); > + if (!packet_data(in, i, &data)) > + return -1; > + > + eh =3D IOV_REMOVE_HEADER(&data, eh_storage); > if (!eh) > continue; > =20 > - ip6h =3D packet_get(in, i, sizeof(*eh), sizeof(*ip6h), &check); > + ip6h =3D IOV_PEEK_HEADER(&data, ip6h_storage); > if (!ip6h) > continue; > =20 > + check =3D iov_tail_size(&data) - sizeof(*ip6h); > + > saddr =3D &ip6h->saddr; > daddr =3D &ip6h->daddr; > =20 > @@ -918,10 +925,8 @@ resume: > if (plen !=3D check) > continue; > =20 > - 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]; > @@ -946,6 +951,8 @@ resume: > } > =20 > if (proto =3D=3D IPPROTO_ICMPV6) { > + struct icmp6hdr l4h_storage; > + const struct icmp6hdr *l4h; > PACKET_POOL_P(pkt, 1, in->buf, in->buf_size); > =20 > if (c->no_icmp) > @@ -954,9 +961,9 @@ resume: > if (l4len < sizeof(struct icmp6hdr)) > continue; > =20 > - data =3D IOV_TAIL_FROM_BUF(l4h, l4len, 0); > packet_add(pkt, &data); > =20 > + l4h =3D IOV_PEEK_HEADER(&data, l4h_storage); > if (ndp(c, (struct icmp6hdr *)l4h, saddr, pkt)) > continue; > =20 > @@ -969,12 +976,13 @@ resume: > =20 > if (l4len < sizeof(*uh)) > continue; > - uh =3D (struct udphdr *)l4h; > + uh =3D IOV_PEEK_HEADER(&data, uh_storage); > + if (!uh) > + continue; > =20 > if (proto =3D=3D IPPROTO_UDP) { > PACKET_POOL_P(pkt, 1, in->buf, in->buf_size); > =20 > - data =3D IOV_TAIL_FROM_BUF(l4h, l4len, 0); > packet_add(pkt, &data); > =20 > if (dhcpv6(c, pkt, saddr, daddr)) > @@ -1031,7 +1039,6 @@ resume: > #undef L4_SET > =20 > append: > - data =3D IOV_TAIL_FROM_BUF(l4h, l4len, 0); > packet_add((struct pool *)&seq->p, &data); > } > =20 --=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 --rl8MUGzyI0PTDfUy Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmicBPwACgkQzQJF27ox 2GcP6hAAn8ODgW/95RFvL4Bpbdo8y8Cm64jspbSmbCUhw3m6mMhUdFG1f/6w+LUV lrsGVy7bscn+/QXC5GlDiNP0tA9vzszfbplCflKy+zqTTvj2bJHP/w2c7stxWwe3 3+2hYyzTAzqwocXa2kP+F0ByDCMNipYgwNE7tnq4bMEnp/pBsYERrWUMt0qv84lK XLVzf2rDpqwKK2plAKJO9csOd06REl1GPfDP0jI45bZ9M50kYIBrg9P/9t20fb3h PWUtYUBRghSo837om4K7MpYGX5uEVdMt7s1uMVFaq/DAZK6QbGnXl2uR7uTyKVvm BYUomPZQnc/dAHkejzCN+A1zi4HXKn2SUQDGrFSMSknv+xo8oDb7kPbDcGTlOMel ZK5kPA2usG0Hakp1wqMILBmC4i2vC1/FiFeTNcr7Cs4ZWhwrJ96PSdRryqFfikR3 zjNKFLjtaOP0f3Y1RPqRo0Mo3k5pnWa2eKFkSyKwP2z4CPiwonAxo9JJwxSv2mMr dWIbaJQVh6XfNNtQxZsDXKVa58pj50fOcAiMqW7u3gGxq0FGv8ffrRmHbsV8t+2i 1/eeSPUQ610jWPVaUhPA3150tzm1c5b2LGJV5JtubWS9gNsOxMQtChnrQCgR85j7 t0C4PEVQQOWYr2SQIDxqeLISVvy2Ds+NFzikU7gF/A3U/JY+8bw= =oNTL -----END PGP SIGNATURE----- --rl8MUGzyI0PTDfUy--