From e6f81e55788bc6ede5e98a83820263e394455ba9 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 11 Aug 2023 15:12:26 +1000 Subject: epoll: Split handling of TCP timerfds into its own handler function tcp_sock_handler() actually handles several different types of fd events. This includes timerfds that aren't sockets at all. The handling of these has essentially nothing in common with the other cases. So, give the TCP timers there own epoll_type value and dispatch directly to their handler. This also means we can remove the timer field from tcp_epoll_ref, the information it encoded is now implicit in the epoll_type value. Signed-off-by: David Gibson Signed-off-by: Stefano Brivio --- passt.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'passt.c') diff --git a/passt.c b/passt.c index 2d674bf..a700e41 100644 --- a/passt.c +++ b/passt.c @@ -57,6 +57,7 @@ char pkt_buf[PKT_BUF_BYTES] __attribute__ ((aligned(PAGE_SIZE))); char *epoll_type_str[EPOLL_TYPE_MAX + 1] = { [EPOLL_TYPE_TCP] = "TCP socket", + [EPOLL_TYPE_TCP_TIMER] = "TCP timer", [EPOLL_TYPE_UDP] = "UDP socket", [EPOLL_TYPE_ICMP] = "ICMP socket", [EPOLL_TYPE_ICMPV6] = "ICMPv6 socket", @@ -324,6 +325,9 @@ loop: if (!c.no_tcp) tcp_sock_handler(&c, ref, eventmask, &now); break; + case EPOLL_TYPE_TCP_TIMER: + tcp_timer_handler(&c, ref); + break; case EPOLL_TYPE_UDP: udp_sock_handler(&c, ref, eventmask, &now); break; -- cgit v1.2.3