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=TWEhdh6s; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 98EDA5A061A for ; Thu, 23 Oct 2025 03:42:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202510; t=1761183731; bh=F/JtZUv3JsLMkERzNNAeLh6h5TNe26+HxF7FmHgPq9s=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=TWEhdh6stj0lNbVAUKVhITJb7V6AZz5oV7mORbsJA0xI/hF6ouwWeWMwGy+XPGrQo QuG+gDui2WyH3yHmms+x2srCJaagNqqgWEVX/KihiMP69Q0IY5qTPBKDOMRtOt/9V7 4u/DbjoyeU43YRjldIJdHBRjvmfvxZ2FduTz7UMfujIeZApdIMbp6HzEj5TdKe2sw/ ki50kC72Z2nUryqmOyb4LcKwGLKF4uuTATzfIl4Whlc4U4QG464SVHEYTFT3nVlL4E g48vyKN+ggt12btFRTs6nhIOOnJob++iR4umN60CZIfe+pyme1g8xdBOYxKcKzaZlr w211eVlF8mYcA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4csTKv1wknz4wDG; Thu, 23 Oct 2025 12:42:11 +1100 (AEDT) Date: Thu, 23 Oct 2025 12:40:12 +1100 From: David Gibson To: Laurent Vivier Subject: Re: [PATCH v5 6/7] udp: Use epoll instance management for UDP flows Message-ID: References: <20251021210116.314674-1-lvivier@redhat.com> <20251021210116.314674-7-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="IYZb+yEQW1He9e7j" Content-Disposition: inline In-Reply-To: <20251021210116.314674-7-lvivier@redhat.com> Message-ID-Hash: TV6N2K5B55HBR3XMN3F7DFT54TV623VR X-Message-ID-Hash: TV6N2K5B55HBR3XMN3F7DFT54TV623VR 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: --IYZb+yEQW1He9e7j Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Oct 21, 2025 at 11:01:15PM +0200, Laurent Vivier wrote: > Store the epoll id in the flow_common structure for UDP flows using > flow_epollid_set() and retrieve the corresponding epoll file descriptor > with flow_epollfd() instead of passing c->epollfd directly. This makes > UDP consistent with the recent TCP and ICMP changes. >=20 > Signed-off-by: Laurent Vivier Reviewed-by: David Gibson > --- > udp_flow.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) >=20 > diff --git a/udp_flow.c b/udp_flow.c > index 00e231fe1b01..8907f2f72741 100644 > --- a/udp_flow.c > +++ b/udp_flow.c > @@ -52,7 +52,7 @@ void udp_flow_close(const struct ctx *c, struct udp_flo= w *uflow) > flow_foreach_sidei(sidei) { > flow_hash_remove(c, FLOW_SIDX(uflow, sidei)); > if (uflow->s[sidei] >=3D 0) { > - epoll_del(c->epollfd, uflow->s[sidei]); > + epoll_del(flow_epollfd(&uflow->f), uflow->s[sidei]); > close(uflow->s[sidei]); > uflow->s[sidei] =3D -1; > } > @@ -92,7 +92,9 @@ static int udp_flow_sock(const struct ctx *c, > ref.data =3D fref.data; > ref.fd =3D s; > =20 > - rc =3D epoll_add(c->epollfd, EPOLLIN, ref); > + flow_epollid_set(&uflow->f, EPOLLFD_ID_DEFAULT); > + > + rc =3D epoll_add(flow_epollfd(&uflow->f), EPOLLIN, ref); > if (rc < 0) { > close(s); > return rc; > @@ -101,7 +103,7 @@ static int udp_flow_sock(const struct ctx *c, > if (flowside_connect(c, s, pif, side) < 0) { > rc =3D -errno; > =20 > - epoll_del(c->epollfd, s); > + epoll_del(flow_epollfd(&uflow->f), s); > close(s); > =20 > flow_dbg_perror(uflow, "Couldn't connect flow socket"); > --=20 > 2.51.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 --IYZb+yEQW1He9e7j Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmj5h3wACgkQzQJF27ox 2GevyA//azu4mBMgUizjXATaj9Mxih38Xgp582E2/k1RmF/EDbfKiAJHvDk5YG1B wn6FYo1FPNKNbVxgMCe0Ku0v5yPMsvMAfy+pQumUx02DbHmkfyGZheo65zCN6HuD lz+bZQ/yW/d3Hv6p6UU31fU9LHcV04OJqON70WmfWr/dCpJUQScr6tjzLQ6V/zZb Zgj4VseHhYYsSqXJH+cn0njb/RTqXXV7II3xVX6ItjeFeTt9T+vqvzOC/c64pSjv WZ1XzEl817iBjDcJN5O8HbA3xUQ5rzJT1vTVbMOXreFAJVjazCOUJkXoV5JkNtJw nFMPWHqCv6P5mrOfb5b0uFPd+29G6NVyoIyz4JTm3HY0NG457x18/uI0emtCSXQN Dgk9DcNhIWYflQkHFxQEDKPaxs4asaLr2pq4RiJbX8Zfn7jZwTCfJb1z6yU2HuM0 oombSaPO90yoa1ICLEi9455Bi3thvaOeRfnImBAh8MClbv0vLJfK/ULha7kxdEm0 uq7aln4ZflrA6/bR85MKrDR2Uu4qeScnXqi7TW5pj710My0NppN1o9vdnLrvj3Po XKtlbrTdtw50m8O3NWSW0KAY9FdEVTDpxrZiRlq0cDlzlMACexe6oUrcGbDXm+Hd jqIGqZLGcN9EEXfIKD+UMpymqrCmVFPab7ayYAWOizhPczP9XiY= =ATXq -----END PGP SIGNATURE----- --IYZb+yEQW1He9e7j--