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=202608 header.b=JgzI1oCo; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 0CBE15A0619 for ; Mon, 03 Aug 2026 05:46:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202608; t=1785728795; bh=2qMd0JbG2WTSFN1qaM/1lEXxwT9p6Qfw3l8UBJVh4Dw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=JgzI1oCo5jrJlwvlEYblqRODINknbsUHQWWx0ZWlyNSUTKREyUM1yA4jXstkAYyr6 Xx9phyPSvoVD755q8cvaVECony2TXkfp563gnSPPkjTOJf/fOXau+pd/4i+H7SXSgp ghfkFksqFtyhf1BrOYNUIPZW36eWA/y+1jJHc1FcUzwvFqlJSHwqLcCVwBB6OMa81q ctdNkaR0iMrYO4fIs8paZWHmjnLBfRloQAWEpfmgPWFsUJhbxB45pKtaZPGGcPgc3u jVOZyzAgpRGYS1DLtuzelv0wM+LR3FyLR07s9zCV9gfJ1hhX9woQJboIPwbBp2UJ36 Vi5Y/YyVnk0PQ== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4hD2fM1tlKz4wCQ; Mon, 03 Aug 2026 13:46:35 +1000 (AEST) Date: Mon, 3 Aug 2026 13:24:37 +1000 From: David Gibson To: Laurent Vivier Subject: Re: [PATCH v6 08/12] dhcp/dhcpv6: Pass queue pair explicitly through DHCP send path Message-ID: References: <20260731161617.3550626-1-lvivier@redhat.com> <20260731161617.3550626-9-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="NJQuoN5pUj43subB" Content-Disposition: inline In-Reply-To: <20260731161617.3550626-9-lvivier@redhat.com> Message-ID-Hash: IHB5QRCPR4APEGRVOB6RJDSGXCNF4FBT X-Message-ID-Hash: IHB5QRCPR4APEGRVOB6RJDSGXCNF4FBT 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: --NJQuoN5pUj43subB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jul 31, 2026 at 06:16:13PM +0200, Laurent Vivier wrote: > Add a qpair parameter to dhcp(), dhcpv6(), and > dhcpv6_send_ia_notonlink(), forwarding it to tap_udp4_send() and > tap_udp6_send() instead of hardcoding QPAIR_DEFAULT. >=20 > No functional change. >=20 > Signed-off-by: Laurent Vivier Reviewed-by: David Gibson > --- > dhcp.c | 6 +++--- > dhcp.h | 2 +- > dhcpv6.c | 15 ++++++++------- > dhcpv6.h | 2 +- > tap.c | 4 ++-- > 5 files changed, 15 insertions(+), 14 deletions(-) >=20 > diff --git a/dhcp.c b/dhcp.c > index 1bd68ed5b87b..bc7f0a61ee7e 100644 > --- a/dhcp.c > +++ b/dhcp.c > @@ -296,11 +296,12 @@ static void opt_set_dns_search(const struct ctx *c,= size_t max_len) > /** > * dhcp() - Check if this is a DHCP message, reply as needed > * @c: Execution context > + * @qpair: Queue pair on which to send the reply > * @data: Single packet with Ethernet buffer > * > * Return: 0 if it's not a DHCP message, 1 if handled, -1 on failure > */ > -int dhcp(const struct ctx *c, struct iov_tail *data) > +int dhcp(const struct ctx *c, unsigned int qpair, struct iov_tail *data) > { > char macstr[ETH_ADDRSTRLEN]; > size_t mlen, dlen, opt_len; > @@ -477,8 +478,7 @@ int dhcp(const struct ctx *c, struct iov_tail *data) > else > dst =3D c->ip4.addr; > =20 > - tap_udp4_send(c, QPAIR_DEFAULT, c->ip4.our_tap_addr, 67, dst, 68, > - &reply, dlen); > + tap_udp4_send(c, qpair, c->ip4.our_tap_addr, 67, dst, 68, &reply, dlen); > =20 > return 1; > } > diff --git a/dhcp.h b/dhcp.h > index cd50c99b8856..6d034f0c58af 100644 > --- a/dhcp.h > +++ b/dhcp.h > @@ -6,7 +6,7 @@ > #ifndef DHCP_H > #define DHCP_H > =20 > -int dhcp(const struct ctx *c, struct iov_tail *data); > +int dhcp(const struct ctx *c, unsigned int qpair, struct iov_tail *data); > void dhcp_init(void); > =20 > #endif /* DHCP_H */ > diff --git a/dhcpv6.c b/dhcpv6.c > index 0986d6149515..7887fdc7895a 100644 > --- a/dhcpv6.c > +++ b/dhcpv6.c > @@ -370,13 +370,14 @@ notonlink: > /** > * dhcpv6_send_ia_notonlink() - Send NotOnLink status > * @c: Execution context > + * @qpair: Queue pair on which to send the reply > * @caddr: Source address of client message (reply destination) > * @ia_base: Non-appropriate IA_NA or IA_TA base > * @client_id_base: Client ID message option base > * @len: Client ID length > * @xid: Transaction ID for message exchange > */ > -static void dhcpv6_send_ia_notonlink(struct ctx *c, > +static void dhcpv6_send_ia_notonlink(struct ctx *c, unsigned int qpair, > const struct in6_addr *caddr, > const struct iov_tail *ia_base, > const struct iov_tail *client_id_base, > @@ -407,8 +408,8 @@ static void dhcpv6_send_ia_notonlink(struct ctx *c, > =20 > resp_not_on_link.hdr.xid =3D xid; > =20 > - tap_udp6_send(c, QPAIR_DEFAULT, src, 547, caddr, 546, xid, > - &resp_not_on_link, n); > + tap_udp6_send(c, qpair, src, 547, caddr, 546, xid, &resp_not_on_link, > + n); > } > =20 > /** > @@ -544,13 +545,14 @@ 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 > + * @qpair: Queue pair on which to send the reply > * @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, struct iov_tail *data, > +int dhcpv6(struct ctx *c, unsigned int qpair, struct iov_tail *data, > const struct in6_addr *saddr, const struct in6_addr *daddr) > { > const struct opt_server_id *server_id =3D NULL; > @@ -630,7 +632,7 @@ int dhcpv6(struct ctx *c, struct iov_tail *data, > =20 > if (dhcpv6_ia_notonlink(data, &c->ip6.addr)) { > =20 > - dhcpv6_send_ia_notonlink(c, saddr, data, > + dhcpv6_send_ia_notonlink(c, qpair, saddr, data, > &client_id_base, > ntohs(client_id->l), > mh->xid); > @@ -682,8 +684,7 @@ int dhcpv6(struct ctx *c, struct iov_tail *data, > =20 > resp.hdr.xid =3D mh->xid; > =20 > - tap_udp6_send(c, QPAIR_DEFAULT, src, 547, saddr, 546, mh->xid, &resp, > - n); > + tap_udp6_send(c, qpair, src, 547, saddr, 546, mh->xid, &resp, n); > c->ip6.addr_seen =3D c->ip6.addr; > =20 > return 1; > diff --git a/dhcpv6.h b/dhcpv6.h > index 1015a1a7d3e3..e6cec5d0245e 100644 > --- a/dhcpv6.h > +++ b/dhcpv6.h > @@ -6,7 +6,7 @@ > #ifndef DHCPV6_H > #define DHCPV6_H > =20 > -int dhcpv6(struct ctx *c, struct iov_tail *data, > +int dhcpv6(struct ctx *c, unsigned int qpair, struct iov_tail *data, > const struct in6_addr *saddr, const struct in6_addr *daddr); > void dhcpv6_init(const struct ctx *c); > =20 > diff --git a/tap.c b/tap.c > index 61d18ee161b1..84ac111d7a11 100644 > --- a/tap.c > +++ b/tap.c > @@ -802,7 +802,7 @@ resume: > struct iov_tail eh_data; > =20 > packet_get(pool_tap4, i, &eh_data); > - if (dhcp(c, &eh_data)) > + if (dhcp(c, qpair, &eh_data)) > continue; > } > =20 > @@ -1048,7 +1048,7 @@ resume: > if (proto =3D=3D IPPROTO_UDP) { > struct iov_tail uh_data =3D data; > =20 > - if (dhcpv6(c, &uh_data, saddr, daddr)) > + if (dhcpv6(c, qpair, &uh_data, saddr, daddr)) > continue; > } > =20 > --=20 > 2.54.0 >=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 --NJQuoN5pUj43subB Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmpwCeoACgkQzQJF27ox 2GeQCQ/+OgvP9tIbZl8zl1G4Sjl3iy029Kfon0e8AOvk2T7YY/j7f+Zp9ilB7A9f AeYUSyZIDUsr3+5DbcTkz2ToHWLgpDZFJYA2zG+BRmyi2HpPjFgFs4taHfsXcrvn 3rYPNSTrEZzGH1NoMvDXzcm+dUCcvq7d6cTUtPhPVfKaocM56NWZOY2/QqGsALgh U5zyiU0ATfUu5iy6ZtzGzqAqx7YjtSbirM8viN0N3M7cWN2LipcBczl2Uta8s6yO LBq6Dm15wDtypKhmNWERmEQiRs9GjPmJgeExJOvzdqOqLH7vV4PjZ4HZrZscxAfn 6t1xT1D7F5h3iNdMGpuMrF4fXc9AaBGqbQcnn5ldn/+GVZ2SSLxKASTMBWGgKaIK EgA/6Jbj1U3WEPQXWjBH9frSczO2xVLT670fyRxYZfla4w/nVKpAcRSfsqncCWsi 8DiGuoTWHzsTSyOFsP+l0ttFCYObyERSrPh59G7TViJPHo5W+Giy1IfjVlzApKaJ +RoOUJf2O1EaUTiwtqqAHjojKxOTBHtge3wyUxYpSfFzGw3yKbjGlXe/4ljWRo3Z RoK3bg4MgWMi9Fe+FuZhEcBsCekZulEmOMy07k6xM7BWbIjp/RO4A3MJ26NzkSrI r0auOIHKrHaBy7QGnzOZVntZj9UW7z+g2Xab92T6a6pvhr++4fM= =he3z -----END PGP SIGNATURE----- --NJQuoN5pUj43subB--