From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 0E0C75A0270 for ; Thu, 24 Nov 2022 02:17:10 +0100 (CET) Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4NHg7y2r9sz4xTw; Thu, 24 Nov 2022 12:17:02 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1669252622; bh=vOGr88RmFNwUs7Z+EYple/e9lvlzBK8iDhEKdJuil7w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OaQBojkQ4mG5SwiltZRZJ0gJk7PDOc5+izVzMouQiRTKaljfIHPulmmJ7KwCcgYNk wuEHT7Jb0tcfgjDQZmPm0AH3Arn4K2XqgQQPPahIG1u/vahWJnNWw6eB8dpTOe0v63 DY1mWVHVGSRmzpMgJV/TaXL3aEYpgkgv1HPWv3Aw= From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v2 15/16] udp: Split send half of udp_sock_handler_splice() from the receive half Date: Thu, 24 Nov 2022 12:16:58 +1100 Message-Id: <20221124011659.1024901-16-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221124011659.1024901-1-david@gibson.dropbear.id.au> References: <20221124011659.1024901-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: ZWQAY2H5LQSAE4HLW676TFQLR2V74V26 X-Message-ID-Hash: ZWQAY2H5LQSAE4HLW676TFQLR2V74V26 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: David Gibson X-Mailman-Version: 3.3.3 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: Move the part of udp_sock_handler_splice() concerned with sending out the datagrams into a new udp_splice_sendfrom() helper. This will make later cleanups easier. Signed-off-by: David Gibson --- udp.c | 89 +++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 56 insertions(+), 33 deletions(-) diff --git a/udp.c b/udp.c index b7c71c2..2311e7d 100644 --- a/udp.c +++ b/udp.c @@ -511,41 +511,29 @@ static in_port_t sa_port(bool v6, const void *sa) } /** - * udp_sock_handler_splice() - Handler for socket mapped to "spliced" connection + * udp_splice_sendfrom() - Send datagrams from given port to given port * @c: Execution context - * @ref: epoll reference - * @events: epoll events bitmap - * @now: Current timestamp + * @mmh: Message descriptors to send + * @n: Number of datagrams to send + * @src: Datagrams will be sent from this port (on origin side) + * @dst: Datagrams will be send to this port (on destination side) + * @v6: Send as IPv6? + * @from_ns: If true send from pasta ns to init, otherwise reverse + * @allow_new: If true create sending socket if needed, if false discard + * if no sending socket is available + * @now: Timestamp */ -static void udp_sock_handler_splice(const struct ctx *c, union epoll_ref ref, - uint32_t events, const struct timespec *now) +static void udp_splice_sendfrom(const struct ctx *c, struct mmsghdr *mmh, int n, + in_port_t src, in_port_t dst, + bool v6, bool from_ns, bool allow_new, + const struct timespec *now) { - in_port_t src, dst = ref.r.p.udp.udp.port; - int s, v6 = ref.r.p.udp.udp.v6, n, i; - struct mmsghdr *mmh_recv, *mmh_send; - - if (!(events & EPOLLIN)) - return; - - if (v6) { - mmh_recv = udp6_l2_mh_sock; - mmh_send = udp6_mh_splice; - } else { - mmh_recv = udp4_l2_mh_sock; - mmh_send = udp4_mh_splice; - } - - n = recvmmsg(ref.r.s, mmh_recv, UDP_MAX_FRAMES, 0, NULL); - - if (n <= 0) - return; - - src = sa_port(v6, mmh_recv[0].msg_hdr.msg_name); + int s; - if (ref.r.p.udp.udp.ns) { + if (from_ns) { src += c->udp.fwd_in.rdelta[src]; s = udp_splice_init[v6][src].sock; - if (!s && ref.r.p.udp.udp.orig) + if (!s && allow_new) s = udp_splice_new(c, v6, src, false); if (s < 0) @@ -556,7 +544,7 @@ static void udp_sock_handler_splice(const struct ctx *c, union epoll_ref ref, } else { src += c->udp.fwd_out.rdelta[src]; s = udp_splice_ns[v6][src].sock; - if (!s && ref.r.p.udp.udp.orig) { + if (!s && allow_new) { struct udp_splice_new_ns_arg arg = { c, v6, src, -1, }; @@ -571,8 +559,38 @@ static void udp_sock_handler_splice(const struct ctx *c, union epoll_ref ref, udp_splice_ns[v6][src].ts = now->tv_sec; } - for (i = 0; i < n; i++) - mmh_send[i].msg_hdr.msg_iov->iov_len = mmh_recv[i].msg_len; + sendmmsg(s, mmh, n, MSG_NOSIGNAL); +} + +/** + * udp_sock_handler_splice() - Handler for socket mapped to "spliced" connection + * @c: Execution context + * @ref: epoll reference + * @events: epoll events bitmap + * @now: Current timestamp + */ +static void udp_sock_handler_splice(const struct ctx *c, union epoll_ref ref, + uint32_t events, const struct timespec *now) +{ + in_port_t src, dst = ref.r.p.udp.udp.port; + struct mmsghdr *mmh_recv, *mmh_send; + int v6 = ref.r.p.udp.udp.v6, n, i; + + if (!(events & EPOLLIN)) + return; + + if (v6) { + mmh_recv = udp6_l2_mh_sock; + mmh_send = udp6_mh_splice; + } else { + mmh_recv = udp4_l2_mh_sock; + mmh_send = udp4_mh_splice; + } + + n = recvmmsg(ref.r.s, mmh_recv, UDP_MAX_FRAMES, 0, NULL); + + if (n <= 0) + return; if (v6) { *((struct sockaddr_in6 *)&udp_splice_namebuf) = @@ -592,7 +610,12 @@ static void udp_sock_handler_splice(const struct ctx *c, union epoll_ref ref, }); } - sendmmsg(s, mmh_send, n, MSG_NOSIGNAL); + for (i = 0; i < n; i++) + mmh_send[i].msg_hdr.msg_iov->iov_len = mmh_recv[i].msg_len; + + src = sa_port(v6, mmh_recv[0].msg_hdr.msg_name); + udp_splice_sendfrom(c, mmh_send, n, src, ref.r.p.udp.udp.port, + v6, ref.r.p.udp.udp.ns, ref.r.p.udp.udp.orig, now); } /** -- 2.38.1