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

tcp: Simplify ACK accounting, skip some useless operations on tap handling

Browse source 
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2021-07-26 14:23:34 +02:00
parent 39ad062100
commit 74677bddb2
1 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
tcp.c
View file

@ -1830,14 +1830,13 @@ int tcp_tap_handler(struct ctx *c, int af, void *addr,
/* TODO: Implement message batching for TCP */ /* TODO: Implement message batching for TCP */
struct tcphdr *th = (struct tcphdr *)msg[0].l4h; struct tcphdr *th = (struct tcphdr *)msg[0].l4h;
size_t len = msg[0].l4_len; size_t len = msg[0].l4_len;
uint32_t ack_seq;
struct tcp_tap_conn *conn; struct tcp_tap_conn *conn;
struct epoll_event ev; struct epoll_event ev;
size_t off, skip = 0; size_t off, skip = 0;
int ws, i; int ws, i;
uint32_t __seq_max;
if (len < sizeof(*th)) if (len < sizeof(*th))
return 1; return 1;
@ -1853,10 +1852,10 @@ int tcp_tap_handler(struct ctx *c, int af, void *addr,
} }
/* TODO: Partial ACK coalescing, merge with message coalescing */ /* TODO: Partial ACK coalescing, merge with message coalescing */
ack_seq = ntohl(th->ack_seq);
for (i = 0; conn->state == ESTABLISHED && i < count; i++) { for (i = 0; conn->state == ESTABLISHED && i < count; i++) {
struct tcphdr *__th = (struct tcphdr *)msg[i].l4h; struct tcphdr *__th = (struct tcphdr *)msg[i].l4h;
size_t __len = msg[i].l4_len; size_t __len = msg[i].l4_len;
uint32_t __this;
if (__len < sizeof(*th)) if (__len < sizeof(*th))
break; break;
@ -1865,19 +1864,11 @@ int tcp_tap_handler(struct ctx *c, int af, void *addr,
if (off < sizeof(*th) || off > __len) if (off < sizeof(*th) || off > __len)
break; break;
if (!i && (!th->ack || len != off)) if (!th->ack)
break; continue;
__this = ntohl(th->ack_seq); if (ntohl(th->ack_seq) - ack_seq < MAX_WINDOW)
ack_seq = ntohl(th->ack_seq);
if (!i || __this - __seq_max < MAX_WINDOW)
__seq_max = __this;
if ((!th->ack || len != off) && i) {
tcp_sock_consume(conn, __seq_max);
conn->ts_tap = *now;
return i;
}
} }
if (th->rst) { if (th->rst) {
@ -1885,6 +1876,7 @@ int tcp_tap_handler(struct ctx *c, int af, void *addr,
return 1; return 1;
} }
if (count == 1)
tcp_clamp_window(conn, th, len, th->syn && th->ack); tcp_clamp_window(conn, th, len, th->syn && th->ack);
conn->ts_tap = *now; conn->ts_tap = *now;
@ -1966,13 +1958,12 @@ int tcp_tap_handler(struct ctx *c, int af, void *addr,
} }
if (th->ack) { if (th->ack) {
tcp_sock_consume(conn, ntohl(th->ack_seq)); if (count == 1)
tcp_sock_consume(conn, ack_seq);
if (conn->state == ESTABLISHED_SOCK_FIN) { if (conn->state == ESTABLISHED_SOCK_FIN) {
if (!tcp_data_from_sock(c, conn, now)) if (!tcp_data_from_sock(c, conn, now))
tcp_tap_state(conn, CLOSE_WAIT); tcp_tap_state(conn, CLOSE_WAIT);
} else {
tcp_data_from_sock(c, conn, now);
} }
} }