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=XV7vE7OJ; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id B23E95A0274 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=QXN86odaUZIvhwsgCsIafYvImiS5mqwnIwco+Kd2PkM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=XV7vE7OJYX1jIMQSm8joWCB7ob9BNbR8XywI9p7d3wuWVV95FU1BCqLB2Rvdorula FTIQamwXWbk0o9hVPZ7dW+hsb4NiKMht9ZNFkiqkZAkNbGJgpdAjnTNvMWVOtORIgZ hGRIijKYrUGHf7SkIaiHTyIvjDi+8LicvRJcI7qThvM7C3zmTMwNFq4vFglhF84Z/d Qa/7K5DP1JqWtfbVKnSkHRwx6lYjNUKy0KKMLBRHgOpxs+qxqHDoeLahP36/PZHGMa NnWRl1SJaTtD7xDjKmImqTcve2KuQUlgRVD25aNwciXnYmswdeHxXNYMJdwpYDd3d9 A+GFnLbl5G4IA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4ZTHty6qyqz4x3d; Fri, 4 Apr 2025 10:26:50 +1100 (AEDT) Date: Fri, 4 Apr 2025 10:19:43 +1100 From: David Gibson To: Laurent Vivier Subject: Re: [PATCH 16/18] tap: Convert to iov_tail Message-ID: References: <20250402172343.858187-1-lvivier@redhat.com> <20250402172343.858187-17-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="HnN9IlJAFf5vPpba" Content-Disposition: inline In-Reply-To: <20250402172343.858187-17-lvivier@redhat.com> Message-ID-Hash: TJFIH7QSBMO5LQWKYOH4WJ2KNO2V62PR X-Message-ID-Hash: TJFIH7QSBMO5LQWKYOH4WJ2KNO2V62PR 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: --HnN9IlJAFf5vPpba Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Apr 02, 2025 at 07:23:41PM +0200, Laurent Vivier wrote: > Use packet_base() and extract headers using IOV_PEEK_HEADER() > rather than packet_get(). This appears to convert tap4_handler(), but not tap6_handler()? > Signed-off-by: Laurent Vivier > --- > tap.c | 31 ++++++++++++++++++------------- > 1 file changed, 18 insertions(+), 13 deletions(-) >=20 > diff --git a/tap.c b/tap.c > index 4b54807c4101..bb4e23df226e 100644 > --- a/tap.c > +++ b/tap.c > @@ -680,28 +680,33 @@ static int tap4_handler(struct ctx *c, const struct= pool *in, > i =3D 0; > resume: > for (seq_count =3D 0, seq =3D NULL; i < in->count; i++) { > - size_t l2len, l3len, hlen, l4len; > + size_t l3len, hlen, l4len; > const struct ethhdr *eh; > const struct udphdr *uh; > struct iov_tail data; > + struct ethhdr ehc; > struct iphdr *iph; > - const char *l4h; > + struct iphdr iphc; > + struct udphdr uhc; > =20 > - packet_get(in, i, 0, 0, &l2len); > + if (!packet_base(in, i, &data)) > + continue; > =20 > - eh =3D packet_get(in, i, 0, sizeof(*eh), &l3len); > + eh =3D IOV_PEEK_HEADER(&data, ehc); > if (!eh) > continue; > if (ntohs(eh->h_proto) =3D=3D ETH_P_ARP) { > PACKET_POOL_P(pkt, 1, in->buf, in->buf_size); > =20 > - data =3D IOV_TAIL_FROM_BUF((void *)eh, l2len, 0); > packet_add(pkt, &data); > arp(c, pkt); > continue; > } > =20 > - iph =3D packet_get(in, i, sizeof(*eh), sizeof(*iph), NULL); > + data.off +=3D sizeof(*eh); iov_drop() > + l3len =3D iov_tail_size(&data); > + > + iph =3D IOV_PEEK_HEADER(&data, iphc); > if (!iph) > continue; > =20 > @@ -729,8 +734,8 @@ resume: > if (iph->saddr && c->ip4.addr_seen.s_addr !=3D iph->saddr) > c->ip4.addr_seen.s_addr =3D iph->saddr; > =20 > - l4h =3D packet_get(in, i, sizeof(*eh) + hlen, l4len, NULL); > - if (!l4h) > + data.off +=3D hlen; iov_drop(). Or just use IOV_REMOVE_HEADER() above. > + if (iov_tail_size(&data) !=3D l4len) > continue; > =20 > if (iph->protocol =3D=3D IPPROTO_ICMP) { > @@ -741,7 +746,6 @@ resume: > =20 > tap_packet_debug(iph, NULL, NULL, 0, NULL, 1); > =20 > - data =3D IOV_TAIL_FROM_BUF((void *)l4h, l4len, 0); > packet_add(pkt, &data); > icmp_tap_handler(c, PIF_TAP, AF_INET, > &iph->saddr, &iph->daddr, > @@ -749,15 +753,17 @@ resume: > continue; > } > =20 > - uh =3D packet_get(in, i, sizeof(*eh) + hlen, sizeof(*uh), NULL); > + uh =3D IOV_PEEK_HEADER(&data, uhc); > if (!uh) > continue; > =20 > if (iph->protocol =3D=3D IPPROTO_UDP) { > + struct iov_tail eh_data; > + > PACKET_POOL_P(pkt, 1, in->buf, in->buf_size); > =20 > - data =3D IOV_TAIL_FROM_BUF((void *)eh, l2len, 0); > - packet_add(pkt, &data); > + packet_base(in, i, &eh_data); > + packet_add(pkt, &eh_data); > if (dhcp(c, pkt)) > continue; > } > @@ -806,7 +812,6 @@ resume: > #undef L4_SET > =20 > append: > - data =3D IOV_TAIL_FROM_BUF((void *)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 --HnN9IlJAFf5vPpba Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmfvF4EACgkQzQJF27ox 2GeFiQ//QVR2FqY68ITqoqXntV1OHy8cbCLGrRQbKdjIyCk4qAQjVzgXrIa6P0ku gttHO8KoQqRMb498qWWyHjB6rPE0PQwyR46JOnoIhJPRyl/791ZcNIFfjFFk12Tz Hn1hvO8ycLcpT0zk1gpSqCHTnYB3Pn/ZC5FZ7nm6Fxw+hoxz56/WGfUwNOZH7PSo pf7JF+73YUbuzy+Cfsau2nEYwlZ/VKcadX7fJZfcO2lpGwQzmTV2H6XJrFTJ4OeZ 0VxVExnzOpDkPAVyFvTp/ZzHxoRur+w8orOh/O9f0yydKVjUaif4aRUA+LzajWAf mrhQKZNvhWF4E8iRSNpOxVXEhD5uIfjlyQR4Org5UOThI00wdu9qnEOSqvNScQoQ QDefbBWdUnXOsZ3kB78iGWBsOsondOqLZckJSmsIjUpbEPyVSBT1CU1I4C1nFqRC Gp21JqySe8Mj0S0PAl1es02nhHWA0xFQb9vptvIsOFvMKmq7kQ4TeZVbftDDt6WB /Hepu4zWFzmFmVONodGDxJVn/N/kbrxEYWK8RWL3K0T0B9Tgx1wT4EAR8S2TVFg9 RvRBZt5gv8iZJ/hxYay/TU6QEuAKmzBToIuKUA/SIsaaLe42PX17DZVkIljQZUCG qVhQa0VgBYgEniHvaRryfemNHyzvLX661ZsPYptktdKmdY9qpdg= =J9rV -----END PGP SIGNATURE----- --HnN9IlJAFf5vPpba--