From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8C66946A63 for ; Thu, 26 Jun 2025 14:05:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 867914026B; Thu, 26 Jun 2025 14:05:04 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2044.outbound.protection.outlook.com [40.107.237.44]) by mails.dpdk.org (Postfix) with ESMTP id 452BB4026B for ; Thu, 26 Jun 2025 14:05:03 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SokVprfTnd4Cfo/2z/iewnMGFuVDHzy1FNtp5MjPc+TpnJNVQlvhsppf07xg+FnY6+1Nfe72cGK6eqNAi5C343q+niilMuaMMvhYiiQVB+h5Jwah61qcJXnRMmW4Dir5h4XGEnb27izNpLZ0T1u4HZOsVJ7SJy5nLQ8ptFUqcjgxUxVYDbXRmNv7gU02oIE5kI8qwkTNSMuS1SjcILmySmbxU/dSVjlFST5DA6vSdKcnTGy3fB1D0x9/Y2Zzt+YCVp9fDrNkbOelTqwdRNGDAjuW9LmKOYmt+ttt16o0abtBayJ5r7+yJkn4r3aacPlDwET25syNAHp1Lb7cCz7FeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ATX1WwbDF1dU/jieXpyI1hkuRk4HQ556wksdX1NZlrU=; b=UadjPQ4zZfrdqnLn2eteovflHWBuE7IMkzo3/RovVSK+YuLUG+A6XeeARQcoFJsC9GWzwsjvAY5Wkwo/AL+w7aYJTZ27WDpDvZoytXtdfofDxH5CmalCGl2Nlf3I3KBm/fduE5fOtQK2RcvuLn6ulEnn04mSmVig+i/xCykJXid3erqdKjsNJLgypKTrBYKemv7HQLi0Zxh1m7dWkzKnZTZeAJChjfV/ISiRng2fTk0HH3tsnieKXp7JDsptF9SG2/k2ncOWlXHzAqD5AQTvoGKBHdRgDhtRb4KMXqVode7Ben/HkxVK77UlZCk+JVJXsyp6h8BROejO5ztTzr8mdQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=corigine.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ATX1WwbDF1dU/jieXpyI1hkuRk4HQ556wksdX1NZlrU=; b=JcqESGGByw60m6LZXDTVp97jyKxn7CGmDbJTGRNIgzFlVgqyoknQhYee0L/0KWvNiJbh0jUDO1+uH5YF3MMGjf+D/KslPmK6NUbMAICQ/7N6R4vbSzcBQ7J1hiMl4J05FI98ZY8c/srj5pvXPDL0u3f8t358vW2Ulfud4Tq1B3vKnRTxToNJ0B5Y/9VAOGri8A0Hm6Lfo+sGrpiF6f4W5qZ2ar2X463PAFqluBHon2Sl7bXn0djubaJPQrr+TNYGVtlazCrUcn/V6sRB1afOo2j9J2ypLOAEzVDmOEKKXcQ+LLqrQUkICVAzaCOfr+i6xDFPGu+3IcAMJRxHhH5mig== Received: from BLAPR03CA0150.namprd03.prod.outlook.com (2603:10b6:208:32e::35) by MW4PR12MB6802.namprd12.prod.outlook.com (2603:10b6:303:20f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.28; Thu, 26 Jun 2025 12:04:57 +0000 Received: from MN1PEPF0000F0E5.namprd04.prod.outlook.com (2603:10b6:208:32e:cafe::1a) by BLAPR03CA0150.outlook.office365.com (2603:10b6:208:32e::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.17 via Frontend Transport; Thu, 26 Jun 2025 12:04:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by MN1PEPF0000F0E5.mail.protection.outlook.com (10.167.242.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:04:56 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 26 Jun 2025 05:04:41 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Thu, 26 Jun 2025 05:04:40 -0700 From: Xueming Li To: Chaoyong He CC: Xueming Li , Long Wu , "Peng Zhang" , dpdk stable Subject: patch 'net/nfp: fix crash with null RSS hash key' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:00:50 +0800 Message-ID: <20250626120145.27369-31-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000F0E5:EE_|MW4PR12MB6802:EE_ X-MS-Office365-Filtering-Correlation-Id: b060c7cd-42a3-4e61-8198-08ddb4a9ab0a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|36860700013|376014|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?51Vw2b1/YR11pPYeWetWBVGohiNRSznE5OFSyUoGmKdoReJnGtwfTCWbXA07?= =?us-ascii?Q?M7UPG3709jKq38/5s8N42gB5T77Sa/U9Xf5wYtLOqY1JmYJY+DX2NEFVr69/?= =?us-ascii?Q?uoKDB6bmUWsRwrnXsS6aA0BPikJ27SjYFGOR/MbDsEtcfdD7BNXb9hNogh1X?= =?us-ascii?Q?UZQmZa/qeHCeCKi8jbPu5aQDhlCnpupCR9Y1xRL976b1b3Uqmz0rqNyHLTTW?= =?us-ascii?Q?ej0UwQPZusUzANImsLkRt73gk1EPYFAU05JMb2+QCVV2eIb0ORjv0B6d+GxO?= =?us-ascii?Q?DYP4NQODmO7QjQrS3TSziVPCFDuwhy+8HHe1YFwQx3OkxmJRyvcTn6nUEmZK?= =?us-ascii?Q?6t+Hj5uRtHHwFXvBD6mvRL3z0R1as1dmuCaLko9hoxZCn/HNZ99+yoTChdC0?= =?us-ascii?Q?eFneeztkIJ9c6/T0SOeh0+GCCgxJUWrQxAUcnTg2OB3FLlJ16J94eREArgL0?= =?us-ascii?Q?vhwnyTJf7XzdDsr1cFvW7Ul/BOwTn4oDngFxZofAyMJy2SCWq4mUCzbq3vZa?= =?us-ascii?Q?NOJj4tVl+iplMteILwIlLHOS0tyTT9fGihYWQp5b7emgn1EWzqpTVh2f5qYP?= =?us-ascii?Q?zy0B+0B42iL96ksNnS0Ul67Rwx0hwGyCO02RRkiMwYrelmGzd2xFibM3V3br?= =?us-ascii?Q?SUgDhv6Zvv/9C4/m8o+F0iD+Gk8uFs84CHMrg+ue/3iOzjBTUvDMFXcU9YqE?= =?us-ascii?Q?DNpy6CDPJxSFnbe+uQvpFOqkEJ8vkTyXlQTCRxY13iXKJhhWu+3CcAHzBACu?= =?us-ascii?Q?U+X2dKnAY/QOaZ70HgrR/E5EETkx8Lyh5l636CCEmG2mtOuAjbmwUkf7y49v?= =?us-ascii?Q?wsfNw15sKW9eWLLC5HoFo7Iu+MedHbGjHIDvNnV3oEdFvMRGy8NEYreiiN5B?= =?us-ascii?Q?bD4Rj4I7hxvSsUD5qX2Ql5jh9EWI0/iWR6nfBuL5HUuzRtnG/ytpcnNXsXOT?= =?us-ascii?Q?R9GUWjIh9NfmFbshFY4l4Y4ScfsatmhcCdX1WXW7Ramm2z1J+RX7fyrxoEwO?= =?us-ascii?Q?pwDDs92mYM4FII7FfTHOGK9IgbhcEzC15AoinFTZrMGAYf0jeGDEL56t4mgc?= =?us-ascii?Q?THm+f0AloPvHToio+Dhtg/iqlNm6HjjfpaVF+9hWt+v8ou5bZbqgGgLCVqMM?= =?us-ascii?Q?/G8fyk5X3ufRZsM60k9YUX9VlQBU1EMzEuA6vBAe1aDxlPzu+QDEzPkktdYy?= =?us-ascii?Q?wbEL/qqQqPYMu42CnGKdtenTK1TxaxlGCN5761VjXWy2IBHbA9Df31O01lQ6?= =?us-ascii?Q?fTsta2cb0N5GR6shl9gKad3PAYhwbt6+0Ml/g/046MFSzQXgKA0e4EqORAWB?= =?us-ascii?Q?6BMpFp5IBpRruXaclQhZg56TXrtkC1VjXv61LyN8949KMqO0H7vqYHAmguoE?= =?us-ascii?Q?gG0hhy+enyqx25YW9jEukapLVrQ9ybz69HFyLO334idJkqQC2rTyrhO4PuTN?= =?us-ascii?Q?VlZzcfgeII9zWBARdwwvgaX73fMxZXByHjseWsrVPcqbX8vhOFTydV7IqMaX?= =?us-ascii?Q?htzYVy+Z2T1ABm8uJRwAxhDmj8Yb2b9BBUYqco/GjCMVG/U4JHflQu2J7A?= =?us-ascii?Q?=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(82310400026)(36860700013)(376014)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:04:56.6568 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b060c7cd-42a3-4e61-8198-08ddb4a9ab0a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000F0E5.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6802 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 23.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/28/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=a014d3730ea54d08723d970e670eae5c56472217 Thanks. Xueming Li --- >From a014d3730ea54d08723d970e670eae5c56472217 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Tue, 1 Apr 2025 15:55:07 +0800 Subject: [PATCH] net/nfp: fix crash with null RSS hash key Cc: Xueming Li [ upstream commit 53df26286e4570ea328c5972fb244d8bc0008315 ] Some testpmd application commands will use 'rss_conf->rss_key' parameter with a NULL value to call 'rte_eth_dev_rss_hash_conf_get()' API, and NFP PMD will coredump at these situations. Fix this by add a check about the 'rss_conf->rss_key' pointer. Fixes: 934e4c60fbff ("nfp: add RSS") Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_net_common.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index bf44373b26..61a3685e2f 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -1820,9 +1820,11 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev, rss_conf->rss_key_len = nn_cfg_readl(hw, NFP_NET_CFG_RSS_KEY_SZ); /* Reading the key byte a byte */ - for (i = 0; i < rss_conf->rss_key_len; i++) { - key = nn_cfg_readb(hw, NFP_NET_CFG_RSS_KEY + i); - memcpy(&rss_conf->rss_key[i], &key, 1); + if (rss_conf->rss_key != NULL) { + for (i = 0; i < rss_conf->rss_key_len; i++) { + key = nn_cfg_readb(hw, NFP_NET_CFG_RSS_KEY + i); + memcpy(&rss_conf->rss_key[i], &key, 1); + } } return 0; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:19.123706571 +0800 +++ 0030-net-nfp-fix-crash-with-null-RSS-hash-key.patch 2025-06-26 19:59:17.326418046 +0800 @@ -1 +1 @@ -From 53df26286e4570ea328c5972fb244d8bc0008315 Mon Sep 17 00:00:00 2001 +From a014d3730ea54d08723d970e670eae5c56472217 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 53df26286e4570ea328c5972fb244d8bc0008315 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index aaa515bac2..600fcd5c0e 100644 +index bf44373b26..61a3685e2f 100644 @@ -26 +28 @@ -@@ -2062,9 +2062,11 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev, +@@ -1820,9 +1820,11 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,