diff mbox series

[net-next,v2,03/21] rxrpc: Note cksum in txbuf

Message ID	20240304084322.705539-4-dhowells@redhat.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel+bounces-90220-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; From: David Howells <dhowells@redhat.com> To: netdev@vger.kernel.org Cc: David Howells <dhowells@redhat.com>, Marc Dionne <marc.dionne@auristor.com>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 03/21] rxrpc: Note cksum in txbuf Date: Mon, 4 Mar 2024 08:43:00 +0000 Message-ID: <20240304084322.705539-4-dhowells@redhat.com> In-Reply-To: <20240304084322.705539-1-dhowells@redhat.com> References: <20240304084322.705539-1-dhowells@redhat.com> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	rxrpc: Miscellaneous changes and make use of MSG_SPLICE_PAGES \| [net-next,v2,00/21] rxrpc: Miscellaneous changes and make use of MSG_SPLICE_PAGES [net-next,v2,01/21] rxrpc: Record the Tx serial in the rxrpc_txbuf and retransmit trace [net-next,v2,02/21] rxrpc: Convert rxrpc_txbuf::flags into a mask and don't use atomics [net-next,v2,03/21] rxrpc: Note cksum in txbuf [net-next,v2,04/21] rxrpc: Fix the names of the fields in the ACK trailer struct [net-next,v2,05/21] rxrpc: Strip barriers and atomics off of timer tracking [net-next,v2,06/21] rxrpc: Remove atomic handling on some fields only used in I/O thread [net-next,v2,07/21] rxrpc: Do lazy DF flag resetting [net-next,v2,08/21] rxrpc: Merge together DF/non-DF branches of data Tx function [net-next,v2,09/21] rxrpc: Add a kvec[] to the rxrpc_txbuf struct [net-next,v2,10/21] rxrpc: Split up the DATA packet transmission function [net-next,v2,11/21] rxrpc: Don't pick values out of the wire header when setting up security [net-next,v2,12/21] rxrpc: Move rxrpc_send_ACK() to output.c with rxrpc_send_ack_packet() [net-next,v2,13/21] rxrpc: Use rxrpc_txbuf::kvec[0] instead of rxrpc_txbuf::wire [net-next,v2,14/21] rxrpc: Do zerocopy using MSG_SPLICE_PAGES and page frags [net-next,v2,15/21] rxrpc: Parse received packets before dealing with timeouts [net-next,v2,16/21] rxrpc: Don't permit resending after all Tx packets acked [net-next,v2,17/21] rxrpc: Differentiate PING ACK transmission traces. [net-next,v2,18/21] rxrpc: Use ktimes for call timeout tracking and set the timer lazily [net-next,v2,19/21] rxrpc: Record probes after transmission and reduce number of time-gets [net-next,v2,20/21] rxrpc: Clean up the resend algorithm [net-next,v2,21/21] rxrpc: Extract useful fields from a received ACK to skb priv data

Commit Message

David Howells March 4, 2024, 8:43 a.m. UTC

  Add a field to rxrpc_txbuf in which to store the checksum to go in the
header as this may get overwritten in the wire header struct when
transmitting as part of a jumbo packet.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: "David S. Miller" <davem@davemloft.net>
cc: Eric Dumazet <edumazet@google.com>
cc: Jakub Kicinski <kuba@kernel.org>
cc: Paolo Abeni <pabeni@redhat.com>
cc: linux-afs@lists.infradead.org
cc: netdev@vger.kernel.org
---
 net/rxrpc/ar-internal.h | 1 +
 net/rxrpc/output.c      | 1 +
 net/rxrpc/rxkad.c       | 2 +-
 net/rxrpc/txbuf.c       | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
index 54d1dc97cb0f..c9a2882627aa 100644
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
@@ -803,6 +803,7 @@  struct rxrpc_txbuf {
 	unsigned int		flags;
 #define RXRPC_TXBUF_WIRE_FLAGS	0xff		/* The wire protocol flags */
 #define RXRPC_TXBUF_RESENT	0x100		/* Set if has been resent */
+	__be16			cksum;		/* Checksum to go in header */
 	u8 /*enum rxrpc_propose_ack_trace*/ ack_why;	/* If ack, why */
 	struct {
 		/* The packet for encrypting and DMA'ing.  We align it such
diff --git a/net/rxrpc/output.c b/net/rxrpc/output.c
index 8344ece5358a..828b145edc56 100644
--- a/net/rxrpc/output.c
+++ b/net/rxrpc/output.c
@@ -335,6 +335,7 @@  int rxrpc_send_data_packet(struct rxrpc_call *call, struct rxrpc_txbuf *txb)
 	/* Each transmission of a Tx packet+ needs a new serial number */
 	txb->serial = rxrpc_get_next_serial(conn);
 	txb->wire.serial = htonl(txb->serial);
+	txb->wire.cksum = txb->cksum;
 
 	if (test_bit(RXRPC_CONN_PROBING_FOR_UPGRADE, &conn->flags) &&
 	    txb->seq == 1)
diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
index 6b32d61d4cdc..28c9ce763be4 100644
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@ -378,7 +378,7 @@  static int rxkad_secure_packet(struct rxrpc_call *call, struct rxrpc_txbuf *txb)
 	y = (y >> 16) & 0xffff;
 	if (y == 0)
 		y = 1; /* zero checksums are not permitted */
-	txb->wire.cksum = htons(y);
+	txb->cksum = htons(y);
 
 	switch (call->conn->security_level) {
 	case RXRPC_SECURITY_PLAIN:
diff --git a/net/rxrpc/txbuf.c b/net/rxrpc/txbuf.c
index 48d5a8f644e5..7273615afe94 100644
--- a/net/rxrpc/txbuf.c
+++ b/net/rxrpc/txbuf.c
@@ -35,6 +35,7 @@  struct rxrpc_txbuf *rxrpc_alloc_txbuf(struct rxrpc_call *call, u8 packet_type,
 		txb->ack_why		= 0;
 		txb->seq		= call->tx_prepared + 1;
 		txb->serial		= 0;
+		txb->cksum		= 0;
 		txb->wire.epoch		= htonl(call->conn->proto.epoch);
 		txb->wire.cid		= htonl(call->cid);
 		txb->wire.callNumber	= htonl(call->call_id);