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 868D646C4D for ; Wed, 30 Jul 2025 09:11:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7DDE640E28; Wed, 30 Jul 2025 09:11:40 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2076.outbound.protection.outlook.com [40.107.237.76]) by mails.dpdk.org (Postfix) with ESMTP id 72D674025E for ; Wed, 30 Jul 2025 09:11:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UG4a10j6ZeOwuXeUzR6cCbx8g/T0eeZJi4y5RprvYUbKqu02M4x9fX+mR+Amw46a0oYO71tGgq6UpOFJatXWGHpzu6nI6bnmTzNkTKrKGynAIfPrQP10xomW+fnHrJ6TGn8rMht+9T/BULGgdAa3J6rIR7yVhK8iWF5chO8MwlI2IZDUgIBXezJeO1NH5qUIpjzVClkZ89B4g0dySanWAmX52kH25REyu6TZEGUGlFYDuBbvInIJvjAu4qCVb/8/Nmg9zmqH+JG3dcii2rDjDbficbHSVPnqjclkN/TqBHtyTZR6rweiwnBydhadoo8Hg168FvEITpTfoyr2svc0Rw== 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=tgpRma2bpcAhIQHcHoRCHm5QJ7yJx9SVkkw1RiwjpY4=; b=FH62zkWvbSaWzNuDJRXHUii0lxVjDQ46FQ+qHNN3cg4q2iantKPx93QARCtqL75oCLLcMXC0HKoy0GXmfCSiImye2XsiwILVghx8fiHYsI3ZwnBRQacCqmyCBK8OhlvCS0SChDdmJM+OBAhmiork0XubnYXCvdyzh8cjgC9jN9xsaFY81vKN54AuI9BNXJHqNs4dFWIw3ak6v/HiHoXsd2YHccaCyiu6+YIImDNM1n4ym4mQR6tapsn9HADmcHnzBjntag4NlDLxusm2o4ktL+RtfDYLn+cnwtagyMf3vTzveEVmsgdDosDTyXa1rLQ3p0d8wWroea+2Nq7PkzzuHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.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=tgpRma2bpcAhIQHcHoRCHm5QJ7yJx9SVkkw1RiwjpY4=; b=YX+Ea/CBAK2xUePnnJhPoH/qeh1k2FZQnMjB3koC1JooyhqQRbGdXPOxF9fgU/YzR2y+Ky68my1NQ+W6Jbc+6dRI7xDAl55EeydE55iDPsUoPmL6vc6MHh5ls+pCrvKPUXp09v9V4WE/xyDPFBaErDwNb9fies8O9Ckvl2RvCKQXvZeCmG2mfEqGTWUdVW2T86mSyflv6NIzu4n881PgqleSe6llY7eKcnb1xikkhCCoqNrfnq6TeWrZD54je6gOWL/pYJalGtWyKNQ6XDcawUzUyED4mhzMjpWAoUog7N+r7jiVuVjTPwYkASY0mbmkDjXX0EoQfZm1GiyYON8YDQ== Received: from SJ0PR03CA0132.namprd03.prod.outlook.com (2603:10b6:a03:33c::17) by SJ0PR12MB8089.namprd12.prod.outlook.com (2603:10b6:a03:4eb::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.11; Wed, 30 Jul 2025 07:11:34 +0000 Received: from CY4PEPF0000EE3C.namprd03.prod.outlook.com (2603:10b6:a03:33c:cafe::f4) by SJ0PR03CA0132.outlook.office365.com (2603:10b6:a03:33c::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8964.27 via Frontend Transport; Wed, 30 Jul 2025 07:11:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CY4PEPF0000EE3C.mail.protection.outlook.com (10.167.242.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.10 via Frontend Transport; Wed, 30 Jul 2025 07:11:33 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 30 Jul 2025 00:11:13 -0700 Received: from nvidia.com (10.126.231.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; Wed, 30 Jul 2025 00:11:11 -0700 From: Xueming Li To: Mingjin Ye CC: Xueming Li , Bruce Richardson , dpdk stable Subject: patch 'net/ice: fix handling empty DCF RSS hash' has been queued to stable release 23.11.5 Date: Wed, 30 Jul 2025 15:10:14 +0800 Message-ID: <20250730071045.136672-4-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250730071045.136672-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> <20250730071045.136672-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE3C:EE_|SJ0PR12MB8089:EE_ X-MS-Office365-Filtering-Correlation-Id: 67834d3c-8315-477b-bc85-08ddcf385134 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|376014|82310400026|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?8YlFoJIWM9OiNX9cem3DmFd82+G1dB3g0PqVH4b8QXxim1TP30HItf6rr12O?= =?us-ascii?Q?0E58bzqqvTiBsm/WBk+MDPmno+YDDkyxCqFiSAfYDLt0pV8tSl7KBWmG7T2+?= =?us-ascii?Q?BHBK7dP3+SLQJ6WECCASLxqdDGCjP78WidJ6yBNYgKESVGTUkPrvWRwNl9R8?= =?us-ascii?Q?WBsyb4n/XOzpPr+qUASVj9DTq7zT2YVpEU5opXbmC0zsmuXCXbobqxhLwGG6?= =?us-ascii?Q?k29UP/f3rWerMAo1DexNoRLXTCBIj34KO3IoYdnQhkzZWWxmRXFuo0/nymki?= =?us-ascii?Q?EhVdfTngpB7FtmIlsE6sY9fSZsKJVvE7d2+hWq00EJKPm/fSXrRQKmJVTo76?= =?us-ascii?Q?AyuicByjTHgKd5syygDGs+a1KGiNVSs9GbZIE59B9SqQum/AZBL8mYyGtWiR?= =?us-ascii?Q?+3QexkBGQDoj8StBcj7DqR6qlCSpD7xRVZ0t286lLuAI17onns6dGw71iujo?= =?us-ascii?Q?BItZsr/t/uvT888hnNAMQpD7ZRSDI02PcvJ3hAN8i2yU6TibFvi9o7Eim+7X?= =?us-ascii?Q?BHzwxPPc1nUw9N78So/JA8VRGWmujmlpMZz9kyADUA6PVc6+KV0+2/x/TQTX?= =?us-ascii?Q?JlAxXqoyZBBX07lO0kdA7ReFCznqpIyyBBHhqs2OFdD1ZW1XKqy+8yC5LNcX?= =?us-ascii?Q?+MAhny231EXXDenNprYZToWlVICVPwKtwiq0PnkDmFYQUHnmFC1vNTMQaXGi?= =?us-ascii?Q?lLcaCFXuEIYuVxJrKctpmW0bq9Ry9PpfjHW/BIhYt/3qTH2mywdN0/wPbtXz?= =?us-ascii?Q?9KubX6ezZoLYUlMHtsbTCicUrslk4ZjwFF1t/jUQabZEmEqb3R0lslqkNCF+?= =?us-ascii?Q?7tlX5/EJ2vjbJG5PfbgZWlzvQAUmMOUaoIYRN+zyQ5Unx8LCrut9S474O+r6?= =?us-ascii?Q?NnjrPDFa1q5+13pDpGdqPKo4MvYXYsJKOp+V6aKXs1AiSNcfahVSUcVJ6jIu?= =?us-ascii?Q?yw3FLFjjLH6nrqBMKQ7T1trrhh2tNqUqCl5hRlQJirbZPVS7zrlla8uztPrW?= =?us-ascii?Q?97VNrQ7IP16z9k9xbuUuzTE1akXVm0lnIJkz1HNuuPnogD0zBSs2oM2R/OpN?= =?us-ascii?Q?ZVx/iCkNLZNeCH9BrNOrbM5C1nSNm7zaATG5lUKamVxNQUYY7v6sfj9Jl89g?= =?us-ascii?Q?SW/xjeCt7tCdnqWUzhNOptBkqq65PRsvEQNht+MhdK61c8Y0EUNugdB0x7jh?= =?us-ascii?Q?R+AUqpZO8fCEyNemi8wgZttoQiVZUvEPylGXSg3dJV+pZqcJ1uNosCHs3ZA/?= =?us-ascii?Q?3GePNS+eENwA+fUPiqTfrdJRvtRTdcCruBwG//nWcNV964JYNAH+nRCRcPEm?= =?us-ascii?Q?OUN5hCEyP96btJjCLDsVviVUeK9mFspgLQ8n6mdHcukW1fEYF9HbizlDLuHM?= =?us-ascii?Q?f7VyZgYi+pyAVzcBmJ29u3O0dbRf0rt0HLBaMQSAmUX3A9/7zGFQPyyTBswZ?= =?us-ascii?Q?y+6uwrmOdq+mHZFI9j/6kVzKWK69RHDTis85rA9KLW3n2AESV+woMH1KrLIC?= =?us-ascii?Q?jYxqPHZOTPNQvlvdWOdJoMftphsGfJKc1tTn?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(1800799024)(376014)(82310400026)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2025 07:11:33.7235 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 67834d3c-8315-477b-bc85-08ddcf385134 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE3C.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB8089 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 08/10/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=362b3e6372f76de13925ef1a6d831b02b07a464f Thanks. Xueming Li --- >From 362b3e6372f76de13925ef1a6d831b02b07a464f Mon Sep 17 00:00:00 2001 From: Mingjin Ye Date: Wed, 18 Jun 2025 07:08:44 +0000 Subject: [PATCH] net/ice: fix handling empty DCF RSS hash Cc: Xueming Li [ upstream commit a84f23cfb52c0505f87b07e919e1c01ff3e38eb2 ] The driver does nothing if the rss key is NULL or zero-length during the rss hash update. Extract the update rss key code from ice_dcf_dev_rss_hash_update to ice_dcf_set_rss_key and make it consistent with the pf behaviour, and with other drivers, e.g. i40e. Fixes: c223cadc9e5f ("net/ice: support RSS hash configuration in DCF mode") Signed-off-by: Mingjin Ye Acked-by: Bruce Richardson --- drivers/net/ice/ice_dcf_ethdev.c | 35 +++++++++++++++++++------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c index a025b0ea7f..f8031681da 100644 --- a/drivers/net/ice/ice_dcf_ethdev.c +++ b/drivers/net/ice/ice_dcf_ethdev.c @@ -1393,31 +1393,38 @@ ice_dcf_dev_rss_reta_query(struct rte_eth_dev *dev, } static int -ice_dcf_dev_rss_hash_update(struct rte_eth_dev *dev, - struct rte_eth_rss_conf *rss_conf) +ice_dcf_set_rss_key(struct ice_dcf_hw *hw, uint8_t *key, uint8_t key_len) { - struct ice_dcf_adapter *adapter = dev->data->dev_private; - struct ice_dcf_hw *hw = &adapter->real_hw; - int ret; - - if (!(hw->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RSS_PF)) - return -ENOTSUP; - /* HENA setting, it is enabled by default, no change */ - if (!rss_conf->rss_key || rss_conf->rss_key_len == 0) { + if (!key || key_len == 0) { PMD_DRV_LOG(DEBUG, "No key to be configured"); return 0; - } else if (rss_conf->rss_key_len != hw->vf_res->rss_key_size) { + } else if (key_len != hw->vf_res->rss_key_size) { PMD_DRV_LOG(ERR, "The size of hash key configured " "(%d) doesn't match the size of hardware can " - "support (%d)", rss_conf->rss_key_len, + "support (%d)", key_len, hw->vf_res->rss_key_size); return -EINVAL; } - rte_memcpy(hw->rss_key, rss_conf->rss_key, rss_conf->rss_key_len); + rte_memcpy(hw->rss_key, key, key_len); + + return ice_dcf_configure_rss_key(hw); +} + +static int +ice_dcf_dev_rss_hash_update(struct rte_eth_dev *dev, + struct rte_eth_rss_conf *rss_conf) +{ + struct ice_dcf_adapter *adapter = dev->data->dev_private; + struct ice_dcf_hw *hw = &adapter->real_hw; + int ret; + + if (!(hw->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RSS_PF)) + return -ENOTSUP; - ret = ice_dcf_configure_rss_key(hw); + /* set hash key */ + ret = ice_dcf_set_rss_key(hw, rss_conf->rss_key, rss_conf->rss_key_len); if (ret) return ret; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-30 15:02:12.952076826 +0800 +++ 0003-net-ice-fix-handling-empty-DCF-RSS-hash.patch 2025-07-30 15:02:12.767454799 +0800 @@ -1 +1 @@ -From a84f23cfb52c0505f87b07e919e1c01ff3e38eb2 Mon Sep 17 00:00:00 2001 +From 362b3e6372f76de13925ef1a6d831b02b07a464f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a84f23cfb52c0505f87b07e919e1c01ff3e38eb2 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -17 +19 @@ - drivers/net/intel/ice/ice_dcf_ethdev.c | 35 +++++++++++++++----------- + drivers/net/ice/ice_dcf_ethdev.c | 35 +++++++++++++++++++------------- @@ -20,4 +22,4 @@ -diff --git a/drivers/net/intel/ice/ice_dcf_ethdev.c b/drivers/net/intel/ice/ice_dcf_ethdev.c -index 778722a869..499062be40 100644 ---- a/drivers/net/intel/ice/ice_dcf_ethdev.c -+++ b/drivers/net/intel/ice/ice_dcf_ethdev.c +diff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c +index a025b0ea7f..f8031681da 100644 +--- a/drivers/net/ice/ice_dcf_ethdev.c ++++ b/drivers/net/ice/ice_dcf_ethdev.c