From patchwork Mon Mar 4 08:43:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 209415 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp1292765dyc; Mon, 4 Mar 2024 00:44:56 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW4EhGpvK59lbR6i7DHC9WW+JjfWKbiQwyR509uMp9b0WxEFej0hMdO5HC49hy+3qtjQLVshFkjpRQGovCxEcS5rVzDcQ== X-Google-Smtp-Source: AGHT+IHtBa0s+NyHpiLSjCLu04RgAeXyd701ecWnESpBrR70NTRX8uhR8/NmyK/fKnraNWbjJ81T X-Received: by 2002:ac8:5714:0:b0:42e:ea62:ad17 with SMTP id 20-20020ac85714000000b0042eea62ad17mr4704366qtw.18.1709541896357; Mon, 04 Mar 2024 00:44:56 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709541896; cv=pass; d=google.com; s=arc-20160816; b=xOAxUSdykJPb9N0tKaxdeARR8tmC/ROcIMAwER4fHkoudReJnZVmZpe3huVsxxnK5x qM03DlUtbzTKHFSgP4flKCGy/JxcZ17/OZb4lD+2ZNjYR7+HQE0EBiqF3XGB8fYIvgkA KioTjwAYH1yr4DR7GlfWyzPZNAs0LAJE9UPgsXLBYHOi+3Jcaau6CtkAEsnqFjooNFzh MjteniKrKxtydNHiK4fU0IjnkLewnzYwFHykW5cHTkNHQhl3qNQkiGaMsaNP6SHO+ljk MXWW0gV0pAcnAjzssDQeytQ6aLgaaK5GVGFGfJ+MdyQwSLEhQQ2QjauqleMBSPElytBW jz9Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=cMQOrfq9a6ADqnlPZTTmLOdel6QUSyVccUmRoxVrLQY=; fh=icnuzcdbhXgwjK0pgvJXK7xplE+Och0jvyZv2PxZJ18=; b=cPF1N9XA81wFePVOzxqfe3W/T4i0ejFaZgcSdAfHzF4zXhYxh2ilrQnZBXxMQPWN3B QjOKvaeaXRIMQHglPe00BRUSNW4J8n0pWNIztELKxOFKZgHZkXfybJz1ILHhl7WmzTmI 30Tp7WcNUP9FD2Ow9zwEyih7b1Vzl12zybTl+BEEcYCe8qAMv4hr9HSwYSn3kwZjc86r Y0+T5q5KNHuaGWSUysXhkbNnwhIzPnJsP7wj30BF5Map0YQOtCdeg0A+76Tb2vOnJ2gQ Giyj2E9JwBnUWAMy/UG6uWIL1U1g6XR5g9U7RIg5XLB81rrJS6syIWXXMiLQmuhBXysB AH6A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bmvjlrG8; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-90220-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90220-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id c5-20020a05622a024500b0042ef108e84dsi1873778qtx.629.2024.03.04.00.44.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 00:44:56 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bmvjlrG8; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-90220-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90220-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 2A7D51C21219 for ; Mon, 4 Mar 2024 08:44:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CF9AC225AA; Mon, 4 Mar 2024 08:43:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bmvjlrG8" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E6701B965 for ; Mon, 4 Mar 2024 08:43:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709541818; cv=none; b=grZMlN3cYbp0sNnc7vhyR9wgGoaWC8eZTw1CSajQyJcZX7A2sPHwmSqdCk6pQijevM6XXcvpPAdBdnEMWZnEv3hB0llkZsVjXMXqbrll+xtdCyUC+70B4s6rzsefn7STg4QNGFkVFepi8WAZPXosNPi7nWzvTDEQQVhyPdCqtOs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709541818; c=relaxed/simple; bh=YWox0hlkKOXJP+Kviv9g4eZURamiy3zXGc3RHcp1fE4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KtHNTMkpMyhF9B+HAEGoQyMX5Atf+AiUBh1+Dd8U86JvspWBGsyDhZX9G4BqG1FooVdWKwfuq2X5H8kDBA29vwOySXkhjGV9w7KcLonC+bT79akNjABzNSE8hxZxTaKEbxMc+8UjVIGPAJl30yjD9FHNU5Y1oOtFoKlxbQkKfFg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=bmvjlrG8; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709541815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cMQOrfq9a6ADqnlPZTTmLOdel6QUSyVccUmRoxVrLQY=; b=bmvjlrG8RWICeSsJlLn8RFfuQCQ0Doij3kPe8UyIJBOE4t/wJC3yAiSn0Olv3NSZngP54N FsOqyr8ybVvNm2WefnMOIkNamp6l6D6NKrJ4aKMbkpy90Px1Qq2xRv8lB3Ffp9UdcXMGTH qVxIgDE3/HF+j1HJmV2lAPnr8/FdWC8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-44-Vqfie6JjOu2z3gaRoWZK8g-1; Mon, 04 Mar 2024 03:43:32 -0500 X-MC-Unique: Vqfie6JjOu2z3gaRoWZK8g-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9B06F106D06C; Mon, 4 Mar 2024 08:43:31 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D5811C060AF; Mon, 4 Mar 2024 08:43:30 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , Marc Dionne , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , 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 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792584603571416580 X-GMAIL-MSGID: 1792584603571416580 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 cc: Marc Dionne cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni 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 --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);