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 BD6B9431D5 for ; Sun, 22 Oct 2023 16:29:43 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B3073402D8; Sun, 22 Oct 2023 16:29:43 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2087.outbound.protection.outlook.com [40.107.212.87]) by mails.dpdk.org (Postfix) with ESMTP id 74210402C8 for ; Sun, 22 Oct 2023 16:29:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dv47AkGOJEc5AAQ1btN6KmakVkbWXimxp9EToRBB8gux0cwYJGhZKetJc3rxYi88/OG5uaI8rYSukwrDayCgg0GKytAT7qMo4saKiNV6RjKqIv/Ck7iZ7MSpvWm4u9WnXHup+IiNP+zqMyjBuR1JOvhdGF55OxSMKuj5+K40nfFupS34pH5oBPgQ7E8pG+V4fEyIUBaOH9QtcyFjCt9I24Y3J/rDxfozyZbj7+f8PaVaUjcaM3+VymVS2JgtlikYB/gEvF/I+2DxEMhb6KXFfCaQaQ39ESO1fHoL1WD2UmEPystL44DwW7Qoaknlmvjt/ZjMRPpUG4w9mMVwhx/asw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=UyxIAt48nzQCJTEk7uLlMDdGEjSQ5Utg//w8EmjZnCc=; b=nB3U8IN7ZPLFn4NOg30GU+VRWrwEsaTLyWgkOasm6lTzctxFnfkkJxNzboFxipf5de4SIz9M25LXD8RNFpC7CtXvfqYB7TNOA92+/E/Z5UIvZCKRVDXXjQaDyVzEXejCACeshVZQyzC0X59SHu2N0ehAXkHsIYpR7IYmQMfome/h0hEfElxsX+4dLzXZHs7Kz7OISMP4S9siBMIpQEPO+QYmW1K6RaoSO9rF3d6yL0mBrvw613N2aWMeUZkbQo7rqfNqdISmKyYT95lpflXCYX7FMZVa1NF66ihcxvb0bk/TTYEjBAov2uTFqiQqXfGh7ixm056MmTFZhEe6QCKBQA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=marvell.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 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=UyxIAt48nzQCJTEk7uLlMDdGEjSQ5Utg//w8EmjZnCc=; b=UCVoyNOqH1a8sFLRU16s3q0DI/dTluROJp84kwCoQ3iMUYeatR33OIt2UBcjv+gzEM7HU1ohtWuaptCIM1na9BBRiwtEoFjD65XW57GhsiwDzS52Us1RfGrPK2TWLp5wK5yovO1vZTFnypcRXeXGbVZLpzZn9WcJhGsekZAA+0hcFOW0VgkKoDQ0wKmKMHLVI6z46iQ2Ts6uNEZP//gv9CgjW4n2eR/uijngz1c9zGh+Emdbm4IVmq4mafJEcgJFVmFuJyMUckK1rvoih+6ihc7weNMyvLYZ/DLDJfC/nSZ/iRPLwbZLhfLzE3Y28/argYu7eQHm/zVhtOsKgJwVyw== Received: from CH2PR15CA0008.namprd15.prod.outlook.com (2603:10b6:610:51::18) by LV8PR12MB9156.namprd12.prod.outlook.com (2603:10b6:408:181::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.45; Sun, 22 Oct 2023 14:29:40 +0000 Received: from DS1PEPF00017094.namprd03.prod.outlook.com (2603:10b6:610:51:cafe::ca) by CH2PR15CA0008.outlook.office365.com (2603:10b6:610:51::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.31 via Frontend Transport; Sun, 22 Oct 2023 14:29:40 +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 DS1PEPF00017094.mail.protection.outlook.com (10.167.17.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:29:40 +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.986.41; Sun, 22 Oct 2023 07:29:38 -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.986.41; Sun, 22 Oct 2023 07:29:37 -0700 From: Xueming Li To: Kiran Kumar K CC: Jerin Jacob , dpdk stable Subject: patch 'common/cnxk: fix RSS key configuration' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:21:44 +0800 Message-ID: <20231022142250.10324-76-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-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: 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: DS1PEPF00017094:EE_|LV8PR12MB9156:EE_ X-MS-Office365-Filtering-Correlation-Id: c360cce6-dd14-430d-d1b2-08dbd30b53c1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2JWFwYeNHjt3TKaDqvDQpyGteiQZ8s2quhoDINniqTPh6ka9hmVaIpQR9unzJzAX33VhHBINDYHhNsJBNyT6joE48OIr4Homib+fiX5rQlqpzr542qm+lEPw+OdDMIjjURkoZ6lPyFlW1Nw95g+YvnLxbFkTzJndNAXA4h0bC6ygNj3OjaajaI7mL9zDIypiRtrZjQKZlXyP468p2D8XJ91NkI8AlIN99KUrgc4jdR2VverIqXL5ypyyZ8Dfe8a0K9/jJeo9Fp1JFAkyBsdFiqGZC9XvsdO/pUG/ZISTtKFJWK4wARRjKpsTpINuKV9zfz3zhAoGiAv4B6kho8Udjubm/YsVrIEOxKwD/08PvxlTo3nNkJdBQLO6O7sNQpo3GunVuypfphtN+ZKQD0Hl8yVe+HBftB9UrSB+x+BKcXgZ6zssnssMNuaM2dkxYfgET1ClPcvyvQRC7lUpbYgkeYCsMvWdaBpieH+n0IWUqmiKiOxyhqL9Z5gfQ7uOj7Y60prt5LeYGB6kQTD/z0DXk8ljKpe1+16QiySWy/XjyLpj0EnaEmmK0VmFkBKRXNTq2lEf+J6/EjTO22NjE9X1YClHqrz1fx5u1xSjEmbuJYuq3gbiCyRZNsv466EUf3e6eIIQM71uKMIvynx40om5k3ZzQryiP5UL8wnbqdWKh3hFA4RJ7m/PE0WgksHBV7YVmFQf1vvDW9lFPaEPWnTFDohTczQqz57kfMUQP393DSU1sV5WJRNofx2MkFqV2yeQPEu4zqiPyQ6PyankpIezUwZiwp/mv4fdDlJ2ejymxvc= 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:(13230031)(4636009)(39860400002)(136003)(396003)(376002)(346002)(230922051799003)(451199024)(1800799009)(186009)(82310400011)(64100799003)(36840700001)(40470700004)(46966006)(55016003)(40460700003)(47076005)(2906002)(4001150100001)(36860700001)(36756003)(40480700001)(7636003)(356005)(82740400003)(70586007)(316002)(1076003)(6286002)(2616005)(6916009)(70206006)(26005)(41300700001)(8936002)(426003)(86362001)(7696005)(16526019)(54906003)(478600001)(6666004)(966005)(83380400001)(5660300002)(53546011)(8676002)(4326008)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:29:40.4806 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c360cce6-dd14-430d-d1b2-08dbd30b53c1 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: DS1PEPF00017094.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9156 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 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/15/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=257c5a049a9489aec5da0274148f30eb02a2c5dc Thanks. Xueming Li --- >From 257c5a049a9489aec5da0274148f30eb02a2c5dc Mon Sep 17 00:00:00 2001 From: Kiran Kumar K Date: Mon, 4 Sep 2023 16:27:41 +0530 Subject: [PATCH] common/cnxk: fix RSS key configuration Cc: Xueming Li [ upstream commit 56fa6f92e9e32cbc5c99af89da611a9f33bbe254 ] Limit the configuring RSS key with rte_flow operations as it is a global resource. Key can be update only with ethdev dev operations using rte_eth_dev_rss_hash_update(). Fixes: 51dc6a80f843 ("common/cnxk: support RSS action in NPC rule") Signed-off-by: Kiran Kumar K Reviewed-by: Jerin Jacob --- drivers/common/cnxk/roc_npc.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c index 2ee1233757..bb478ec55b 100644 --- a/drivers/common/cnxk/roc_npc.c +++ b/drivers/common/cnxk/roc_npc.c @@ -835,9 +835,35 @@ npc_rss_action_configure(struct roc_npc *roc_npc, uint8_t key[ROC_NIX_RSS_KEY_LEN]; const uint8_t *key_ptr; uint8_t flowkey_algx; + uint32_t key_len; uint16_t *reta; int rc; + roc_nix_rss_key_get(roc_nix, key); + if (rss->key == NULL) { + key_ptr = key; + } else { + key_len = rss->key_len; + if (key_len > ROC_NIX_RSS_KEY_LEN) + key_len = ROC_NIX_RSS_KEY_LEN; + + for (i = 0; i < key_len; i++) { + if (key[i] != rss->key[i]) { + plt_err("RSS key config not supported"); + plt_err("New Key:"); + for (i = 0; i < key_len; i++) + plt_dump_no_nl("0x%.2x ", rss->key[i]); + plt_dump_no_nl("\n"); + plt_err("Configured Key:"); + for (i = 0; i < ROC_NIX_RSS_KEY_LEN; i++) + plt_dump_no_nl("0x%.2x ", key[i]); + plt_dump_no_nl("\n"); + return -ENOTSUP; + } + } + key_ptr = rss->key; + } + rc = npc_rss_free_grp_get(npc, &rss_grp_idx); /* RSS group :0 is not usable for flow rss action */ if (rc < 0 || rss_grp_idx == 0) @@ -852,13 +878,6 @@ npc_rss_action_configure(struct roc_npc *roc_npc, *rss_grp = rss_grp_idx; - if (rss->key == NULL) { - roc_nix_rss_key_default_fill(roc_nix, key); - key_ptr = key; - } else { - key_ptr = rss->key; - } - roc_nix_rss_key_set(roc_nix, key_ptr); /* If queue count passed in the rss action is less than -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:37.119029500 +0800 +++ 0075-common-cnxk-fix-RSS-key-configuration.patch 2023-10-22 22:17:34.296723700 +0800 @@ -1 +1 @@ -From 56fa6f92e9e32cbc5c99af89da611a9f33bbe254 Mon Sep 17 00:00:00 2001 +From 257c5a049a9489aec5da0274148f30eb02a2c5dc Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 56fa6f92e9e32cbc5c99af89da611a9f33bbe254 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 0df647c527..94c8e94400 100644 +index 2ee1233757..bb478ec55b 100644 @@ -23 +25 @@ -@@ -943,9 +943,35 @@ npc_rss_action_configure(struct roc_npc *roc_npc, +@@ -835,9 +835,35 @@ npc_rss_action_configure(struct roc_npc *roc_npc, @@ -59 +61 @@ -@@ -960,13 +986,6 @@ npc_rss_action_configure(struct roc_npc *roc_npc, +@@ -852,13 +878,6 @@ npc_rss_action_configure(struct roc_npc *roc_npc,