1
0
Fork 0
mirror of https://passt.top/passt synced 2025-07-27 03:38:00 +02:00

tcp, tcp_splice: Avoid double layered dispatch for connected TCP sockets

Currently connected TCP sockets have the same epoll type, whether they're
for a "tap" connection or a spliced connection.  This means that
tcp_sock_handler() has to do a secondary check on the type of the
connection to call the right function.  We can avoid this by adding a new
epoll type and dispatching directly to the right thing.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2024-01-16 11:50:38 +11:00 committed by Stefano Brivio
commit 02e092b4fe
5 changed files with 27 additions and 39 deletions

View file

@ -50,6 +50,7 @@
#include "pasta.h"
#include "arch.h"
#include "log.h"
#include "tcp_splice.h"
#define EPOLL_EVENTS 8
@ -61,6 +62,7 @@ char pkt_buf[PKT_BUF_BYTES] __attribute__ ((aligned(PAGE_SIZE)));
char *epoll_type_str[] = {
[EPOLL_TYPE_TCP] = "connected TCP socket",
[EPOLL_TYPE_TCP_SPLICE] = "connected spliced TCP socket",
[EPOLL_TYPE_TCP_LISTEN] = "listening TCP socket",
[EPOLL_TYPE_TCP_TIMER] = "TCP timer",
[EPOLL_TYPE_UDP] = "UDP socket",
@ -373,8 +375,10 @@ loop:
pasta_netns_quit_handler(&c, quit_fd);
break;
case EPOLL_TYPE_TCP:
if (!c.no_tcp)
tcp_sock_handler(&c, ref, eventmask);
tcp_sock_handler(&c, ref, eventmask);
break;
case EPOLL_TYPE_TCP_SPLICE:
tcp_splice_sock_handler(&c, ref, eventmask);
break;
case EPOLL_TYPE_TCP_LISTEN:
tcp_listen_handler(&c, ref, &now);