From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 16F245A005A for ; Fri, 14 Jun 2024 08:14:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1718345632; bh=wYZ42Frp69EvofOArY1T9rfOoidvHDorXPwEE8jBY3M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N81ef71+kW4FyTT3ffuUFnqaoczKmFj0JskkIXbfRdxDxwKJDnFsdBJHPhZJsWlJa 0CC8gPWs3REA/JvE24kNdgD0oHehQqsZz8Ah0yABJI50FJgDbbLxdScy6yVRhv2bMa DllFGwcpNeG6PqvCnazzVQVRGKA4l6MvBqzFx6V178S+oUXWDRqUEDsp8c1LU/9i5G hsoHToQoJ/+hm4IXm/jQC0zyO/FAtW0YG0PEZ7vKluatmViwB6IvqdMNujn+vZnHo1 +MjkEV6pH8u06DnzcZAxoYbH0rOyfaEem4Nh1U2AnXTc1Ti6APQGP5d7hK0ehECudn iZ+DJG7SSQE1w== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4W0prJ3jzdz4x2J; Fri, 14 Jun 2024 16:13:52 +1000 (AEST) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH v6 24/26] udp: Remove tap port flags field Date: Fri, 14 Jun 2024 16:13:46 +1000 Message-ID: <20240614061348.3814736-25-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240614061348.3814736-1-david@gibson.dropbear.id.au> References: <20240614061348.3814736-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: THEPPYHLNKWM7OKT46FPOANGR4IM6RGA X-Message-ID-Hash: THEPPYHLNKWM7OKT46FPOANGR4IM6RGA X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: jmaloy@redhat.com, David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The flags field in udp_tap_port was used to implement a rudimentary (and buggy) form of connection tracking. This has now been taken over by the flow table. So, eliminate the field. This in turn allows udp_tap_port and udp_splice_port to be merged into a single type. Signed-off-by: David Gibson --- udp.c | 61 ++++++++++++++++++++--------------------------------------- 1 file changed, 20 insertions(+), 41 deletions(-) diff --git a/udp.c b/udp.c index 3b30306a..489e2095 100644 --- a/udp.c +++ b/udp.c @@ -133,38 +133,21 @@ #define UDP_MAX_FRAMES 32 /* max # of frames to receive at once */ /** - * struct udp_tap_port - Port tracking based on tap-facing source port - * @sock: Socket bound to source port used as index - * @flags: Flags for recent activity type seen from/to port - * @ts: Activity timestamp from tap, used for socket aging - */ -struct udp_tap_port { - int sock; - uint8_t flags; -#define PORT_LOCAL BIT(0) /* Port was contacted from local address */ -#define PORT_LOOPBACK BIT(1) /* Port was contacted from loopback address */ -#define PORT_GUA BIT(2) /* Port was contacted from global unicast */ -#define PORT_DNS_FWD BIT(3) /* Port used as source for DNS remapped query */ - - time_t ts; -}; - -/** - * struct udp_splice_port - Bound socket for spliced communication + * struct udp_bound_port - Bound socket for host or ns communication * @sock: Socket bound to index port * @ts: Activity timestamp */ -struct udp_splice_port { +struct udp_bound_port { int sock; time_t ts; }; /* 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_bound_port udp_tap_map [IP_VERSIONS][NUM_PORTS]; /* "Spliced" sockets indexed by bound port (host order) */ -static struct udp_splice_port udp_splice_ns [IP_VERSIONS][NUM_PORTS]; -static struct udp_splice_port udp_splice_init[IP_VERSIONS][NUM_PORTS]; +static struct udp_bound_port udp_splice_ns [IP_VERSIONS][NUM_PORTS]; +static struct udp_bound_port udp_splice_init[IP_VERSIONS][NUM_PORTS]; enum udp_act_type { UDP_ACT_TAP, @@ -387,7 +370,7 @@ int udp_splice_new(const struct ctx *c, int v6, in_port_t src, bool ns) union epoll_ref ref = { .type = EPOLL_TYPE_UDP, .udp = { .splice = true, .v6 = v6, .port = src } }; - struct udp_splice_port *sp; + struct udp_bound_port *sp; int act, s; if (ns) { @@ -1109,41 +1092,37 @@ static void udp_splice_iov_init(void) static void udp_timer_one(struct ctx *c, int v6, enum udp_act_type type, in_port_t port, const struct timespec *now) { - struct udp_splice_port *sp; - struct udp_tap_port *tp; - int *sockp = NULL; + struct udp_bound_port *bp; switch (type) { case UDP_ACT_TAP: - tp = &udp_tap_map[v6 ? V6 : V4][port]; + bp = &udp_tap_map[v6 ? V6 : V4][port]; - if (now->tv_sec - tp->ts > UDP_CONN_TIMEOUT) { - sockp = &tp->sock; - tp->flags = 0; - } + if (now->tv_sec - bp->ts <= UDP_CONN_TIMEOUT) + return; /* nothing to do */ break; case UDP_ACT_SPLICE_INIT: - sp = &udp_splice_init[v6 ? V6 : V4][port]; + bp = &udp_splice_init[v6 ? V6 : V4][port]; - if (now->tv_sec - sp->ts > UDP_CONN_TIMEOUT) - sockp = &sp->sock; + if (now->tv_sec - bp->ts <= UDP_CONN_TIMEOUT) + return; /* nothing to do */ break; case UDP_ACT_SPLICE_NS: - sp = &udp_splice_ns[v6 ? V6 : V4][port]; + bp = &udp_splice_ns[v6 ? V6 : V4][port]; - if (now->tv_sec - sp->ts > UDP_CONN_TIMEOUT) - sockp = &sp->sock; + if (now->tv_sec - bp->ts <= UDP_CONN_TIMEOUT) + return; /* nothing to do */ break; default: return; } - if (sockp && *sockp >= 0) { - int s = *sockp; - *sockp = -1; + if (bp->sock >= 0) { + int s = bp->sock; + bp->sock = -1; epoll_ctl(c->epollfd, EPOLL_CTL_DEL, s, NULL); close(s); bitmap_clear(udp_act[v6 ? V6 : V4][type], port); @@ -1163,7 +1142,7 @@ static void udp_port_rebind(struct ctx *c, bool outbound) = outbound ? c->udp.fwd_out.f.map : c->udp.fwd_in.f.map; const uint8_t *rmap = outbound ? c->udp.fwd_in.f.map : c->udp.fwd_out.f.map; - struct udp_splice_port (*socks)[NUM_PORTS] + struct udp_bound_port (*socks)[NUM_PORTS] = outbound ? udp_splice_ns : udp_splice_init; unsigned port; -- 2.45.2