From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 557485A0271 for ; Wed, 6 Mar 2024 06:34:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1709703270; bh=qKiK74C4dcXkK3V4AMAsycDI4Fxewnds4EInpBkEBY0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QwF/qJD3HFZxi0n+mOB+xdt0xuHXJaJXLC/hPsXGXAa42cgTefS7wlq+sIXv0x+xp HXUM53i10cFAQqorfuV9G9cl//h6s8OSC/6Vdy8bZIBM9w9wJpQ6MFMXJVLUtJUSXQ UJLcMmGK2CzqfsgxWmAHjnYE7leZTlw0a0jHFG9tjU9lycZK7SKeOQG9LmKWzsBcoa 7lzReXCnGks5DOxXJ8w5r9tHx8DXwjDZvjmgoiBNMjHhUaU+es5TzKwo10b9Bq6LHc jXT2sSCAIDHUbgG85PrAO1ZDnSBWrqh+rNl1+65niu8X5igkV5dVEyUy00RAVOM97P hDcbLkleCYNoA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4TqLj23mT6z4wc8; Wed, 6 Mar 2024 16:34:30 +1100 (AEDT) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH v2 1/6] udp: Refactor udp_sock[46]_iov_init() Date: Wed, 6 Mar 2024 16:34:23 +1100 Message-ID: <20240306053428.1176129-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240306053428.1176129-1-david@gibson.dropbear.id.au> References: <20240306053428.1176129-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: XIX5JYX6VXI2WZAPTXTPPSFHNYNNL4X6 X-Message-ID-Hash: XIX5JYX6VXI2WZAPTXTPPSFHNYNNL4X6 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.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: Each of these functions have 3 essentially identical loops in a row. Merge the loops into a single common udp_sock_iov_init() function, calling udp_sock[46]_iov_init_one() helpers to initialize each "slot" in the various parallel arrays. This is slightly neater now, and more naturally allows changes we want to make where more initialization will become common between IPv4 and IPv6. Signed-off-by: David Gibson --- udp.c | 102 ++++++++++++++++++++++++++++------------------------------ 1 file changed, 50 insertions(+), 52 deletions(-) diff --git a/udp.c b/udp.c index 1f46afb2..df5f3c48 100644 --- a/udp.c +++ b/udp.c @@ -294,72 +294,74 @@ void udp_update_l2_buf(const unsigned char *eth_d, const unsigned char *eth_s) } /** - * udp_sock4_iov_init() - Initialise scatter-gather L2 buffers for IPv4 sockets + * udp_sock4_iov_init_one() - Initialise a scatter-gather L2 buffer for IPv4 * @c: Execution context + * @i: Index of buffer to initialize */ -static void udp_sock4_iov_init(const struct ctx *c) +static void udp_sock4_iov_init_one(const struct ctx *c, size_t i) { - struct mmsghdr *h; - int i; - - for (i = 0; i < ARRAY_SIZE(udp4_l2_buf); i++) { - udp4_l2_buf[i] = (struct udp4_l2_buf_t) { - .taph = TAP_HDR_INIT(ETH_P_IP), - .iph = L2_BUF_IP4_INIT(IPPROTO_UDP) - }; - } - - for (i = 0, h = udp4_l2_mh_sock; i < UDP_MAX_FRAMES; i++, h++) { - struct msghdr *mh = &h->msg_hdr; + struct msghdr *mh = &udp4_l2_mh_sock[i].msg_hdr; + struct udp4_l2_buf_t *buf = &udp4_l2_buf[i]; + struct iovec *siov = &udp4_l2_iov_sock[i]; + struct iovec *tiov = &udp4_l2_iov_tap[i]; - mh->msg_name = &udp4_l2_buf[i].s_in; - mh->msg_namelen = sizeof(udp4_l2_buf[i].s_in); + *buf = (struct udp4_l2_buf_t) { + .taph = TAP_HDR_INIT(ETH_P_IP), + .iph = L2_BUF_IP4_INIT(IPPROTO_UDP) + }; - udp4_l2_iov_sock[i].iov_base = udp4_l2_buf[i].data; - udp4_l2_iov_sock[i].iov_len = sizeof(udp4_l2_buf[i].data); - mh->msg_iov = &udp4_l2_iov_sock[i]; - mh->msg_iovlen = 1; - } + siov->iov_base = buf->data; + siov->iov_len = sizeof(buf->data); - for (i = 0; i < UDP_MAX_FRAMES; i++) { - struct iovec *iov = &udp4_l2_iov_tap[i]; + mh->msg_name = &buf->s_in; + mh->msg_namelen = sizeof(buf->s_in); + mh->msg_iov = siov; + mh->msg_iovlen = 1; - iov->iov_base = tap_iov_base(c, &udp4_l2_buf[i].taph); - } + tiov->iov_base = tap_iov_base(c, &buf->taph); } /** - * udp_sock6_iov_init() - Initialise scatter-gather L2 buffers for IPv6 sockets + * udp_sock6_iov_init_one() - Initialise a scatter-gather L2 buffer for IPv6 * @c: Execution context + * @i: Index of buffer to initialize */ -static void udp_sock6_iov_init(const struct ctx *c) +static void udp_sock6_iov_init_one(const struct ctx *c, size_t i) { - struct mmsghdr *h; - int i; + struct msghdr *mh = &udp6_l2_mh_sock[i].msg_hdr; + struct udp6_l2_buf_t *buf = &udp6_l2_buf[i]; + struct iovec *siov = &udp6_l2_iov_sock[i]; + struct iovec *tiov = &udp6_l2_iov_tap[i]; - for (i = 0; i < ARRAY_SIZE(udp6_l2_buf); i++) { - udp6_l2_buf[i] = (struct udp6_l2_buf_t) { - .taph = TAP_HDR_INIT(ETH_P_IPV6), - .ip6h = L2_BUF_IP6_INIT(IPPROTO_UDP) - }; - } + *buf = (struct udp6_l2_buf_t) { + .taph = TAP_HDR_INIT(ETH_P_IPV6), + .ip6h = L2_BUF_IP6_INIT(IPPROTO_UDP) + }; - for (i = 0, h = udp6_l2_mh_sock; i < UDP_MAX_FRAMES; i++, h++) { - struct msghdr *mh = &h->msg_hdr; + siov->iov_base = buf->data; + siov->iov_len = sizeof(buf->data); - mh->msg_name = &udp6_l2_buf[i].s_in6; - mh->msg_namelen = sizeof(struct sockaddr_in6); + mh->msg_name = &buf->s_in6; + mh->msg_namelen = sizeof(buf->s_in6); + mh->msg_iov = siov; + mh->msg_iovlen = 1; - udp6_l2_iov_sock[i].iov_base = udp6_l2_buf[i].data; - udp6_l2_iov_sock[i].iov_len = sizeof(udp6_l2_buf[i].data); - mh->msg_iov = &udp6_l2_iov_sock[i]; - mh->msg_iovlen = 1; - } + tiov->iov_base = tap_iov_base(c, &buf->taph); +} - for (i = 0; i < UDP_MAX_FRAMES; i++) { - struct iovec *iov = &udp6_l2_iov_tap[i]; +/** + * udp_sock_iov_init() - Initialise scatter-gather L2 buffers + * @c: Execution context + */ +static void udp_sock_iov_init(const struct ctx *c) +{ + size_t i; - iov->iov_base = tap_iov_base(c, &udp6_l2_buf[i].taph); + for (i = 0; i < UDP_MAX_FRAMES; i++) { + if (c->ifi4) + udp_sock4_iov_init_one(c, i); + if (c->ifi6) + udp_sock6_iov_init_one(c, i); } } @@ -1230,11 +1232,7 @@ v6: */ int udp_init(struct ctx *c) { - if (c->ifi4) - udp_sock4_iov_init(c); - - if (c->ifi6) - udp_sock6_iov_init(c); + udp_sock_iov_init(c); udp_invert_portmap(&c->udp.fwd_in); udp_invert_portmap(&c->udp.fwd_out); -- 2.44.0