[PATCH 5/7] tcp: Merge tcp_update_check_tcp[46]()

public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed

From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>, passt-dev@passt.top
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH 5/7] tcp: Merge tcp_update_check_tcp[46]()
Date: Wed, 27 Nov 2024 14:54:08 +1100	[thread overview]
Message-ID: <20241127035410.1167773-6-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20241127035410.1167773-1-david@gibson.dropbear.id.au>

The only reason we need separate functions for the IPv4 and IPv6 case is
to calculate the checksum of the IP pseudo-header, which is different for
the two cases.  However, the caller already knows which path it's on and
can access the values needed for the pseudo-header partial sum more easily
than tcp_update_check_tcp[46]() can.

So, merge these functions into a single tcp_update_csum() function that
just takes the pseudo-header partial sum, calculated in the caller.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 tcp.c          | 59 +++++++++++++++++---------------------------------
 tcp_internal.h |  6 ++---
 tcp_vu.c       | 22 ++++++++++++-------
 3 files changed, 36 insertions(+), 51 deletions(-)

diff --git a/tcp.c b/tcp.c
index 2f900fc..482e460 100644
--- a/tcp.c
+++ b/tcp.c
@@ -753,44 +753,16 @@ static void tcp_sock_set_bufsize(const struct ctx *c, int s)
 }
 
 /**
- * tcp_update_check_tcp4() - Calculate TCP checksum for IPv4
- * @iph:	IPv4 header
+ * tcp_update_csum() - Calculate TCP checksum
+ * @psum:	Unfolded partial checksum of the IPv4 or IPv6 pseudo-header
  * @th:		TCP header (updated)
  * @payload:	TCP payload
  */
-void tcp_update_check_tcp4(const struct iphdr *iph, struct tcphdr *th,
-			   struct iov_tail *payload)
+void tcp_update_csum(uint32_t psum, struct tcphdr *th, struct iov_tail *payload)
 {
-	uint16_t l4len = ntohs(iph->tot_len) - sizeof(struct iphdr);
-	struct in_addr saddr = { .s_addr = iph->saddr };
-	struct in_addr daddr = { .s_addr = iph->daddr };
-	uint32_t sum;
-
-	sum = proto_ipv4_header_psum(l4len, IPPROTO_TCP, saddr, daddr);
-
-	th->check = 0;
-	sum = csum_unfolded(th, sizeof(*th), sum);
-	th->check = csum_iov_tail(payload, sum);
-}
-
-/**
- * tcp_update_check_tcp6() - Calculate TCP checksum for IPv6
- * @ip6h:	IPv6 header
- * @th:		TCP header (updated)
- * @payload:	TCP payload
- */
-void tcp_update_check_tcp6(const struct ipv6hdr *ip6h, struct tcphdr *th,
-			   struct iov_tail *payload)
-{
-	uint16_t l4len = ntohs(ip6h->payload_len);
-	uint32_t sum;
-
-	sum = proto_ipv6_header_psum(l4len, IPPROTO_TCP, &ip6h->saddr,
-				     &ip6h->daddr);
-
 	th->check = 0;
-	sum = csum_unfolded(th, sizeof(*th), sum);
-	th->check = csum_iov_tail(payload, sum);
+	psum = csum_unfolded(th, sizeof(*th), psum);
+	th->check = csum_iov_tail(payload, psum);
 }
 
 /**
@@ -937,10 +909,14 @@ void tcp_fill_headers4(const struct tcp_tap_conn *conn,
 
 	tcp_fill_header(th, conn, seq);
 
-	if (no_tcp_csum)
+	if (no_tcp_csum) {
 		th->check = 0;
-	else
-		tcp_update_check_tcp4(iph, th, payload);
+	} else {
+		uint32_t psum = proto_ipv4_header_psum(l4len, IPPROTO_TCP,
+						       *src4, *dst4);
+
+		tcp_update_csum(psum, th, payload);
+	}
 
 	tap_hdr_update(taph, l3len + sizeof(struct ethhdr));
 }
@@ -978,10 +954,15 @@ void tcp_fill_headers6(const struct tcp_tap_conn *conn,
 
 	tcp_fill_header(th, conn, seq);
 
-	if (no_tcp_csum)
+	if (no_tcp_csum) {
 		th->check = 0;
-	else
-		tcp_update_check_tcp6(ip6h, th, payload);
+	} else {
+		uint32_t psum = proto_ipv6_header_psum(l4len, IPPROTO_TCP,
+						       &ip6h->saddr,
+						       &ip6h->daddr);
+
+		tcp_update_csum(psum, th, payload);
+	}
 
 	tap_hdr_update(taph, l4len + sizeof(*ip6h) + sizeof(struct ethhdr));
 }
diff --git a/tcp_internal.h b/tcp_internal.h
index 9732b5b..cff06e0 100644
--- a/tcp_internal.h
+++ b/tcp_internal.h
@@ -162,10 +162,8 @@ void tcp_rst_do(const struct ctx *c, struct tcp_tap_conn *conn);
 
 struct tcp_info_linux;
 
-void tcp_update_check_tcp4(const struct iphdr *iph, struct tcphdr *th,
-			   struct iov_tail *payload);
-void tcp_update_check_tcp6(const struct ipv6hdr *ip6h, struct tcphdr *th,
-			   struct iov_tail *payload);
+void tcp_update_csum(uint32_t psum, struct tcphdr *th,
+		     struct iov_tail *payload);
 void tcp_fill_headers4(const struct tcp_tap_conn *conn,
 		       struct tap_hdr *taph, struct iphdr *iph,
 		       struct tcphdr *th, struct iov_tail *payload,
diff --git a/tcp_vu.c b/tcp_vu.c
index a4ec512..081c752 100644
--- a/tcp_vu.c
+++ b/tcp_vu.c
@@ -70,22 +70,28 @@ static void tcp_vu_update_check(const struct flowside *tapside,
 			        struct iovec *iov, int iov_cnt)
 {
 	char *base = iov[0].iov_base;
+	struct iov_tail payload;
+	struct tcphdr *th;
+	uint32_t psum;
 
 	if (inany_v4(&tapside->oaddr)) {
-		struct tcphdr *th = vu_payloadv4(base);
+		const struct in_addr *src4 = inany_v4(&tapside->oaddr);
+		const struct in_addr *dst4 = inany_v4(&tapside->eaddr);
 		const struct iphdr *iph = vu_ip(base);
-		struct iov_tail payload = IOV_TAIL(iov, iov_cnt,
-						   (char *)(th + 1) - base);
+		size_t l4len = ntohs(iph->tot_len) - sizeof(*iph);
 
-		tcp_update_check_tcp4(iph, th, &payload);
+		th = vu_payloadv4(base);
+		psum = proto_ipv4_header_psum(l4len, IPPROTO_TCP, *src4, *dst4);
 	} else {
-		struct tcphdr *th = vu_payloadv6(base);
 		const struct ipv6hdr *ip6h = vu_ip(base);
-		struct iov_tail payload = IOV_TAIL(iov, iov_cnt,
-						   (char *)(th + 1) - base);
+		size_t l4len = ntohs(ip6h->payload_len);
 
-		tcp_update_check_tcp6(ip6h, th, &payload);
+		th = vu_payloadv6(base);
+		psum = proto_ipv6_header_psum(l4len, IPPROTO_TCP,
+					      &ip6h->saddr, &ip6h->daddr);
 	}
+	payload = IOV_TAIL(iov, iov_cnt, (char *)(th + 1) - base);
+	tcp_update_csum(psum, th, &payload);
 }
 
 /**
-- 
@@ -70,22 +70,28 @@ static void tcp_vu_update_check(const struct flowside *tapside,
 			        struct iovec *iov, int iov_cnt)
 {
 	char *base = iov[0].iov_base;
+	struct iov_tail payload;
+	struct tcphdr *th;
+	uint32_t psum;
 
 	if (inany_v4(&tapside->oaddr)) {
-		struct tcphdr *th = vu_payloadv4(base);
+		const struct in_addr *src4 = inany_v4(&tapside->oaddr);
+		const struct in_addr *dst4 = inany_v4(&tapside->eaddr);
 		const struct iphdr *iph = vu_ip(base);
-		struct iov_tail payload = IOV_TAIL(iov, iov_cnt,
-						   (char *)(th + 1) - base);
+		size_t l4len = ntohs(iph->tot_len) - sizeof(*iph);
 
-		tcp_update_check_tcp4(iph, th, &payload);
+		th = vu_payloadv4(base);
+		psum = proto_ipv4_header_psum(l4len, IPPROTO_TCP, *src4, *dst4);
 	} else {
-		struct tcphdr *th = vu_payloadv6(base);
 		const struct ipv6hdr *ip6h = vu_ip(base);
-		struct iov_tail payload = IOV_TAIL(iov, iov_cnt,
-						   (char *)(th + 1) - base);
+		size_t l4len = ntohs(ip6h->payload_len);
 
-		tcp_update_check_tcp6(ip6h, th, &payload);
+		th = vu_payloadv6(base);
+		psum = proto_ipv6_header_psum(l4len, IPPROTO_TCP,
+					      &ip6h->saddr, &ip6h->daddr);
 	}
+	payload = IOV_TAIL(iov, iov_cnt, (char *)(th + 1) - base);
+	tcp_update_csum(psum, th, &payload);
 }
 
 /**
-- 
2.47.0

next prev parent reply	other threads:[~2024-11-27  3:54 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-27  3:54 [PATCH 0/7] TCP buffer handling cleanups (including vhost) David Gibson
2024-11-27  3:54 ` [PATCH 1/7] iov: iov tail helpers David Gibson
2024-11-27  3:54 ` [PATCH 2/7] iov, checksum: Replace csum_iov() with csum_iov_tail() David Gibson
2024-11-27  3:54 ` [PATCH 3/7] tcp: Pass TCP header and payload separately to tcp_update_check_tcp[46]() David Gibson
2024-11-27  3:54 ` [PATCH 4/7] tcp: Pass TCP header and payload separately to tcp_fill_headers[46]() David Gibson
2024-11-27  3:54 ` David Gibson [this message]
2024-11-27  3:54 ` [PATCH 6/7] tcp: Merge tcp_fill_headers[46]() with each other David Gibson
2024-11-27  3:54 ` [PATCH 7/7] tcp_vu: Remove unnecessary tcp_vu_update_check() function David Gibson

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:2f900fc dfblob:9732b5b dfblob:a4ec512 dfblob:482e460
dfblob:cff06e0 dfblob:081c752
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241127035410.1167773-6-david@gibson.dropbear.id.au \
    --to=david@gibson.dropbear.id.au \
    --cc=passt-dev@passt.top \
    --cc=sbrivio@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).