From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202410 header.b=XlDydNB8; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id E46CA5A004C for ; Mon, 04 Nov 2024 09:40:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202410; t=1730709607; bh=9RjOHNrT5QseVm2XjHm1ifjPHLgi04ZIMhQBJg58+2I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XlDydNB81XUZr5TY6VoZhogEoIoTEESPcartifJ4XOfTaQH15YrR16Cj1wuxOQhcU iJrtutCi4BNt6XwoVFV5WLzlt3LYNZr46XIA+WQtFvi7gknbg9RCea//2Zw8Za1Qrp 4u9lNP4tZ2aRsZOIjTQsuxlXUGBl2F7bdHRjUGPyU1GqlGXrN3DViXFkON6Jy3jCzH FDgZx/TN3Gouf3iKl3RCTp3elc/FlgOYdDJV4hy4xGBmmu3s8vIrCDprTJBZwIovRf nT3B642zYt8KLF8mEK0xbToLAffCq8ZET8ePdzdKghWclHjrl5Qd1iA3yBP3uQajgG tNjuAQUVVKfoA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4XhlK34d2xz4xGC; Mon, 4 Nov 2024 19:40:07 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v9 14/20] tcp_vu: Share more header construction between IPv4 and IPv6 paths Date: Mon, 4 Nov 2024 19:39:57 +1100 Message-ID: <20241104084004.3544294-15-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241104084004.3544294-1-david@gibson.dropbear.id.au> References: <20241104084004.3544294-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: EQTKGFSEWHJLI6F5YNI7OMKOI4BQNEAO X-Message-ID-Hash: EQTKGFSEWHJLI6F5YNI7OMKOI4BQNEAO 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: tcp_vu_send_flag() and tcp_vu_prepare() both needs to do some different things for IPv4 vs. IPv6. However the two paths have a number of lines of duplicated code. We can share those at the expense of an additional conditional (which we might be able to simplify again later). Signed-off-by: David Gibson --- tcp_vu.c | 90 ++++++++++++++++++++++++-------------------------------- 1 file changed, 39 insertions(+), 51 deletions(-) diff --git a/tcp_vu.c b/tcp_vu.c index c10a269..f779279 100644 --- a/tcp_vu.c +++ b/tcp_vu.c @@ -32,6 +32,7 @@ #include "tcp_internal.h" #include "checksum.h" #include "vu_common.h" +#include static struct iovec iov_vu[VIRTQUEUE_MAX_SIZE + 1]; static struct vu_virtq_element elem[VIRTQUEUE_MAX_SIZE]; @@ -94,7 +95,11 @@ int tcp_vu_send_flag(const struct ctx *c, struct tcp_tap_conn *conn, int flags) struct vu_virtq *vq = &vdev->vq[VHOST_USER_RX_QUEUE]; const struct flowside *tapside = TAPFLOW(conn); size_t l2len, l4len, optlen, hdrlen; + struct tcp_flags_t *payload; + struct ipv6hdr *ip6h = NULL; + struct iphdr *iph = NULL; struct ethhdr *eh; + uint32_t seq; int elem_cnt; int nb_ack; int ret; @@ -117,60 +122,45 @@ int tcp_vu_send_flag(const struct ctx *c, struct tcp_tap_conn *conn, int flags) memcpy(eh->h_source, c->our_tap_mac, sizeof(eh->h_source)); if (CONN_V4(conn)) { - struct tcp_flags_t *payload; - struct iphdr *iph; - uint32_t seq; - eh->h_proto = htons(ETH_P_IP); iph = vu_ip(iov_vu[0].iov_base); *iph = (struct iphdr)L2_BUF_IP4_INIT(IPPROTO_TCP); payload = vu_payloadv4(iov_vu[0].iov_base); - memset(&payload->th, 0, sizeof(payload->th)); - payload->th.doff = offsetof(struct tcp_flags_t, opts) / 4; - payload->th.ack = 1; - - seq = conn->seq_to_tap; - ret = tcp_prepare_flags(c, conn, flags, &payload->th, - &payload->opts, &optlen); - if (ret <= 0) { - vu_queue_rewind(vq, 1); - return ret; - } - - l4len = tcp_fill_headers4(conn, NULL, iph, - (struct tcp_payload_t *)payload, optlen, - NULL, seq, true); - l2len = sizeof(*iph); } else { - struct tcp_flags_t *payload; - struct ipv6hdr *ip6h; - uint32_t seq; - eh->h_proto = htons(ETH_P_IPV6); ip6h = vu_ip(iov_vu[0].iov_base); *ip6h = (struct ipv6hdr)L2_BUF_IP6_INIT(IPPROTO_TCP); payload = vu_payloadv6(iov_vu[0].iov_base); - memset(&payload->th, 0, sizeof(payload->th)); - payload->th.doff = offsetof(struct tcp_flags_t, opts) / 4; - payload->th.ack = 1; - - seq = conn->seq_to_tap; - ret = tcp_prepare_flags(c, conn, flags, &payload->th, - &payload->opts, &optlen); - if (ret <= 0) { - vu_queue_rewind(vq, 1); - return ret; - } + } + + memset(&payload->th, 0, sizeof(payload->th)); + payload->th.doff = offsetof(struct tcp_flags_t, opts) / 4; + payload->th.ack = 1; + + seq = conn->seq_to_tap; + ret = tcp_prepare_flags(c, conn, flags, &payload->th, + &payload->opts, &optlen); + if (ret <= 0) { + vu_queue_rewind(vq, 1); + return ret; + } + if (CONN_V4(conn)) { + l4len = tcp_fill_headers4(conn, NULL, iph, + (struct tcp_payload_t *)payload, optlen, + NULL, seq, true); + l2len = sizeof(*iph); + } else { l4len = tcp_fill_headers6(conn, NULL, ip6h, (struct tcp_payload_t *)payload, optlen, seq, true); l2len = sizeof(*ip6h); } + l2len += l4len + sizeof(struct ethhdr); elem[0].in_sg[0].iov_len = l2len + @@ -284,7 +274,10 @@ static void tcp_vu_prepare(const struct ctx *c, size_t dlen, const uint16_t **check) { const struct flowside *toside = TAPFLOW(conn); + struct tcp_payload_t *payload; char *base = first->iov_base; + struct ipv6hdr *ip6h = NULL; + struct iphdr *iph = NULL; struct ethhdr *eh; /* we guess the first iovec provided by the guest can embed @@ -297,10 +290,8 @@ static void tcp_vu_prepare(const struct ctx *c, memcpy(eh->h_source, c->our_tap_mac, sizeof(eh->h_source)); /* initialize header */ - if (inany_v4(&toside->eaddr) && inany_v4(&toside->oaddr)) { - struct tcp_payload_t *payload; - struct iphdr *iph; + if (inany_v4(&toside->eaddr) && inany_v4(&toside->oaddr)) { ASSERT(first[0].iov_len >= sizeof(struct virtio_net_hdr_mrg_rxbuf) + sizeof(struct ethhdr) + sizeof(struct iphdr) + sizeof(struct tcphdr)); @@ -310,17 +301,7 @@ static void tcp_vu_prepare(const struct ctx *c, iph = vu_ip(base); *iph = (struct iphdr)L2_BUF_IP4_INIT(IPPROTO_TCP); payload = vu_payloadv4(base); - memset(&payload->th, 0, sizeof(payload->th)); - payload->th.doff = offsetof(struct tcp_payload_t, data) / 4; - payload->th.ack = 1; - - tcp_fill_headers4(conn, NULL, iph, payload, dlen, - *check, conn->seq_to_tap, true); - *check = &iph->check; } else { - struct tcp_payload_t *payload; - struct ipv6hdr *ip6h; - ASSERT(first[0].iov_len >= sizeof(struct virtio_net_hdr_mrg_rxbuf) + sizeof(struct ethhdr) + sizeof(struct ipv6hdr) + sizeof(struct tcphdr)); @@ -331,10 +312,17 @@ static void tcp_vu_prepare(const struct ctx *c, *ip6h = (struct ipv6hdr)L2_BUF_IP6_INIT(IPPROTO_TCP); payload = vu_payloadv6(base); - memset(&payload->th, 0, sizeof(payload->th)); - payload->th.doff = offsetof(struct tcp_payload_t, data) / 4; - payload->th.ack = 1; + } + memset(&payload->th, 0, sizeof(payload->th)); + payload->th.doff = offsetof(struct tcp_payload_t, data) / 4; + payload->th.ack = 1; + + if (inany_v4(&toside->eaddr) && inany_v4(&toside->oaddr)) { + tcp_fill_headers4(conn, NULL, iph, payload, dlen, + *check, conn->seq_to_tap, true); + *check = &iph->check; + } else { tcp_fill_headers6(conn, NULL, ip6h, payload, dlen, conn->seq_to_tap, true); } -- 2.47.0