External/passt
1
0
Fork 0
mirror of https://passt.top/passt synced 2024-12-22 13:45:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

pasta, tcp: Drop EPOLLET for spliced, established connections

Browse Source 
...tcp_handler_splice() doesn't guarantee we read all the available
data, the sending buffer might be full.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2021-09-16 08:17:18 +02:00
parent 45d9b0000e
commit d481578882
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tcp.c
View File

@ -1558,8 +1558,8 @@ static void tcp_table_splice_compact(struct ctx *c,
ev_from.events = EPOLLET | EPOLLRDHUP; ev_from.events = EPOLLET | EPOLLRDHUP;
ev_to.events = EPOLLET | EPOLLOUT | EPOLLRDHUP; ev_to.events = EPOLLET | EPOLLOUT | EPOLLRDHUP;
} else { } else {
ev_from.events = EPOLLET | EPOLLIN | EPOLLOUT | EPOLLRDHUP; ev_from.events = EPOLLIN | EPOLLOUT | EPOLLRDHUP;
ev_to.events = EPOLLET | EPOLLIN | EPOLLOUT | EPOLLRDHUP; ev_to.events = EPOLLIN | EPOLLOUT | EPOLLRDHUP;
} }
ev_from.data.u64 = ref_from.u64; ev_from.data.u64 = ref_from.u64;
@ -2336,7 +2336,7 @@ static void tcp_splice_connect_finish(struct ctx *c,
if (conn->state == SPLICE_CONNECT) { if (conn->state == SPLICE_CONNECT) {
tcp_splice_state(conn, SPLICE_ESTABLISHED); tcp_splice_state(conn, SPLICE_ESTABLISHED);
ev_from.events = ev_to.events = EPOLLIN | EPOLLET | EPOLLRDHUP; ev_from.events = ev_to.events = EPOLLIN | EPOLLRDHUP;
ev_from.data.u64 = ref_from.u64; ev_from.data.u64 = ref_from.u64;
ev_to.data.u64 = ref_to.u64; ev_to.data.u64 = ref_to.u64;
@ -2615,7 +2615,7 @@ void tcp_sock_handler_splice(struct ctx *c, union epoll_ref ref,
if (events & EPOLLOUT) { if (events & EPOLLOUT) {
struct epoll_event ev = { struct epoll_event ev = {
.events = EPOLLIN | EPOLLET | EPOLLRDHUP, .events = EPOLLIN | EPOLLRDHUP,
.data.u64 = ref.u64, .data.u64 = ref.u64,
}; };
@ -2714,7 +2714,7 @@ eintr:
if (retry_write--) if (retry_write--)
goto retry; goto retry;
ev.events = EPOLLIN | EPOLLOUT | EPOLLET | EPOLLRDHUP; ev.events = EPOLLIN | EPOLLOUT | EPOLLRDHUP;
ref.s = move_to; ref.s = move_to;
ev.data.u64 = ref.u64, ev.data.u64 = ref.u64,
epoll_ctl(c->epollfd, EPOLL_CTL_MOD, move_to, &ev); epoll_ctl(c->epollfd, EPOLL_CTL_MOD, move_to, &ev);