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

tcp_splice: Use parameterised macros for per-side event/flag bits

Browse source 
Both the events and flags fields in tcp_splice_conn have several bits
which are per-side, e.g. OUT_WAIT_0 for side 0 and OUT_WAIT_1 for side 1.
This necessitates some rather awkward ternary expressions when we need
to get the relevant bit for a particular side.

Simplify this by using a parameterised macro for the bit values.  This
needs a ternary expression inside the macros, but makes the places we use
it substantially clearer.

That simplification in turn allows us to use a loop across each side to
implement several things which are currently open coded to do equivalent
things for each side in turn.

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-07-17 14:52:21 +10:00 committed by Stefano Brivio
parent 5235c47c79
commit 66a02c9f7c
2 changed files with 35 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tcp_conn.h
View file

@ -129,19 +129,14 @@ struct tcp_splice_conn {
#define SPLICE_CLOSED 0 #define SPLICE_CLOSED 0
#define SPLICE_CONNECT BIT(0) #define SPLICE_CONNECT BIT(0)
#define SPLICE_ESTABLISHED BIT(1) #define SPLICE_ESTABLISHED BIT(1)
#define OUT_WAIT_0 BIT(2) #define OUT_WAIT(sidei_) ((sidei_) ? BIT(3) : BIT(2))
#define OUT_WAIT_1 BIT(3) #define FIN_RCVD(sidei_) ((sidei_) ? BIT(5) : BIT(4))
#define FIN_RCVD_0 BIT(4) #define FIN_SENT(sidei_) ((sidei_) ? BIT(7) : BIT(6))
#define FIN_RCVD_1 BIT(5)
#define FIN_SENT_0 BIT(6)
#define FIN_SENT_1 BIT(7)
uint8_t flags; uint8_t flags;
#define SPLICE_V6 BIT(0) #define SPLICE_V6 BIT(0)
#define RCVLOWAT_SET_0 BIT(1) #define RCVLOWAT_SET(sidei_) ((sidei_) ? BIT(2) : BIT(1))
#define RCVLOWAT_SET_1 BIT(2) #define RCVLOWAT_ACT(sidei_) ((sidei_) ? BIT(4) : BIT(3))
#define RCVLOWAT_ACT_0 BIT(3)
#define RCVLOWAT_ACT_1 BIT(4)
#define CLOSING BIT(5) #define CLOSING BIT(5)
uint32_t read[SIDES]; uint32_t read[SIDES];

62
tcp_splice.c
View file

@ -119,19 +119,22 @@ static struct tcp_splice_conn *conn_at_sidx(flow_sidx_t sidx)
static void tcp_splice_conn_epoll_events(uint16_t events, static void tcp_splice_conn_epoll_events(uint16_t events,
struct epoll_event ev[]) struct epoll_event ev[])
{ {
ev[0].events = ev[1].events = 0; unsigned sidei;
flow_foreach_sidei(sidei)
ev[sidei].events = 0;
if (events & SPLICE_ESTABLISHED) { if (events & SPLICE_ESTABLISHED) {
if (!(events & FIN_SENT_1)) flow_foreach_sidei(sidei) {
ev[0].events = EPOLLIN | EPOLLRDHUP; if (!(events & FIN_SENT(!sidei)))
if (!(events & FIN_SENT_0)) ev[sidei].events = EPOLLIN | EPOLLRDHUP;
ev[1].events = EPOLLIN | EPOLLRDHUP; }
} else if (events & SPLICE_CONNECT) { } else if (events & SPLICE_CONNECT) {
ev[1].events = EPOLLOUT; ev[1].events = EPOLLOUT;
} }
ev[0].events |= (events & OUT_WAIT_0) ? EPOLLOUT : 0; flow_foreach_sidei(sidei)
ev[1].events |= (events & OUT_WAIT_1) ? EPOLLOUT : 0; ev[sidei].events |= (events & OUT_WAIT(sidei)) ? EPOLLOUT : 0;
} }
/** /**
@ -553,21 +556,21 @@ void tcp_splice_sock_handler(struct ctx *c, union epoll_ref ref,
if (events & EPOLLOUT) { if (events & EPOLLOUT) {
fromsidei = !evsidei; fromsidei = !evsidei;
conn_event(c, conn, evsidei == 0 ? ~OUT_WAIT_0 : ~OUT_WAIT_1); conn_event(c, conn, ~OUT_WAIT(evsidei));
} else { } else {
fromsidei = evsidei; fromsidei = evsidei;
} }
if (events & EPOLLRDHUP) if (events & EPOLLRDHUP)
/* For side 0 this is fake, but implied */ /* For side 0 this is fake, but implied */
conn_event(c, conn, evsidei == 0 ? FIN_RCVD_0 : FIN_RCVD_1); conn_event(c, conn, FIN_RCVD(evsidei));
swap: swap:
eof = 0; eof = 0;
never_read = 1; never_read = 1;
lowat_set_flag = fromsidei == 0 ? RCVLOWAT_SET_0 : RCVLOWAT_SET_1; lowat_set_flag = RCVLOWAT_SET(fromsidei);
lowat_act_flag = fromsidei == 0 ? RCVLOWAT_ACT_0 : RCVLOWAT_ACT_1; lowat_act_flag = RCVLOWAT_ACT(fromsidei);
while (1) { while (1) {
ssize_t readlen, to_write = 0, written; ssize_t readlen, to_write = 0, written;
@ -644,8 +647,7 @@ eintr:
if (conn->read[fromsidei] == conn->written[fromsidei]) if (conn->read[fromsidei] == conn->written[fromsidei])
break; break;
conn_event(c, conn, conn_event(c, conn, OUT_WAIT(fromsidei));
fromsidei == 0 ? OUT_WAIT_1 : OUT_WAIT_0);
break; break;
} }
@ -661,21 +663,19 @@ eintr:
break; break;
} }
if ((conn->events & FIN_RCVD_0) && !(conn->events & FIN_SENT_1)) { if (conn->read[fromsidei] == conn->written[fromsidei] && eof) {
if (conn->read[fromsidei] == conn->written[fromsidei] && eof) { unsigned sidei;
shutdown(conn->s[1], SHUT_WR);
conn_event(c, conn, FIN_SENT_1); flow_foreach_sidei(sidei) {
if ((conn->events & FIN_RCVD(sidei)) &&
!(conn->events & FIN_SENT(!sidei))) {
shutdown(conn->s[!sidei], SHUT_WR);
conn_event(c, conn, FIN_SENT(!sidei));
}
} }
} }
if ((conn->events & FIN_RCVD_1) && !(conn->events & FIN_SENT_0)) { if (CONN_HAS(conn, FIN_SENT(0) | FIN_SENT(1)))
if (conn->read[fromsidei] == conn->written[fromsidei] && eof) {
shutdown(conn->s[0], SHUT_WR);
conn_event(c, conn, FIN_SENT_0);
}
}
if (CONN_HAS(conn, FIN_SENT_0 | FIN_SENT_1))
goto close; goto close;
if ((events & (EPOLLIN | EPOLLOUT)) == (EPOLLIN | EPOLLOUT)) { if ((events & (EPOLLIN | EPOLLOUT)) == (EPOLLIN | EPOLLOUT)) {
@ -821,19 +821,17 @@ void tcp_splice_timer(const struct ctx *c, struct tcp_splice_conn *conn)
ASSERT(!(conn->flags & CLOSING)); ASSERT(!(conn->flags & CLOSING));
flow_foreach_sidei(sidei) { flow_foreach_sidei(sidei) {
uint8_t set = sidei == 0 ? RCVLOWAT_SET_0 : RCVLOWAT_SET_1; if ((conn->flags & RCVLOWAT_SET(sidei)) &&
uint8_t act = sidei == 0 ? RCVLOWAT_ACT_0 : RCVLOWAT_ACT_1; !(conn->flags & RCVLOWAT_ACT(sidei))) {
if ((conn->flags & set) && !(conn->flags & act)) {
if (setsockopt(conn->s[sidei], SOL_SOCKET, SO_RCVLOWAT, if (setsockopt(conn->s[sidei], SOL_SOCKET, SO_RCVLOWAT,
&((int){ 1 }), sizeof(int))) { &((int){ 1 }), sizeof(int))) {
flow_trace(conn, "can't set SO_RCVLOWAT on %d", flow_trace(conn, "can't set SO_RCVLOWAT on %d",
conn->s[sidei]); conn->s[sidei]);
} }
conn_flag(c, conn, ~set); conn_flag(c, conn, ~RCVLOWAT_SET(sidei));
} }
} }
conn_flag(c, conn, ~RCVLOWAT_ACT_0); flow_foreach_sidei(sidei)
conn_flag(c, conn, ~RCVLOWAT_ACT_1); conn_flag(c, conn, ~RCVLOWAT_ACT(sidei));
} }