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=QpcZ81zD; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id E79245A0285 for ; Wed, 06 Aug 2025 08:35:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202508; t=1754462131; bh=aYrgN3kPg1qlfI9NBHFukSku9X8KVqXZvOHOl9kliCs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=QpcZ81zDP38iv3YKSdf4cJpdo9AB2zEhQjUFfSg+ZKlBlfqOCJTqRX30dPc9A8RvC DRgn+IHczfnFW1KIuZklIlYYaeSnzWRxDU2DV2verD1ifF6QHN9GjPIyCDofXH2H9K AjhehJt6dfT4jigLj62j8tdyWrlXsMd5RTVq4Kzxa8C17wPpY0vo6qPx1nuyB8aBrH kojs650SyA6m5WOSxR6muD+RKmlxZQWuF7e6+2akPs/ko++tCk5EJm5a76hwQxFYxR kbL/IJUJZgcp1SgsddT5smYU9m4PWr9cNAn+FteCYUq2lDKHN0FJ/SAjkd2YchNNo/ 22MmV9SxfJALw== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4bxgXM1Jsvz4xcr; Wed, 6 Aug 2025 16:35:31 +1000 (AEST) Date: Wed, 6 Aug 2025 16:27:21 +1000 From: David Gibson To: Laurent Vivier Subject: Re: [PATCH v8 24/30] dhcpv6: use iov_tail rather than pool Message-ID: References: <20250805154628.301343-1-lvivier@redhat.com> <20250805154628.301343-25-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="RfNNCzchNgzO6iOy" Content-Disposition: inline In-Reply-To: <20250805154628.301343-25-lvivier@redhat.com> Message-ID-Hash: PBTIZ4ACB4YHMP5KGVTN3T7F6ORT7L64 X-Message-ID-Hash: PBTIZ4ACB4YHMP5KGVTN3T7F6ORT7L64 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: --RfNNCzchNgzO6iOy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Aug 05, 2025 at 05:46:22PM +0200, Laurent Vivier wrote: > This patch refactors the dhcpv6() function to accept `struct iov_tail *da= ta` > directly as its packet input, replacing the `const struct pool *p` parame= ter. > Consequently, dhcpv6() no longer fetches packet data internally using > packet_data(). >=20 > This change simplifies callers, such as tap6_handler(), which now pass > the iov_tail representing the L4 UDP segment (DHCPv6 message) directly. > This removes the need for intermediate packet pool handling. >=20 > Signed-off-by: Laurent Vivier Reviewed-by: David Gibson > --- > dhcpv6.c | 29 +++++++++++++---------------- > dhcpv6.h | 2 +- > tap.c | 6 ++---- > 3 files changed, 16 insertions(+), 21 deletions(-) >=20 > diff --git a/dhcpv6.c b/dhcpv6.c > index f54a75c642df..52611d742b0b 100644 > --- a/dhcpv6.c > +++ b/dhcpv6.c > @@ -539,19 +539,19 @@ static size_t dhcpv6_client_fqdn_fill(const struct = iov_tail *data, > /** > * dhcpv6() - Check if this is a DHCPv6 message, reply as needed > * @c: Execution context > - * @p: Packet pool, single packet starting from UDP header > + * @data: Single packet starting from UDP header > * @saddr: Source IPv6 address of original message > * @daddr: Destination IPv6 address of original message > * > * Return: 0 if it's not a DHCPv6 message, 1 if handled, -1 on failure > */ > -int dhcpv6(struct ctx *c, const struct pool *p, > +int dhcpv6(struct ctx *c, struct iov_tail *data, > const struct in6_addr *saddr, const struct in6_addr *daddr) > { > const struct opt_server_id *server_id =3D NULL; > - struct iov_tail data, opt, client_id_base; > const struct opt_hdr *client_id =3D NULL; > struct opt_server_id server_id_storage; > + struct iov_tail opt, client_id_base; > const struct opt_ia_na *ia =3D NULL; > struct opt_hdr client_id_storage; > struct opt_ia_na ia_storage; > @@ -562,10 +562,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, > const struct udphdr *uh; > size_t mlen, n; > =20 > - if (!packet_get(p, 0, &data)) > - return -1; > - > - uh =3D IOV_REMOVE_HEADER(&data, uh_storage); > + uh =3D IOV_REMOVE_HEADER(data, uh_storage); > if (!uh) > return -1; > =20 > @@ -578,7 +575,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, > if (!IN6_IS_ADDR_MULTICAST(daddr)) > return -1; > =20 > - mlen =3D iov_tail_size(&data); > + mlen =3D iov_tail_size(data); > if (mlen + sizeof(*uh) !=3D ntohs(uh->len) || mlen < sizeof(*mh)) > return -1; > =20 > @@ -586,23 +583,23 @@ int dhcpv6(struct ctx *c, const struct pool *p, > =20 > src =3D &c->ip6.our_tap_ll; > =20 > - mh =3D IOV_REMOVE_HEADER(&data, mh_storage); > + mh =3D IOV_REMOVE_HEADER(data, mh_storage); > if (!mh) > return -1; > =20 > - client_id_base =3D data; > + client_id_base =3D *data; > if (dhcpv6_opt(&client_id_base, OPT_CLIENTID)) > client_id =3D IOV_PEEK_HEADER(&client_id_base, client_id_storage); > if (!client_id || ntohs(client_id->l) > OPT_VSIZE(client_id)) > return -1; > =20 > - opt =3D data; > + opt =3D *data; > if (dhcpv6_opt(&opt, OPT_SERVERID)) > server_id =3D IOV_PEEK_HEADER(&opt, server_id_storage); > if (server_id && ntohs(server_id->hdr.l) !=3D OPT_VSIZE(server_id)) > return -1; > =20 > - opt =3D data; > + opt =3D *data; > if (dhcpv6_opt(&opt, OPT_IA_NA)) > ia =3D IOV_PEEK_HEADER(&opt, ia_storage); > if (ia && ntohs(ia->hdr.l) < MIN(OPT_VSIZE(ia_na), OPT_VSIZE(ia_ta))) > @@ -620,9 +617,9 @@ int dhcpv6(struct ctx *c, const struct pool *p, > if (mh->type =3D=3D TYPE_CONFIRM && server_id) > return -1; > =20 > - if (dhcpv6_ia_notonlink(&data, &c->ip6.addr)) { > + if (dhcpv6_ia_notonlink(data, &c->ip6.addr)) { > =20 > - dhcpv6_send_ia_notonlink(c, &data, &client_id_base, > + dhcpv6_send_ia_notonlink(c, data, &client_id_base, > ntohs(client_id->l), mh->xid); > =20 > return 1; > @@ -635,7 +632,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, > memcmp(&resp.server_id, server_id, sizeof(resp.server_id))) > return -1; > =20 > - if (ia || dhcpv6_opt(&data, OPT_IA_TA)) > + if (ia || dhcpv6_opt(data, OPT_IA_TA)) > return -1; > =20 > info("DHCPv6: received INFORMATION_REQUEST, sending REPLY"); > @@ -668,7 +665,7 @@ int dhcpv6(struct ctx *c, const struct pool *p, > n =3D offsetof(struct resp_t, client_id) + > sizeof(struct opt_hdr) + ntohs(client_id->l); > n =3D dhcpv6_dns_fill(c, (char *)&resp, n); > - n =3D dhcpv6_client_fqdn_fill(&data, c, (char *)&resp, n); > + n =3D dhcpv6_client_fqdn_fill(data, c, (char *)&resp, n); > =20 > resp.hdr.xid =3D mh->xid; > =20 > diff --git a/dhcpv6.h b/dhcpv6.h > index 580998862227..c706dfdbb2ac 100644 > --- a/dhcpv6.h > +++ b/dhcpv6.h > @@ -6,7 +6,7 @@ > #ifndef DHCPV6_H > #define DHCPV6_H > =20 > -int dhcpv6(struct ctx *c, const struct pool *p, > +int dhcpv6(struct ctx *c, struct iov_tail *data, > struct in6_addr *saddr, struct in6_addr *daddr); > void dhcpv6_init(const struct ctx *c); > =20 > diff --git a/tap.c b/tap.c > index 7d7e89304723..3262b44c4287 100644 > --- a/tap.c > +++ b/tap.c > @@ -975,11 +975,9 @@ resume: > continue; > =20 > if (proto =3D=3D IPPROTO_UDP) { > - PACKET_POOL_P(pkt, 1, in->buf, in->buf_size); > - > - packet_add(pkt, &data); > + struct iov_tail uh_data =3D data; > =20 > - if (dhcpv6(c, pkt, saddr, daddr)) > + if (dhcpv6(c, &uh_data, saddr, daddr)) > continue; > } > =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 --RfNNCzchNgzO6iOy Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmiS9bsACgkQzQJF27ox 2GdzKg/+LLvqMqUlpBbbvPftLgZPRKSRYzW/qZ1tvKP06Dai7dFeKtgQEP2CgZYq 4WpEcNqt88aQa6d0tcJRBS956mzArzFL5QurfczU+KzGluRLVvqHS9lquxnrQETV tBLjNMigjAC0mAL3rw9x6keawLdEnPO9IytKSgt3E0qO0jM9f7wOjT0GSAoE5fgN AiFHt7dXjg10Vi8QQHKAmQWFEoNueRv2YngUonSo5v/erVxiTDSkiP9icbS9OrX8 Z1a8ajKmv0ItsCZGRKlA33y4NPt/2EGnSqi4iwlpgJirqBHdZYXbsQC/7lvHPSvl K2dlv9gVgPXbmUw5Ea8a9RdNhzNQDqFk45ipmTwo1Fa40+JIi+UJ55HxOQAh+0hS eWQ7TtWXxpdLWZbCXpbcNuw2l1Q20f6UF16vn8RlPjg9VAtDkj8yA1mYv7mudQ2F bGmVc7cGPPHRstz78Lgyl/t8XWEmJKqX1wzslWRs6Iva+dDjZlU8+VyNU1NCq8HZ 15k5uZe8Fy9zQECJWGP+BKondPRyXPjNIfNOsfvojUpsYIsT+pzZao/3bjmqel3f AkOWNAshI8ijJjwbWdVXPhvRahvoMCGU2EkFUSgMvVvGpGFCAZ4zssrlzXmjLcjM K3t6cpK8StK7MrvBuBFCqsv7D2uW8VCc+2KrIP7LGsO9lyhs65A= =ZJq5 -----END PGP SIGNATURE----- --RfNNCzchNgzO6iOy--