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=SXxtts5D; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id AD17F5A061A for ; Wed, 22 Oct 2025 02:34:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202510; t=1761093289; bh=4GVdgBiXOmVMW6algvEC2c4ugORKqP7eamt/WKrHl00=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=SXxtts5D3qnaoMXHULES5Vpgdz0lZuUayiEne6tvJMfQHpObIJV8O2gmNK20KU9Mc cIAe5j/NkqOB7HfmFA4yzMKvPkzz7rmv5Yi9TdIDpkyt3eMgtrHr1H4kXbG2+HlQl7 sTK4dBhwj2toXwg5KQxdy6u4H2sfyv5pvW9Miq63VYauhwVV0AmMMh4fPlP0fmayTG 9eWm/m2Qqprk9v8o0eqnnLrVtxIp1+TPJP0UK3LTDTHyQD/C+p/MJYMIPt/TFxgb2o 4M/BPctpOAKYsYrNY+POi1i8KgObjXLlTULYcqhOjKnCNiusxtGUW5EErhIjYfuNcW /rHasDELgwgdA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4crqtd27nSz4wCy; Wed, 22 Oct 2025 11:34:49 +1100 (AEDT) Date: Wed, 22 Oct 2025 11:08:09 +1100 From: David Gibson To: Stefano Brivio Subject: Re: [PATCH 2/3] udp: Unify some more inbound/outbound parts of udp_sock_init() Message-ID: References: <20251017003447.414103-1-david@gibson.dropbear.id.au> <20251017003447.414103-3-david@gibson.dropbear.id.au> <20251021235107.105dd98c@elisabeth> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="TQ6zmlQlKHT+IkYI" Content-Disposition: inline In-Reply-To: <20251021235107.105dd98c@elisabeth> Message-ID-Hash: 4JNWKHL2T5DQ24OKZ4ZCWAWE77RN5NTK X-Message-ID-Hash: 4JNWKHL2T5DQ24OKZ4ZCWAWE77RN5NTK 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: --TQ6zmlQlKHT+IkYI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Oct 21, 2025 at 11:51:07PM +0200, Stefano Brivio wrote: > On Fri, 17 Oct 2025 11:34:46 +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 | 60 +++++++++++++++++++++++++++++----------------------------- > > udp.h | 5 +++-- > > 3 files changed, 34 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 86585b7e..49dd0144 100644 > > --- a/udp.c > > +++ b/udp.c > > @@ -1093,64 +1093,63 @@ 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) > > { > > + int (*socks)[NUM_PORTS] =3D pif =3D=3D PIF_HOST ? > > + udp_splice_init : udp_splice_ns; >=20 > Same as on v1: I'd rather avoid cramping ternary operators like this. Good idea, done. > > 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; > > =20 > > ASSERT(!c->no_udp); > > =20 > > - if (!addr && c->ifi4 && c->ifi6 && !ns) { > > + if (!addr && c->ifi4 && c->ifi6 && (pif =3D=3D PIF_HOST)) { >=20 > I think it's more readable without the extra parentheses around the > comparison, because when I see those I automatically think of an > assignment we want to use in a conditional clause, but that's just a > comparison. Done. Thomas Huth finally convinced me not to put precautionary parens on anything next to && and ||, but I forgot this time :). >=20 > > 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 > > - 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 > > - 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)) > > @@ -1216,7 +1215,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 --TQ6zmlQlKHT+IkYI Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmj4IFEACgkQzQJF27ox 2GdeMg//VDX46PtITOtfnsHPYeOfEXbg6GWI9uQWJRoeB7BQSXCy0tPyC3xVF7Ce 6aSUKAMM9Z2/ZycT2qioAkgsUCeCbKwHryhoFjKhXNGMkrKgsbWyYH9lN83PQsr0 Wg7wZhCxA7m099ThzSruIPhPcJASJqGm16bVPC9RZklXYJfT8GK/IaW45z1j8Ozb LuRKbb+GpdiECSF0YVva/eir+ScWry0CWnrosmBbpREYOezKbBiHbehrBbWl7srU bwI6n+QHlm5vrTSLZk0Mo15NWcr3FgZvyYLrbOSWaIFjMHI4X5/ki4QnnTRJ8IGa BjRPxFkQg2yQ4i6oUDVQQInd6pHMhc80rg1Jb9gGECVpauNcnHHtrKrTrSaA2n+5 JoCEAOvDzGUDjm8kK+Ho3cR9Xl4ktZpSyY5I4rw/7mFPrZretmMmiymzNVkwl/BA 7JOg2v1YjdZReA8FNxn7Twvu81gVIzXyxpswzbKBDD6KZIPltk1JoHiLv/ONSMnB X1k1Sldqg6a0cplxVm/H0pB6JTPjcqGqTCvUd8mP4k2otsTHhZfEb0lO0fLj0otL UPD6YLW1J3E2Svzf6wA+1EGiN7UqN1CMr1Ijd8OVaojZv+ZQxETMlK1bZe4dTwWN JD7WsKBKPJZK+jISjpX8CyrBnYodtlednVFiyTyi43vVKCjM51Q= =2NQI -----END PGP SIGNATURE----- --TQ6zmlQlKHT+IkYI--