Received-SPF: pass (google.com: domain of linux-kernel+bounces-128605-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: Haiyang Zhang <haiyangz@microsoft.com>
To: linux-hyperv@vger.kernel.org,
	netdev@vger.kernel.org
Cc: haiyangz@microsoft.com,
	decui@microsoft.com,
	stephen@networkplumber.org,
	kys@microsoft.com,
	paulros@microsoft.com,
	olaf@aepfle.de,
	vkuznets@redhat.com,
	davem@davemloft.net,
	wei.liu@kernel.org,
	edumazet@google.com,
	kuba@kernel.org,
	pabeni@redhat.com,
	leon@kernel.org,
	longli@microsoft.com,
	ssengar@linux.microsoft.com,
	linux-rdma@vger.kernel.org,
	daniel@iogearbox.net,
	john.fastabend@gmail.com,
	bpf@vger.kernel.org,
	ast@kernel.org,
	sharmaajay@microsoft.com,
	hawk@kernel.org,
	tglx@linutronix.de,
	shradhagupta@linux.microsoft.com,
	linux-kernel@vger.kernel.org,
	stable@vger.kernel.org
Subject: [PATCH net,v2] net: mana: Fix Rx DMA datasize and skb_over_panic
Date: Tue,  2 Apr 2024 12:48:36 -0700
Message-Id: <1712087316-20886-1-git-send-email-haiyangz@microsoft.com>
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
Sender: LKML haiyangz <lkmlhyz@microsoft.com>
X-MS-Exchange-MessageSentRepresentingType: 2
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: BY5PR21MB1443:EE_|LV2PR21MB3109:EE_
X-LD-Processed: 72f988bf-86f1-41af-91ab-2d7cd011db47,ExtAddr
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
 utpIEJEpquoNgr/Kz+LkAgOs2GFghWgRYbOGS65AHSbUf83g7z7Syb0/Oo5l/BcQgXm0r2dLARvrZFWeOhr5lY6LRnZTfJgxTnllO85762DgteBhgex7dbmN0mvR1eLMFvVYSamMJ0e02C6O4WQIXckt5bqwx63L6mLlLwU9lIM8fZcLB1G2n95em0qGr8vJPQx6yV43wswHALgTUwgD3ZEEhJLnH4M48IiPUd8rshImo4MzbizanM8a/KqhvK3EbgUy4hPzNYNDpee30g+XKKHgfIDTwDFzi2tPWHHF01Od9VvbksdHMmXL+vjdkf+RCL/Y+uHht8hkSeA5sXJ4qzseWAdrVZn1y70BqgLppu7d3FJWciXP739uN5f8W3ijCa0npVTtc5KgOrU22EGBp5DOsi6e7onse41GquWafbL7aP7daFeZyx0s++S2wH4v8vGU+nwpiOGfXVd54G6IZlWxjsIp1YSUeyaFDSDY3eerbV4I8sb/VJSro3DnXgeEbWFcJxePVQvp+rvnER8zi981++Lv1JEs6Azm9vWfRR1nXTreUk9eEqr7c4rNpzrNQtT/1KoDBQbn7HumDDlKUrEup5nx+8Fd6Qr2XCNh0LLeaM0N/kCCj9ucMpyeLyiFiDQc3c/D5l7VlgrUeE7mmiFnW4xf60unc8Im5HAaeAXexbOZ+S8PC4R1cu5bwi6eDrggrf6Pw9J0pGdzO7XDpNDUCtfQPx7O/i5NE511fiA=
X-Forefront-Antispam-Report:
 CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR21MB1443.namprd21.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(1800799015)(52116005)(376005)(7416005)(366007)(38350700005);DIR:OUT;SFP:1102;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
 =?us-ascii?Q?tfZjtemBw0aCr4zZY+T+fFYfHMBfMNq0KEfy9LQGhE2Fzsn+LCEseKWT4r2v?=
 =?us-ascii?Q?c7be/fSn8lGXAJ6mtgHwHvBgP899s+WEbhQmVQ/Y+nfroYU7elWj4xVZlLJ1?=
 =?us-ascii?Q?RAlp8VITW5Ol+m8FTku6ZAtIMHvA/j6aPZl9QSEV3eOxVvqnjvjyrmBa9/4F?=
 =?us-ascii?Q?9BokaVAH3ND3rkTfK0MOGRSwYI9xrI9DB6hEiD+Ph3vYSxbRudr9Hb601D9T?=
 =?us-ascii?Q?RH69WfuzQpqqSu3Tbc8pPn5iwvjPc9dsiM56mn6LyVo0GqV1gj6kmK8w+huu?=
 =?us-ascii?Q?VdPUkm8P7lcs6ekyR+kExhG8gYulv0CGawxxzz6tpI5wC7zdPCPQ1iI++6w4?=
 =?us-ascii?Q?C3SXovbPl9AKdrvNDTBC27JBXqjr2CiB5LEtbLEM5XLNGQb9WxIZJyHJGuHM?=
 =?us-ascii?Q?GuI/DDr6PV3httkZBdd0FS2Xx09Z7zclHUHD5ac09mYe+nGIBUxTUm/n9vbM?=
 =?us-ascii?Q?LnMwzZZtPG8vp8oeMXNJclqfaBEFXPcsbPW901D/vxx3EhWm31irh0Oihkv8?=
 =?us-ascii?Q?9wmaygTbFvt+eNj15CRe8odBgjCl2VpJ62+fptAiyojrHE+P+/01efPauiuQ?=
 =?us-ascii?Q?NxQA5A2CZhMSp2hOmDx3EK+p2Xl3BeCISZ8zb/B8zwy/rI0yhshQq1OAEo+D?=
 =?us-ascii?Q?5VoK2d9e/8Xoldc1R9VrrMT7Njn3plaMnbOt2XG0zu/DiNu9asampr7dhldy?=
 =?us-ascii?Q?MFU38jmUnbSs2o/EIozex2xP/JstCblJ3bfvcUc6eec7w34M/5+GnA+WLKfs?=
 =?us-ascii?Q?R0OvKoSGBvXi8sYnPaFxm+HboNgAzwKy0LiVQddukHNpJvUOdw6u98EFLGto?=
 =?us-ascii?Q?39nEh0P585LBpVztNrtpJiihWEWf3VxzgFhlrouRRJwhd2qX4kgyfqCDQp1k?=
 =?us-ascii?Q?Ni/W8x67v/n55QltEoBL7ithi1R7yeQ2tBmnkZDpeI+jE6ufzbH3UAARMi23?=
 =?us-ascii?Q?ij2RrJvqe0vaslz3ZyfFoov0pYBt8OBZSuRsAX8HmOtQ/veUbCAWPffXZpRc?=
 =?us-ascii?Q?rBx7FY0B73uD1BTBsBzenbpGlJg9htboUaOCibbZvBM36TP+/IW2+GAQxF8N?=
 =?us-ascii?Q?bdNcwOgDMoXBG1hx8XLZQT1L0jx85oIqaoE5oBT5097kSFvQH43AySUGE/bo?=
 =?us-ascii?Q?dHKTXg7I7TSWPzdPsGtY18LEGo0Fr6PbKzyIjeSmP7ZepfokR0EC7D0C3lzL?=
 =?us-ascii?Q?gvm/0O00PkzHw/xuMk2C3HhaGiR2sX8qO9cKdK2F94XjmFgv/dH0Ca0HsgU4?=
 =?us-ascii?Q?GelG2DcwMKnfKdAkg0spUnY644rRpSY4AmwvNdY9IdYmt7CU9qfGZydpK6NL?=
 =?us-ascii?Q?G1GT78N01Yj1CoIw2lzmAbMRzTbDr6EPY0tzJok8dN1t8fAXHH2URuvZJGIs?=
 =?us-ascii?Q?N0c2ZuyZ2nkYGQsyhL/JYLPWcTIC1PmWOuY3YW7g6ZkoOephUXibAFV1Lsk9?=
 =?us-ascii?Q?3PXJYvQ3IlfrocF/ug63vIsh3epnb/oz9Xeh8naVBtjBtG/pnALfO/p6Xesu?=
 =?us-ascii?Q?JUbKJXXDD6EF2hNMnTgHaqpSsIVEzHtdMF/UosWG7XUP+hbWlmbsCDz+/n5A?=
 =?us-ascii?Q?4Xqmqp1baT88tG0vx54e+phRnz47JAAnR2dKK36r?=
X-OriginatorOrg: microsoft.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7d2d56c1-e5b2-4da1-28cf-08dc534df08a
X-MS-Exchange-CrossTenant-AuthSource: BY5PR21MB1443.namprd21.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2024 19:49:00.9383
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: e7w2inb/BBwOsuNgCWvjYjdUWsLU3sjky53PCNa9r+0Pgxngf73SubsQtkDYYjvhu9S/cdDBpz+uWDsqh1u9kg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR21MB3109

mana_get_rxbuf_cfg() aligns the RX buffer's DMA datasize to be
multiple of 64. So a packet slightly bigger than mtu+14, say 1536,
can be received and cause skb_over_panic.

Sample dmesg:
[ 5325.237162] skbuff: skb_over_panic: text:ffffffffc043277a len:1536 put:1536 head:ff1100018b517000 data:ff1100018b517100 tail:0x700 end:0x6ea dev:<NULL>
[ 5325.243689] ------------[ cut here ]------------
[ 5325.245748] kernel BUG at net/core/skbuff.c:192!
[ 5325.247838] invalid opcode: 0000 [#1] PREEMPT SMP NOPTI
[ 5325.258374] RIP: 0010:skb_panic+0x4f/0x60
[ 5325.302941] Call Trace:
[ 5325.304389]  <IRQ>
[ 5325.315794]  ? skb_panic+0x4f/0x60
[ 5325.317457]  ? asm_exc_invalid_op+0x1f/0x30
[ 5325.319490]  ? skb_panic+0x4f/0x60
[ 5325.321161]  skb_put+0x4e/0x50
[ 5325.322670]  mana_poll+0x6fa/0xb50 [mana]
[ 5325.324578]  __napi_poll+0x33/0x1e0
[ 5325.326328]  net_rx_action+0x12e/0x280

As discussed internally, this alignment is not necessary. To fix
this bug, remove it from the code. So oversized packets will be
marked as CQE_RX_TRUNCATED by NIC, and dropped.

Cc: stable@vger.kernel.org
Fixes: 2fbbd712baf1 ("net: mana: Enable RX path to handle various MTU sizes")
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Reviewed-by: Dexuan Cui <decui@microsoft.com>

---
V2: updated the "Fixes" tag. The code change remains the same.

---
 drivers/net/ethernet/microsoft/mana/mana_en.c | 2 +-
 include/net/mana/mana.h                       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index 59287c6e6cee..d8af5e7e15b4 100644
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -601,7 +601,7 @@ static void mana_get_rxbuf_cfg(int mtu, u32 *datasize, u32 *alloc_size,
 
 	*alloc_size = mtu + MANA_RXBUF_PAD + *headroom;
 
-	*datasize = ALIGN(mtu + ETH_HLEN, MANA_RX_DATA_ALIGN);
+	*datasize = mtu + ETH_HLEN;
 }
 
 static int mana_pre_alloc_rxbufs(struct mana_port_context *mpc, int new_mtu)
diff --git a/include/net/mana/mana.h b/include/net/mana/mana.h
index 76147feb0d10..4eeedf14711b 100644
--- a/include/net/mana/mana.h
+++ b/include/net/mana/mana.h
@@ -39,7 +39,6 @@ enum TRI_STATE {
 #define COMP_ENTRY_SIZE 64
 
 #define RX_BUFFERS_PER_QUEUE 512
-#define MANA_RX_DATA_ALIGN 64
 
 #define MAX_SEND_BUFFERS_PER_QUEUE 256
 
-- 
2.34.1