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=202510 header.b=wATLQgmX; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id CAC645A0BC3 for ; Fri, 14 Nov 2025 01:26:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202510; t=1763079985; bh=DZq7NGbFTWNz4FJQb7vpDO+oyP9bRWLyn8891G6uZO8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=wATLQgmXazAEqfec0Ups45QwsPI83c4B4q/dZnL4NkrRubVYaXZNHNVmLag2Cy8H2 7ZbrgPBCmD5JUqsYTX1svanzuGUZcQ05Ksmh5m7MP8+o2TWQDw052/O9xUbKQeYEkr THqrM3CFlAmsjNHlheRH6fSybnrRVUxhJq/epcH7bRICdMrV26ZGA/5WkfEcVELEkT CKN43xBsoLNOgRlp+fbN+WScrmWm/Af3lbau2IroOtOGBEpJv/eTVm+DFZ4rG9EkKE 1lAC2+VFLYQFsxMSPwFUkSLSB6J/KLHFGeS13pk+2xq2KyQ/3fCR5P2/3FGSYTZJTu nfrvd6eMmzoMg== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4d6ycK1bhrz4wD3; Fri, 14 Nov 2025 11:26:25 +1100 (AEDT) Date: Fri, 14 Nov 2025 10:33:16 +1100 From: David Gibson To: Stefano Brivio Subject: Re: [PATCH v3 4/8] udp: Unify some more inbound/outbound parts of udp_sock_init() Message-ID: References: <20251029062628.1647051-1-david@gibson.dropbear.id.au> <20251029062628.1647051-5-david@gibson.dropbear.id.au> <20251113073326.573bfe51@elisabeth> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="KHa/tBiZgnQK2hBV" Content-Disposition: inline In-Reply-To: <20251113073326.573bfe51@elisabeth> Message-ID-Hash: CIZVPRP4LISGCAIFL224TDP6QPWOSVRZ X-Message-ID-Hash: CIZVPRP4LISGCAIFL224TDP6QPWOSVRZ 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: --KHa/tBiZgnQK2hBV Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Nov 13, 2025 at 07:33:26AM +0100, Stefano Brivio wrote: > On Wed, 29 Oct 2025 17:26:24 +1100 > David Gibson wrote: >=20 > > udp_sock_init() takes an 'ns' parameter determining if it creates a soc= ket > > in the guest namespace or host namespace. Alter it to take a pif > > parameter instead, like tcp_sock_init(), and use that change to slightly > > reduce code duplication between the HOST and SPLICE cases. > >=20 > > Signed-off-by: David Gibson > > --- > > conf.c | 2 +- > > udp.c | 65 +++++++++++++++++++++++++++++++--------------------------- > > udp.h | 5 +++-- > > 3 files changed, 39 insertions(+), 33 deletions(-) > >=20 > > diff --git a/conf.c b/conf.c > > index 26f1bcc0..08cb50aa 100644 > > --- a/conf.c > > +++ b/conf.c > > @@ -171,7 +171,7 @@ static void conf_ports_range_except(const struct ct= x *c, char optname, > > if (optname =3D=3D 't') > > ret =3D tcp_sock_init(c, PIF_HOST, addr, ifname, i); > > else if (optname =3D=3D 'u') > > - ret =3D udp_sock_init(c, 0, addr, ifname, i); > > + ret =3D udp_sock_init(c, PIF_HOST, addr, ifname, i); > > else > > /* No way to check in advance for -T and -U */ > > ret =3D 0; > > diff --git a/udp.c b/udp.c > > index 8f96495d..f3237436 100644 > > --- a/udp.c > > +++ b/udp.c > > @@ -1091,64 +1091,68 @@ int udp_tap_handler(const struct ctx *c, uint8_= t pif, > > /** > > * udp_sock_init() - Initialise listening sockets for a given port > > * @c: Execution context > > - * @ns: In pasta mode, if set, bind with loopback address in namespace > > + * @pif: Interface to open the socket for (PIF_HOST or PIF_SPLICE) > > * @addr: Pointer to address for binding, NULL if not configured > > * @ifname: Name of interface to bind to, NULL if not configured > > * @port: Port, host order > > * > > * Return: 0 on (partial) success, negative error code on (complete) f= ailure > > */ > > -int udp_sock_init(const struct ctx *c, int ns, const union inany_addr = *addr, > > - const char *ifname, in_port_t port) > > +int udp_sock_init(const struct ctx *c, uint8_t pif, > > + const union inany_addr *addr, const char *ifname, > > + in_port_t port) > > { > > union udp_listen_epoll_ref uref =3D { > > - .pif =3D ns ? PIF_SPLICE : PIF_HOST, > > + .pif =3D pif, > > .port =3D port, > > }; > > int r4 =3D FD_REF_MAX + 1, r6 =3D FD_REF_MAX + 1; > > + int (*socks)[NUM_PORTS]; > > =20 > > ASSERT(!c->no_udp); > > + ASSERT(pif_is_socket(pif)); > > =20 > > - if (!addr && c->ifi4 && c->ifi6 && !ns) { > > + if (pif =3D=3D PIF_HOST) > > + socks =3D udp_splice_init; > > + else > > + socks =3D udp_splice_ns; > > + > > + if (!addr && c->ifi4 && c->ifi6 && pif =3D=3D PIF_HOST) { > > int s; > > =20 > > /* Attempt to get a dual stack socket */ > > s =3D pif_sock_l4(c, EPOLL_TYPE_UDP_LISTEN, PIF_HOST, > > NULL, ifname, port, uref.u32); > > - udp_splice_init[V4][port] =3D s < 0 ? -1 : s; > > - udp_splice_init[V6][port] =3D s < 0 ? -1 : s; > > + socks[V4][port] =3D s < 0 ? -1 : s; > > + socks[V6][port] =3D s < 0 ? -1 : s; > > if (IN_INTERVAL(0, FD_REF_MAX, s)) > > return 0; > > } > > =20 > > if ((!addr || inany_v4(addr)) && c->ifi4) { > > - if (!ns) { > > - r4 =3D pif_sock_l4(c, EPOLL_TYPE_UDP_LISTEN, PIF_HOST, > > - addr ? addr : &inany_any4, ifname, > > - port, uref.u32); > > + const union inany_addr *a =3D addr ? > > + addr : &inany_any4; >=20 > Nit: this fits on a single line. Fixed. Probably a relic from an earlier draft. >=20 > > =20 > > - udp_splice_init[V4][port] =3D r4 < 0 ? -1 : r4; > > - } else { > > - r4 =3D pif_sock_l4(c, EPOLL_TYPE_UDP_LISTEN, PIF_SPLICE, > > - &inany_loopback4, ifname, > > - port, uref.u32); > > - udp_splice_ns[V4][port] =3D r4 < 0 ? -1 : r4; > > - } > > + if (pif =3D=3D PIF_SPLICE) > > + a =3D &inany_loopback4; > > + > > + r4 =3D pif_sock_l4(c, EPOLL_TYPE_UDP_LISTEN, pif, a, ifname, > > + port, uref.u32); > > + > > + socks[V4][port] =3D r4 < 0 ? -1 : r4; > > } > > =20 > > if ((!addr || !inany_v4(addr)) && c->ifi6) { > > - if (!ns) { > > - r6 =3D pif_sock_l4(c, EPOLL_TYPE_UDP_LISTEN, PIF_HOST, > > - addr ? addr : &inany_any6, ifname, > > - port, uref.u32); > > + const union inany_addr *a =3D addr ? > > + addr : &inany_any6; >=20 > ...same here. Fixed. > > =20 > > - udp_splice_init[V6][port] =3D r6 < 0 ? -1 : r6; > > - } else { > > - r6 =3D pif_sock_l4(c, EPOLL_TYPE_UDP_LISTEN, PIF_SPLICE, > > - &inany_loopback6, ifname, > > - port, uref.u32); > > - udp_splice_ns[V6][port] =3D r6 < 0 ? -1 : r6; > > - } > > + if (pif =3D=3D PIF_SPLICE) > > + a =3D &inany_loopback6; > > + > > + r6 =3D pif_sock_l4(c, EPOLL_TYPE_UDP_LISTEN, pif, a, ifname, > > + port, uref.u32); > > + > > + socks[V6][port] =3D r6 < 0 ? -1 : r6; > > } > > =20 > > if (IN_INTERVAL(0, FD_REF_MAX, r4) || IN_INTERVAL(0, FD_REF_MAX, r6)) > > @@ -1214,7 +1218,8 @@ static void udp_port_rebind(struct ctx *c, bool o= utbound) > > =20 > > if ((c->ifi4 && socks[V4][port] =3D=3D -1) || > > (c->ifi6 && socks[V6][port] =3D=3D -1)) > > - udp_sock_init(c, outbound, NULL, NULL, port); > > + udp_sock_init(c, outbound ? PIF_SPLICE : PIF_HOST, > > + NULL, NULL, port); > > } > > } > > =20 > > diff --git a/udp.h b/udp.h > > index 8f8531ad..f78dc528 100644 > > --- a/udp.h > > +++ b/udp.h > > @@ -17,8 +17,9 @@ int udp_tap_handler(const struct ctx *c, uint8_t pif, > > sa_family_t af, const void *saddr, const void *daddr, > > uint8_t ttl, const struct pool *p, int idx, > > const struct timespec *now); > > -int udp_sock_init(const struct ctx *c, int ns, const union inany_addr = *addr, > > - const char *ifname, in_port_t port); > > +int udp_sock_init(const struct ctx *c, uint8_t pif, > > + const union inany_addr *addr, const char *ifname, > > + in_port_t port); > > int udp_init(struct ctx *c); > > void udp_timer(struct ctx *c, const struct timespec *now); > > void udp_update_l2_buf(const unsigned char *eth_d, const unsigned char= *eth_s); >=20 > --=20 > Stefano >=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 --KHa/tBiZgnQK2hBV Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmkWarsACgkQzQJF27ox 2GfPyA/+OEmCULbm56fn6uAACyTdDPcRIsX+Dn5nZo4xdTI+ktI9ujWa0akNQ5er o3agkOxal3vGP0iy+vwYtmVu6hMDHeNzkvCwtGxmv/o0qnjLCkeN0ENhISb/WqTW ++xEBYXF+bBeEBb7ztQ7Z1iJnw7EXz+JnttO1uMDz199jdOuaxBLkKCtDYh8rbUA nyXRjTSI2oXG988ixbLTLoqVRTPLP6Y3PHdAxJXuB9AZL/6ANkj0XXVjORxyJFQf PwkHar5PzK0JRJdrqO2iw71T+JQC6W1cfNCVX4t93g8mIoNZ+B7K/ub9e6fd3jdk UnHlfMyBVXNsSAHsZyzLIQ034g2FdKzYYfIO4kFyKVYGy1hlenK7ePDieVhAqVbm PXNVDbMKIiO4/9ZjKNNSWGmhKQ5dra/EpNts7D6kDZyEeqEeGkRg29ZWnlSgBXSY pznSDaCqRe9Nsyu37DZZ/48Ucy5v3wHvn8NZJgdXRr1TRLCXPuhPqyMbX1oeD4FJ CcHLeTnswh+hj4LY/UWQsTSLGXoIHFEGUv9kL9K2r1I4jygBOUzzI3Xl3abyVtaY BiUzhaeqCNruKgZUjEXKtdbiR4sslQ5fk0BCDNj9ysY44ImlaXY6m/516NO9Gmps VOl+qLVOQWCvffd3oOmaAdntQE/BYPSisxpYJCeNTyZe9JfGV9c= =A3Ra -----END PGP SIGNATURE----- --KHa/tBiZgnQK2hBV--