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=p1z7UGhI; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 821565A061A for ; Mon, 20 Oct 2025 03:43:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202510; t=1760924594; bh=mCrNMbKAmQelqhQppQXrn6j62b9oVnNVjh1ANmxk9e0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=p1z7UGhITQUba6eG7P1dKDxWEhNqHkoMNzjX9P4G+yv6v3j0AR634xoDv/rP3jWn8 OCW+PrmQ3ztTqmUgM9JH4ob4cJggmebImtx+5ovraUviJdscaWMujtMXtNqfC6KxDG heDagHfH/ODW5YU8WyM6uPrcSlmf4o4Fpe+RH0Zq4eLMs+YLLA9WJJ8g5hw/4B1CN9 uSLs5RRhwX+SPEh2So4/PPZzllAWSz6shM0XlAXD5l5rmb/DIzG5vTi1SQfiERB+/y CokjGQrGknAhaUMwZa+F5PQabt885/qVw7zKkruDMiQHZ0mh1aLVvpKaFDUQxjYRyL RNVpRu6/hcJmw== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4cqdVV2yqyz4wBJ; Mon, 20 Oct 2025 12:43:14 +1100 (AEDT) Date: Mon, 20 Oct 2025 12:39:55 +1100 From: David Gibson To: Laurent Vivier Subject: Re: [PATCH v4 6/7] udp: Use thread-based epoll management for UDP flows Message-ID: References: <20251017103129.229412-1-lvivier@redhat.com> <20251017103129.229412-7-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Gmh1136e1kGFU09b" Content-Disposition: inline In-Reply-To: <20251017103129.229412-7-lvivier@redhat.com> Message-ID-Hash: QPTE7GFUNFIJEIYB4NUYYRQSMNABVQJB X-Message-ID-Hash: QPTE7GFUNFIJEIYB4NUYYRQSMNABVQJB 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: --Gmh1136e1kGFU09b Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Oct 17, 2025 at 12:31:28PM +0200, Laurent Vivier wrote: > Store the thread number in the flow_common structure for UDP > flows using flow_epollfd_set() and retrieve the corresponding epoll > file descriptor with flow_epollfd_get() instead of passing c->epollfd > directly. This makes UDP consistent with the recent TCP and ICMP > changes. >=20 > Signed-off-by: Laurent Vivier > --- > udp_flow.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) >=20 > diff --git a/udp_flow.c b/udp_flow.c > index caaf3dababb1..ea89a14775a4 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; Hm. I guess it *probably* doesn't matter since the flow's about to go away. But just as we clear the socket fields, here we should probably clear the threadnb field when we remove ourselves from the epoll. > } > @@ -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_thread_set(&uflow->f, 0); > + > + 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 --Gmh1136e1kGFU09b Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmj1kuoACgkQzQJF27ox 2GcORw/9Hko/N9MMfSGDaNUZQw1nLvPjJMr6eRwncVh/0VCb7vse+s+k7IDb0Vau SSedhOvdU0RLakKqW+HsIHJOcrOmVJWwB6dA2exCJKgXAr+YZvkatOO/PeDxUzTk 31uxFzW4+eCG4smmcIdySGszPQSxD1hz7JlGM09MvRxYcAxGET2uQz2Qic79kZMd 8uGEotMI7kD7bMTMbsQ8q4h/B9YXkpGcqwU0iVMw09pLie043r6aKYy0z9bKUuF8 7fMrWc7vpYOnxiI2ImULh4TOy+LJP+L5Sm8ozeDrfyXA3M3DrTGCjAqN06vTlx+7 sK+PV0dflnjNRI7zFL0lmFPJ4jWb4tLYowPhFU1CTYe+78vVnwa95cs8XsMVpV7k jgbKJXFL8EySIMoouZq9HPuv3XikT+B09evXu7BbbYe1wXXpQLC1jBBzt99Lxkji IY6KZcIPiU1RMCdg7uqn7zXbXCbOxocPx/OQUO1FIupR8BFL/++dq7BFKnGs2kn/ UH2Yts21LWgfFJiAjS9z395dNANxquAeJ4MsZckrRikFi5jFSUzLCxz9Be7R79AP sjnpY+jTQ5+tVAHFoNo1InFlwr3hu7hAm5n0xNKE16MN3j8NBtEnEC6iQ9wia/oD ILhEgCJWC8w+CLBJj2TykJfEIYX6gzf4KB/xqxykKi/VW/RJfkc= =r+nc -----END PGP SIGNATURE----- --Gmh1136e1kGFU09b--