* [PATCH] tcp: Update EPOLL_TYPE_TCP_TIMER fd
@ 2025-12-18 13:58 Laurent Vivier
2025-12-23 23:25 ` Stefano Brivio
0 siblings, 1 reply; 2+ messages in thread
From: Laurent Vivier @ 2025-12-18 13:58 UTC (permalink / raw)
To: passt-dev; +Cc: Laurent Vivier
For consistency with other epoll events, set the fd field to the file
descriptor actually added by epoll_ctl() (conn->timer), rather than
conn->sock.
This is a no-op change as ref.fd is not currently used in
tcp_timer_handler().
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
tcp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tcp.c b/tcp.c
index b179e3991236..fade42b0c4d9 100644
--- a/tcp.c
+++ b/tcp.c
@@ -554,7 +554,7 @@ static int tcp_epoll_ctl(const struct ctx *c, struct tcp_tap_conn *conn)
if (conn->timer != -1) {
union epoll_ref ref_t = { .type = EPOLL_TYPE_TCP_TIMER,
- .fd = conn->sock,
+ .fd = conn->timer,
.flow = FLOW_IDX(conn) };
struct epoll_event ev_t = { .data.u64 = ref_t.u64,
.events = EPOLLIN | EPOLLET };
@@ -582,7 +582,7 @@ static void tcp_timer_ctl(const struct ctx *c, struct tcp_tap_conn *conn)
if (conn->timer == -1) {
union epoll_ref ref = { .type = EPOLL_TYPE_TCP_TIMER,
- .fd = conn->sock,
+ .fd = conn->timer,
.flow = FLOW_IDX(conn) };
struct epoll_event ev = { .data.u64 = ref.u64,
.events = EPOLLIN | EPOLLET };
--
2.51.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] tcp: Update EPOLL_TYPE_TCP_TIMER fd
2025-12-18 13:58 [PATCH] tcp: Update EPOLL_TYPE_TCP_TIMER fd Laurent Vivier
@ 2025-12-23 23:25 ` Stefano Brivio
0 siblings, 0 replies; 2+ messages in thread
From: Stefano Brivio @ 2025-12-23 23:25 UTC (permalink / raw)
To: Laurent Vivier; +Cc: passt-dev
On Thu, 18 Dec 2025 14:58:33 +0100
Laurent Vivier <lvivier@redhat.com> wrote:
> For consistency with other epoll events, set the fd field to the file
> descriptor actually added by epoll_ctl() (conn->timer), rather than
> conn->sock.
>
> This is a no-op change as ref.fd is not currently used in
> tcp_timer_handler().
>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Applied.
--
Stefano
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-12-23 23:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-12-18 13:58 [PATCH] tcp: Update EPOLL_TYPE_TCP_TIMER fd Laurent Vivier
2025-12-23 23:25 ` Stefano Brivio
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).