mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tcp: Drop EPOLLET for non-spliced connections

Browse source 
Socket-facing functions don't guarantee that all data is handled before
they return: stick to level-triggered mode for TCP sockets.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2021-08-24 18:24:11 +02:00
parent ce24fe0b3f
commit f2e3b9defd
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tcp.c
View file

@ -1034,7 +1034,7 @@ static void tcp_table_tap_compact(struct ctx *c, struct tcp_tap_conn *hole)
else if (to->state == TAP_SYN_SENT) else if (to->state == TAP_SYN_SENT)
ev.events = EPOLLOUT | EPOLLRDHUP; ev.events = EPOLLOUT | EPOLLRDHUP;
else else
ev.events = EPOLLIN | EPOLLET | EPOLLRDHUP; ev.events = EPOLLIN | EPOLLRDHUP;
ref.tcp.v6 = !IN6_IS_ADDR_V4MAPPED(&to->a.a6); ref.tcp.v6 = !IN6_IS_ADDR_V4MAPPED(&to->a.a6);
ref.s = from->sock; ref.s = from->sock;
@ -1335,7 +1335,7 @@ static void tcp_conn_from_tap(struct ctx *c, int af, void *addr,
.sin6_port = th->dest, .sin6_port = th->dest,
.sin6_addr = *(struct in6_addr *)addr, .sin6_addr = *(struct in6_addr *)addr,
}; };
struct epoll_event ev = { .events = EPOLLIN | EPOLLET | EPOLLRDHUP }; struct epoll_event ev = { .events = EPOLLIN | EPOLLRDHUP };
union epoll_ref ref = { .proto = IPPROTO_TCP }; union epoll_ref ref = { .proto = IPPROTO_TCP };
const struct sockaddr *sa; const struct sockaddr *sa;
struct tcp_tap_conn *conn; struct tcp_tap_conn *conn;
@ -2056,7 +2056,7 @@ int tcp_tap_handler(struct ctx *c, int af, void *addr,
tcp_data_from_sock(c, conn, now); tcp_data_from_sock(c, conn, now);
tcp_send_to_tap(c, conn, 0, NULL, 0); tcp_send_to_tap(c, conn, 0, NULL, 0);
ev.events = EPOLLIN | EPOLLET | EPOLLRDHUP; ev.events = EPOLLIN | EPOLLRDHUP;
ref.s = conn->sock; ref.s = conn->sock;
ref.tcp.index = conn - tt; ref.tcp.index = conn - tt;
ev.data.u64 = ref.u64; ev.data.u64 = ref.u64;
@ -2123,7 +2123,7 @@ static void tcp_connect_finish(struct ctx *c, struct tcp_tap_conn *conn,
return; return;
/* Drop EPOLLOUT, only used to wait for connect() to complete */ /* Drop EPOLLOUT, only used to wait for connect() to complete */
ev.events = EPOLLIN | EPOLLET | EPOLLRDHUP; ev.events = EPOLLIN | EPOLLRDHUP;
ev.data.u64 = ref.u64; ev.data.u64 = ref.u64;
epoll_ctl(c->epollfd, EPOLL_CTL_MOD, conn->sock, &ev); epoll_ctl(c->epollfd, EPOLL_CTL_MOD, conn->sock, &ev);