public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: Laurent Vivier <lvivier@redhat.com>
To: passt-dev@passt.top
Cc: Laurent Vivier <lvivier@redhat.com>
Subject: [PATCH v2 6/6] udp: Use epollfd from flow_common structure
Date: Tue,  7 Oct 2025 18:40:26 +0200	[thread overview]
Message-ID: <20251007164026.3882026-7-lvivier@redhat.com> (raw)
In-Reply-To: <20251007164026.3882026-1-lvivier@redhat.com>

Update UDP flow handling to use the epollfd field from the flow_common
structure instead of accessing it from the context. This aligns UDP with
the recent changes to TCP and ICMP flow management.

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
 udp_flow.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/udp_flow.c b/udp_flow.c
index caaf3dababb1..2814373e4173 100644
--- a/udp_flow.c
+++ b/udp_flow.c
@@ -52,7 +52,7 @@ void udp_flow_close(const struct ctx *c, struct udp_flow *uflow)
 	flow_foreach_sidei(sidei) {
 		flow_hash_remove(c, FLOW_SIDX(uflow, sidei));
 		if (uflow->s[sidei] >= 0) {
-			epoll_del(c->epollfd, uflow->s[sidei]);
+			epoll_del(uflow->f.epollfd, uflow->s[sidei]);
 			close(uflow->s[sidei]);
 			uflow->s[sidei] = -1;
 		}
@@ -92,7 +92,9 @@ static int udp_flow_sock(const struct ctx *c,
 	ref.data = fref.data;
 	ref.fd = s;
 
-	rc = epoll_add(c->epollfd, EPOLLIN, &ref);
+	flow_set_epollfd(&uflow->f, c->epollfd);
+
+	rc = epoll_add(uflow->f.epollfd, 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 = -errno;
 
-		epoll_del(c->epollfd, s);
+		epoll_del(uflow->f.epollfd, s);
 		close(s);
 
 		flow_dbg_perror(uflow, "Couldn't connect flow socket");
-- 
2.50.1


      parent reply	other threads:[~2025-10-07 16:40 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-07 16:40 [PATCH v2 0/6] Refactor epoll handling in preparation for multithreading Laurent Vivier
2025-10-07 16:40 ` [PATCH v2 1/6] util: Simplify epoll_del() interface to take epollfd directly Laurent Vivier
2025-10-07 16:40 ` [PATCH v2 2/6] epoll_ctl: Extract epoll operations Laurent Vivier
2025-10-07 16:40 ` [PATCH v2 3/6] util: Move epoll registration out of sock_l4_sa() Laurent Vivier
2025-10-07 16:40 ` [PATCH v2 4/6] tcp, flow: Replace per-connection in_epoll flag with epollfd in flow_common Laurent Vivier
2025-10-07 16:40 ` [PATCH v2 5/6] icmp: Use epollfd from flow_common structure Laurent Vivier
2025-10-07 16:40 ` Laurent Vivier [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251007164026.3882026-7-lvivier@redhat.com \
    --to=lvivier@redhat.com \
    --cc=passt-dev@passt.top \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).