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

udp: Remove obsolete splice tracking

Browse Source 
Now that spliced datagrams are managed via the flow table, remove
UDP_ACT_SPLICE_NS and UDP_ACT_SPLICE_INIT which are no longer used.  With
those removed, the 'ts' field in udp_splice_port is also no longer used.
struct udp_splice_port now contains just a socket fd, so replace it with
a plain int in udp_splice_ns[] and udp_splice_init[].  The latter are still
used for tracking of automatic port forwarding.

Finally, the 'splice' field of union udp_epoll_ref is no longer used so
remove it as well.

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-18 15:26:48 +10:00 committed by Stefano Brivio
parent e0647ad80c
commit 8126f7a660
2 changed files with 19 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
udp.c
View File

@ -150,27 +150,15 @@ struct udp_tap_port {
time_t ts; time_t ts;
}; };
/**
* struct udp_splice_port - Bound socket for spliced communication
* @sock: Socket bound to index port
* @ts: Activity timestamp
*/
struct udp_splice_port {
int sock;
time_t ts;
};
/* Port tracking, arrays indexed by packet source port (host order) */ /* Port tracking, arrays indexed by packet source port (host order) */
static struct udp_tap_port udp_tap_map [IP_VERSIONS][NUM_PORTS]; static struct udp_tap_port udp_tap_map [IP_VERSIONS][NUM_PORTS];
/* "Spliced" sockets indexed by bound port (host order) */ /* "Spliced" sockets indexed by bound port (host order) */
static struct udp_splice_port udp_splice_ns [IP_VERSIONS][NUM_PORTS]; static int udp_splice_ns [IP_VERSIONS][NUM_PORTS];
static struct udp_splice_port udp_splice_init[IP_VERSIONS][NUM_PORTS]; static int udp_splice_init[IP_VERSIONS][NUM_PORTS];
enum udp_act_type { enum udp_act_type {
UDP_ACT_TAP, UDP_ACT_TAP,
UDP_ACT_SPLICE_NS,
UDP_ACT_SPLICE_INIT,
UDP_ACT_TYPE_MAX, UDP_ACT_TYPE_MAX,
}; };
@ -260,8 +248,8 @@ void udp_portmap_clear(void)
for (i = 0; i < NUM_PORTS; i++) { for (i = 0; i < NUM_PORTS; i++) {
udp_tap_map[V4][i].sock = udp_tap_map[V6][i].sock = -1; udp_tap_map[V4][i].sock = udp_tap_map[V6][i].sock = -1;
udp_splice_ns[V4][i].sock = udp_splice_ns[V6][i].sock = -1; udp_splice_ns[V4][i] = udp_splice_ns[V6][i] = -1;
udp_splice_init[V4][i].sock = udp_splice_init[V6][i].sock = -1; udp_splice_init[V4][i] = udp_splice_init[V6][i] = -1;
} }
} }
@ -1142,8 +1130,7 @@ int udp_tap_handler(struct ctx *c, uint8_t pif,
int udp_sock_init(const struct ctx *c, int ns, sa_family_t af, int udp_sock_init(const struct ctx *c, int ns, sa_family_t af,
const void *addr, const char *ifname, in_port_t port) const void *addr, const char *ifname, in_port_t port)
{ {
union udp_epoll_ref uref = { .splice = (c->mode == MODE_PASTA), union udp_epoll_ref uref = { .orig = true, .port = port };
.orig = true, .port = port };
int s, r4 = FD_REF_MAX + 1, r6 = FD_REF_MAX + 1; int s, r4 = FD_REF_MAX + 1, r6 = FD_REF_MAX + 1;
ASSERT(!c->no_udp); ASSERT(!c->no_udp);
@ -1161,12 +1148,12 @@ int udp_sock_init(const struct ctx *c, int ns, sa_family_t af,
ifname, port, uref.u32); ifname, port, uref.u32);
udp_tap_map[V4][port].sock = s < 0 ? -1 : s; udp_tap_map[V4][port].sock = s < 0 ? -1 : s;
udp_splice_init[V4][port].sock = s < 0 ? -1 : s; udp_splice_init[V4][port] = s < 0 ? -1 : s;
} else { } else {
r4 = s = sock_l4(c, AF_INET, EPOLL_TYPE_UDP, r4 = s = sock_l4(c, AF_INET, EPOLL_TYPE_UDP,
&in4addr_loopback, &in4addr_loopback,
ifname, port, uref.u32); ifname, port, uref.u32);
udp_splice_ns[V4][port].sock = s < 0 ? -1 : s; udp_splice_ns[V4][port] = s < 0 ? -1 : s;
} }
} }
@ -1178,12 +1165,12 @@ int udp_sock_init(const struct ctx *c, int ns, sa_family_t af,
ifname, port, uref.u32); ifname, port, uref.u32);
udp_tap_map[V6][port].sock = s < 0 ? -1 : s; udp_tap_map[V6][port].sock = s < 0 ? -1 : s;
udp_splice_init[V6][port].sock = s < 0 ? -1 : s; udp_splice_init[V6][port] = s < 0 ? -1 : s;
} else { } else {
r6 = s = sock_l4(c, AF_INET6, EPOLL_TYPE_UDP, r6 = s = sock_l4(c, AF_INET6, EPOLL_TYPE_UDP,
&in6addr_loopback, &in6addr_loopback,
ifname, port, uref.u32); ifname, port, uref.u32);
udp_splice_ns[V6][port].sock = s < 0 ? -1 : s; udp_splice_ns[V6][port] = s < 0 ? -1 : s;
} }
} }
@ -1224,7 +1211,6 @@ static void udp_splice_iov_init(void)
static void udp_timer_one(struct ctx *c, int v6, enum udp_act_type type, static void udp_timer_one(struct ctx *c, int v6, enum udp_act_type type,
in_port_t port, const struct timespec *now) in_port_t port, const struct timespec *now)
{ {
struct udp_splice_port *sp;
struct udp_tap_port *tp; struct udp_tap_port *tp;
int *sockp = NULL; int *sockp = NULL;
@ -1237,20 +1223,6 @@ static void udp_timer_one(struct ctx *c, int v6, enum udp_act_type type,
tp->flags = 0; tp->flags = 0;
} }
break;
case UDP_ACT_SPLICE_INIT:
sp = &udp_splice_init[v6 ? V6 : V4][port];
if (now->tv_sec - sp->ts > UDP_CONN_TIMEOUT)
sockp = &sp->sock;
break;
case UDP_ACT_SPLICE_NS:
sp = &udp_splice_ns[v6 ? V6 : V4][port];
if (now->tv_sec - sp->ts > UDP_CONN_TIMEOUT)
sockp = &sp->sock;
break; break;
default: default:
return; return;
@ -1274,24 +1246,23 @@ static void udp_timer_one(struct ctx *c, int v6, enum udp_act_type type,
*/ */
static void udp_port_rebind(struct ctx *c, bool outbound) static void udp_port_rebind(struct ctx *c, bool outbound)
{ {
int (*socks)[NUM_PORTS] = outbound ? udp_splice_ns : udp_splice_init;
const uint8_t *fmap const uint8_t *fmap
= outbound ? c->udp.fwd_out.f.map : c->udp.fwd_in.f.map; = outbound ? c->udp.fwd_out.f.map : c->udp.fwd_in.f.map;
const uint8_t *rmap const uint8_t *rmap
= outbound ? c->udp.fwd_in.f.map : c->udp.fwd_out.f.map; = outbound ? c->udp.fwd_in.f.map : c->udp.fwd_out.f.map;
struct udp_splice_port (*socks)[NUM_PORTS]
= outbound ? udp_splice_ns : udp_splice_init;
unsigned port; unsigned port;
for (port = 0; port < NUM_PORTS; port++) { for (port = 0; port < NUM_PORTS; port++) {
if (!bitmap_isset(fmap, port)) { if (!bitmap_isset(fmap, port)) {
if (socks[V4][port].sock >= 0) { if (socks[V4][port] >= 0) {
close(socks[V4][port].sock); close(socks[V4][port]);
socks[V4][port].sock = -1; socks[V4][port] = -1;
} }
if (socks[V6][port].sock >= 0) { if (socks[V6][port] >= 0) {
close(socks[V6][port].sock); close(socks[V6][port]);
socks[V6][port].sock = -1; socks[V6][port] = -1;
} }
continue; continue;
@ -1301,8 +1272,8 @@ static void udp_port_rebind(struct ctx *c, bool outbound)
if (bitmap_isset(rmap, port)) if (bitmap_isset(rmap, port))
continue; continue;
if ((c->ifi4 && socks[V4][port].sock == -1) || if ((c->ifi4 && socks[V4][port] == -1) ||
(c->ifi6 && socks[V6][port].sock == -1)) (c->ifi6 && socks[V6][port] == -1))
udp_sock_init(c, outbound, AF_UNSPEC, NULL, NULL, port); udp_sock_init(c, outbound, AF_UNSPEC, NULL, NULL, port);
} }
} }

5
udp.h
View File

@ -26,8 +26,6 @@ void udp_update_l2_buf(const unsigned char *eth_d, const unsigned char *eth_s);
* union udp_epoll_ref - epoll reference portion for TCP connections * union udp_epoll_ref - epoll reference portion for TCP connections
* @port: Source port for connected sockets, bound port otherwise * @port: Source port for connected sockets, bound port otherwise
* @pif: pif for this socket * @pif: pif for this socket
* @bound: Set if this file descriptor is a bound socket
* @splice: Set if descriptor packets to be "spliced"
* @orig: Set if a spliced socket which can originate "connections" * @orig: Set if a spliced socket which can originate "connections"
* @v6: Set for IPv6 sockets or connections * @v6: Set for IPv6 sockets or connections
* @u32: Opaque u32 value of reference * @u32: Opaque u32 value of reference
@ -36,8 +34,7 @@ union udp_epoll_ref {
struct { struct {
in_port_t port; in_port_t port;
uint8_t pif; uint8_t pif;
bool splice:1, bool orig:1,
orig:1,
v6:1; v6:1;
}; };
uint32_t u32; uint32_t u32;