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

tcp: Unify the IN_EPOLL flag

Browse source 
There is very little common between the tcp_tap_conn and tcp_splice_conn
structures.  However, both do have an IN_EPOLL flag which has the same
meaning in each case, though it's stored in a different location.

Simplify things slightly by moving this bit into the common header of the
two structures.

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 2022-11-17 16:58:49 +11:00 committed by Stefano Brivio
parent 34476511f7
commit 433604a581
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tcp.c
View file

@ -429,8 +429,8 @@ static const char *tcp_state_str[] __attribute((__unused__)) = {
}; };
static const char *tcp_flag_str[] __attribute((__unused__)) = { static const char *tcp_flag_str[] __attribute((__unused__)) = {
"STALLED", "LOCAL", "WND_CLAMPED", "IN_EPOLL", "ACTIVE_CLOSE", "STALLED", "LOCAL", "WND_CLAMPED", "ACTIVE_CLOSE", "ACK_TO_TAP_DUE",
"ACK_TO_TAP_DUE", "ACK_FROM_TAP_DUE", "ACK_FROM_TAP_DUE",
}; };
/* Listening sockets, used for automatic port forwarding in pasta mode only */ /* Listening sockets, used for automatic port forwarding in pasta mode only */
@ -660,14 +660,14 @@ static void conn_flag_do(const struct ctx *c, struct tcp_tap_conn *conn,
*/ */
static int tcp_epoll_ctl(const struct ctx *c, struct tcp_tap_conn *conn) static int tcp_epoll_ctl(const struct ctx *c, struct tcp_tap_conn *conn)
{ {
int m = (conn->flags & IN_EPOLL) ? EPOLL_CTL_MOD : EPOLL_CTL_ADD; int m = conn->c.in_epoll ? EPOLL_CTL_MOD : EPOLL_CTL_ADD;
union epoll_ref ref = { .r.proto = IPPROTO_TCP, .r.s = conn->sock, union epoll_ref ref = { .r.proto = IPPROTO_TCP, .r.s = conn->sock,
.r.p.tcp.tcp.index = CONN_IDX(conn), .r.p.tcp.tcp.index = CONN_IDX(conn),
.r.p.tcp.tcp.v6 = CONN_V6(conn) }; .r.p.tcp.tcp.v6 = CONN_V6(conn) };
struct epoll_event ev = { .data.u64 = ref.u64 }; struct epoll_event ev = { .data.u64 = ref.u64 };
if (conn->events == CLOSED) { if (conn->events == CLOSED) {
if (conn->flags & IN_EPOLL) if (conn->c.in_epoll)
epoll_ctl(c->epollfd, EPOLL_CTL_DEL, conn->sock, &ev); epoll_ctl(c->epollfd, EPOLL_CTL_DEL, conn->sock, &ev);
if (conn->timer != -1) if (conn->timer != -1)
epoll_ctl(c->epollfd, EPOLL_CTL_DEL, conn->timer, &ev); epoll_ctl(c->epollfd, EPOLL_CTL_DEL, conn->timer, &ev);
@ -679,7 +679,7 @@ static int tcp_epoll_ctl(const struct ctx *c, struct tcp_tap_conn *conn)
if (epoll_ctl(c->epollfd, m, conn->sock, &ev)) if (epoll_ctl(c->epollfd, m, conn->sock, &ev))
return -errno; return -errno;
conn->flags |= IN_EPOLL; /* No need to log this */ conn->c.in_epoll = true;
if (conn->timer != -1) { if (conn->timer != -1) {
union epoll_ref ref_t = { .r.proto = IPPROTO_TCP, union epoll_ref ref_t = { .r.proto = IPPROTO_TCP,

20
tcp_conn.h
View file

@ -14,9 +14,11 @@
/** /**
* struct tcp_conn_common - Common fields for spliced and non-spliced * struct tcp_conn_common - Common fields for spliced and non-spliced
* @spliced: Is this a spliced connection? * @spliced: Is this a spliced connection?
* @in_epoll: Is the connection in the epoll set?
*/ */
struct tcp_conn_common { struct tcp_conn_common {
bool spliced :1; bool spliced :1;
bool in_epoll :1;
}; };
extern const char *tcp_common_flag_str[]; extern const char *tcp_common_flag_str[];
@ -90,10 +92,9 @@ struct tcp_tap_conn {
#define STALLED BIT(0) #define STALLED BIT(0)
#define LOCAL BIT(1) #define LOCAL BIT(1)
#define WND_CLAMPED BIT(2) #define WND_CLAMPED BIT(2)
#define IN_EPOLL BIT(3) #define ACTIVE_CLOSE BIT(3)
#define ACTIVE_CLOSE BIT(4) #define ACK_TO_TAP_DUE BIT(4)
#define ACK_TO_TAP_DUE BIT(5) #define ACK_FROM_TAP_DUE BIT(5)
#define ACK_FROM_TAP_DUE BIT(6)
unsigned int hash_bucket :TCP_HASH_BUCKET_BITS; unsigned int hash_bucket :TCP_HASH_BUCKET_BITS;
@ -170,12 +171,11 @@ struct tcp_splice_conn {
uint8_t flags; uint8_t flags;
#define SPLICE_V6 BIT(0) #define SPLICE_V6 BIT(0)
#define SPLICE_IN_EPOLL BIT(1) #define RCVLOWAT_SET_A BIT(1)
#define RCVLOWAT_SET_A BIT(2) #define RCVLOWAT_SET_B BIT(2)
#define RCVLOWAT_SET_B BIT(3) #define RCVLOWAT_ACT_A BIT(3)
#define RCVLOWAT_ACT_A BIT(4) #define RCVLOWAT_ACT_B BIT(4)
#define RCVLOWAT_ACT_B BIT(5) #define CLOSING BIT(5)
#define CLOSING BIT(6)
uint32_t a_read; uint32_t a_read;
uint32_t a_written; uint32_t a_written;

8
tcp_splice.c
View file

@ -83,8 +83,8 @@ static const char *tcp_splice_event_str[] __attribute((__unused__)) = {
/* Display strings for connection flags */ /* Display strings for connection flags */
static const char *tcp_splice_flag_str[] __attribute((__unused__)) = { static const char *tcp_splice_flag_str[] __attribute((__unused__)) = {
"SPLICE_V6", "SPLICE_IN_EPOLL", "RCVLOWAT_SET_A", "RCVLOWAT_SET_B", "SPLICE_V6", "RCVLOWAT_SET_A", "RCVLOWAT_SET_B", "RCVLOWAT_ACT_A",
"RCVLOWAT_ACT_A", "RCVLOWAT_ACT_B", "CLOSING", "RCVLOWAT_ACT_B", "CLOSING",
}; };
/** /**
@ -164,7 +164,7 @@ static void conn_flag_do(const struct ctx *c, struct tcp_splice_conn *conn,
static int tcp_splice_epoll_ctl(const struct ctx *c, static int tcp_splice_epoll_ctl(const struct ctx *c,
struct tcp_splice_conn *conn) struct tcp_splice_conn *conn)
{ {
int m = (conn->flags & SPLICE_IN_EPOLL) ? EPOLL_CTL_MOD : EPOLL_CTL_ADD; int m = conn->c.in_epoll ? EPOLL_CTL_MOD : EPOLL_CTL_ADD;
union epoll_ref ref_a = { .r.proto = IPPROTO_TCP, .r.s = conn->a, union epoll_ref ref_a = { .r.proto = IPPROTO_TCP, .r.s = conn->a,
.r.p.tcp.tcp.splice = 1, .r.p.tcp.tcp.splice = 1,
.r.p.tcp.tcp.index = CONN_IDX(conn), .r.p.tcp.tcp.index = CONN_IDX(conn),
@ -188,7 +188,7 @@ static int tcp_splice_epoll_ctl(const struct ctx *c,
epoll_ctl(c->epollfd, m, conn->b, &ev_b)) epoll_ctl(c->epollfd, m, conn->b, &ev_b))
goto delete; goto delete;
conn->flags |= SPLICE_IN_EPOLL; /* No need to log this */ conn->c.in_epoll = true;
return 0; return 0;