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=S0gGt0JF; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id A2C425A0008 for ; Fri, 04 Apr 2025 01:26:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202502; t=1743722810; bh=w3DhkOdQUhmyO4USXWWWHmHrnpYR/QtJ1WE9SN7Aw3I=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=S0gGt0JF3Oak//OttBVdU9Z2wVduDeq18r9JRv/5WatfpXc8W0vF9MHz/NHR9ZJCu V+tV2F71WCVLZmL4zGWNSk8G/X1QlJxLef5eYBA8P3gJ7MHnh++5+lpI7/bmCn9vDj G5vWDJbaXdkplpt36WyxHzhYgod/dxg3Sqcla+2u6fX478QmCWVQOR8b/fVgh1EinJ BrJWdcdJ/9HC2pR5ANgeE7umXAh0FDz0VxC5AGfWS0Cb2CgBruLtWtAwnEP+71srdL 9vccXQBaIyCCZxSaeUwcT7DcluWTzc6wwQ3KOgKEU4TL0fJ4KhjS/AA9bHUulRq1Vp /o6L5tfXOudmQ== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4ZTHty707Yz4x8w; Fri, 4 Apr 2025 10:26:50 +1100 (AEDT) Date: Fri, 4 Apr 2025 10:26:46 +1100 From: David Gibson To: Laurent Vivier Subject: Re: [PATCH 18/18] tap: Convert to iov_tail Message-ID: References: <20250402172343.858187-1-lvivier@redhat.com> <20250402172343.858187-19-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="SqCxOAU8qKYWKeQD" Content-Disposition: inline In-Reply-To: <20250402172343.858187-19-lvivier@redhat.com> Message-ID-Hash: 3X2DOGZ6B2JKNSBU5ED3UBAXHD2F76PJ X-Message-ID-Hash: 3X2DOGZ6B2JKNSBU5ED3UBAXHD2F76PJ 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: --SqCxOAU8qKYWKeQD Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Apr 02, 2025 at 07:23:43PM +0200, Laurent Vivier wrote: > Use packet_base() and extract headers using IOV_REMOVE_HEADER() > and IOV_PEEK_HEADER() rather than packet_get(). Patch description is a duplicate of 16/18, which is kind of confusing. >=20 > Remove packet_get() as it is not used anymore. >=20 > Signed-off-by: Laurent Vivier > --- > packet.c | 53 ----------------------------------------------------- > packet.h | 10 ---------- > tap.c | 23 ++++++++++++++--------- > 3 files changed, 14 insertions(+), 72 deletions(-) >=20 > diff --git a/packet.c b/packet.c > index 8066ac12502b..e917b0daad2a 100644 > --- a/packet.c > +++ b/packet.c > @@ -103,59 +103,6 @@ void packet_add_do(struct pool *p, struct iov_tail *= data, > p->count++; > } > =20 > -/** > - * 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, NULL means no trace() > - * @line: For tracing: caller line of function call > - * > - * Return: pointer to start of data range, NULL on invalid range or desc= riptor > - */ > -void *packet_get_do(const struct pool *p, size_t idx, size_t offset, > - size_t len, size_t *left, const char *func, int line) > -{ > - char *ptr; > - > - if (idx >=3D p->size || idx >=3D p->count) { > - if (func) { > - trace("packet %zu from pool size: %zu, count: %zu, " > - "%s:%i", idx, p->size, p->count, func, line); > - } > - return NULL; > - } > - > - if (len > PACKET_MAX_LEN) { > - if (func) { > - trace("packet data length %zu, %s:%i", > - len, func, line); > - } > - return NULL; > - } > - > - if (len + offset > p->pkt[idx].iov_len) { > - if (func) { > - trace("data length %zu, offset %zu from length %zu, " > - "%s:%i", len, offset, p->pkt[idx].iov_len, > - func, line); > - } > - return NULL; > - } > - > - ptr =3D (char *)p->pkt[idx].iov_base + offset; > - > - if (packet_check_range(p, ptr, len, func, line)) > - return NULL; > - > - if (left) > - *left =3D p->pkt[idx].iov_len - offset - len; > - > - return ptr; > -} > - > /** > * packet_base_do() - Get data range from packet descriptor from given p= ool > * @p: Packet pool > diff --git a/packet.h b/packet.h > index 35058e747a43..787535a228a5 100644 > --- a/packet.h > +++ b/packet.h > @@ -32,9 +32,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_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_base_do(const struct pool *p, const size_t idx, > struct iov_tail *data, > const char *func, int line); > @@ -43,13 +40,6 @@ void pool_flush(struct pool *p); > #define packet_add(p, data) \ > packet_add_do(p, data, __func__, __LINE__) > =20 > -#define packet_get(p, idx, offset, len, left) \ > - packet_get_do(p, idx, offset, len, left, __func__, __LINE__) > - > - > -#define packet_get_try(p, idx, offset, len, left) \ > - packet_get_do(p, idx, offset, len, left, NULL, 0) > - > #define packet_base(p, idx, data) \ > packet_base_do(p, idx, data, __func__, __LINE__) > =20 > diff --git a/tap.c b/tap.c > index 280a04981954..d6a1da8481a2 100644 > --- a/tap.c > +++ b/tap.c > @@ -870,17 +870,24 @@ resume: > const struct udphdr *uh; > struct iov_tail data; > struct ipv6hdr *ip6h; > + struct ipv6hdr ip6hc; > + struct ethhdr ehc; > + struct udphdr uhc; > uint8_t proto; > - char *l4h; > =20 > - eh =3D packet_get(in, i, 0, sizeof(*eh), NULL); > + if (!packet_base(in, i, &data)) > + return -1; > + > + eh =3D IOV_REMOVE_HEADER(&data, ehc); > if (!eh) > continue; > =20 > - ip6h =3D packet_get(in, i, sizeof(*eh), sizeof(*ip6h), &check); > + ip6h =3D IOV_PEEK_HEADER(&data, ip6hc); > if (!ip6h) > continue; > =20 > + check =3D iov_tail_size(&data) - sizeof(*ip6h); > + > saddr =3D &ip6h->saddr; > daddr =3D &ip6h->daddr; > =20 > @@ -888,10 +895,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]; > @@ -916,6 +921,8 @@ resume: > } > =20 > if (proto =3D=3D IPPROTO_ICMPV6) { > + const struct icmp6hdr *l4h; > + struct icmp6hdr l4hc; > PACKET_POOL_P(pkt, 1, in->buf, in->buf_size); > =20 > if (c->no_icmp) > @@ -924,9 +931,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, l4hc); > if (ndp(c, (struct icmp6hdr *)l4h, saddr, pkt)) > continue; > =20 > @@ -939,12 +946,11 @@ resume: > =20 > if (l4len < sizeof(*uh)) > continue; Shouldn't need this explicit check - peek_header will do it for you. > - uh =3D (struct udphdr *)l4h; > + uh =3D IOV_PEEK_HEADER(&data, uhc); > =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)) > @@ -999,7 +1005,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 --SqCxOAU8qKYWKeQD Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmfvGTUACgkQzQJF27ox 2Gc/SA//VutwSNg5dglY0L+hYpuCQgnQ7cZEGrXxMcWUAOHarccpX9BZs+gY7K0L c2IXjSrHvZSLqYXYMAo7xGtaZv37wWrv1Xu0hrO9J6L2FNAbL1sJyjdCIKhRlcOM 9SXhvLmHhbi/DX9h/440ZWwwGfFsXIqYO4QbedGdY6cy2SWyGn/fv5y511Epo6zu PmsGE9+zy8KYtwTsoeZ25Yzc4uC7J+p40S+mKBe+Jh2a2fw8jC+VM3kOwWUI1zEv OUGIjhTIB9vdow6qCEz+IWlW5DSZMxdj+ReRcBPAbh2WJGSAlcAx6iQaDRUSa0wW fx9N0+TfY5p2tk4d1Dmo23XN012QZ0xxAi500Dt/sJqY7JVSk+eBQ2gRggJBCH4R Gj116OgBhGKq1512kQ9cU7QRHIRIM12qCDZ7Z55NYlsdXvxqd2V/0kjvYSgkZb3N cqVmIg5ZQGst1dnlyd9aSiWGmMzuB17MHkL1/qRqLoHo/L/Yrfn5CW9IJt8/5l9v KGILCLKZ74PVZqnoygcfVNJlIP2WGY4JopdtFpW+QhNMUcu0N0wX47AXoSq+6hNx X9u2ILTlabiKWlROYsZW7sE4KIsvVISmdAbcwfwt4YWHuq0Qam/AKxgzax9KAwic eSLzRkdLvyfjrqajMaqUwAvNedPI1XbWsmNoTDtXqIRErQ8ly+o= =TTfP -----END PGP SIGNATURE----- --SqCxOAU8qKYWKeQD--