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 A00D243B7D for ; Tue, 5 Mar 2024 10:59:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 957B342E51; Tue, 5 Mar 2024 10:59:09 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2068.outbound.protection.outlook.com [40.107.237.68]) by mails.dpdk.org (Postfix) with ESMTP id BA5C44014F for ; Tue, 5 Mar 2024 10:59:07 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UTtXGcFWsi4af2f9W8T/jc/91Lbql6PujNqdKarbXBVLE7eKASjgj6loY+eq9WDlNNPzzkk5EFXkxJNGB3GMexsBe4xPpCcsObtr0O7Vm3m8NIUNts4Z409B+PzwZskmxD8ONArZIeBtKZfytb8ve7zU+pf6At7REr6J/vv6rF5OkuzKI9JZ4tQ5CgUxjg5RDpBQVx9QM/pux6NjJH+O/wsvdFSDBSPmrSGPI+Z7f4gRgtzGPx0ZamYHzMwnqkeBhedIHkucd6Y3+IA8RGfGIFvNCsc6SH82Ox1k4JG/8bRf61ITA8RrK579saidAX/Twa1LdQ1i63C41xNmAilQLw== 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=gmwvYZIHfMP3n1A6ux315eRafsUNmNthMgyn3D9g48o=; b=X62ELbH6xwKw/N86UpCNizlct0zjeweqOcxEdhgTPzI/KDbKgZ+1pLPU7K1HXK6WfMW/BAp9E6rfYdG54vLYvcxNVu8XY0PiJtQBoidCFYJq3KBSF7ZQ0hTZ+cnpaizyyfgFd9mJDztgJlnjBEZMd2VX0ymGfRccNWZ8hjf/o7apiNxYtCzX5vBAmFZp6VxBXo/gC7BSwJQhyDzT53+6v8P4euGv0LKs1ZvQqJYYIid84uMwgSogsbInpis7ZTZandll9DdJKzyE0gbV3tQ+T3hjU3zfzy1GxztSjhV3ephG/eb7RN5D253UgCdQsvuAt+uiV+pNPRI0/6J+HJQTSw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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 (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=gmwvYZIHfMP3n1A6ux315eRafsUNmNthMgyn3D9g48o=; b=Y/bv+ofmNbRH8fZN1cDf7WDBodjDyc5GX4pWay1u2WSoi3i8qOxHJYhjZxniYg1vDzE7dHvU5DadnfQwDMyX/ymJ7/4uSquCgBb8qvQnj/UeJnDcTC9JSbvd11b+QcFrz0xv1UT68qZeLz8ObqIT/p8MomBnBckw92jUjIxgRzE71B65NaZZLvbIQcu/HGUuXSfQiqK6dPrfIdIlLx8EHeSP8W8sp3PKBigbOpB3kCcM0v3714gcSW7Lv9S9eoWYPqoFcgBkNNu/XC/3MyfJnhRzgBaWfrsQQrRyogS2XOPfSztnvakmIc5IPdXKgtxJFBWgdRsNecOP0TZWP/RwJw== Received: from CY5PR14CA0006.namprd14.prod.outlook.com (2603:10b6:930:2::17) by SJ1PR12MB6076.namprd12.prod.outlook.com (2603:10b6:a03:45d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Tue, 5 Mar 2024 09:59:02 +0000 Received: from CY4PEPF0000EDD4.namprd03.prod.outlook.com (2603:10b6:930:2:cafe::84) by CY5PR14CA0006.outlook.office365.com (2603:10b6:930:2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39 via Frontend Transport; Tue, 5 Mar 2024 09:59:02 +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 CY4PEPF0000EDD4.mail.protection.outlook.com (10.167.241.208) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:59:02 +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.986.41; Tue, 5 Mar 2024 01:58:51 -0800 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.1258.12; Tue, 5 Mar 2024 01:58:50 -0800 From: Xueming Li To: Kiran Kumar K CC: Satheesh Paul , dpdk stable Subject: patch 'net/cnxk: fix flow RSS configuration' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:47:41 +0800 Message-ID: <20240305094757.439387-121-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-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: CY4PEPF0000EDD4:EE_|SJ1PR12MB6076:EE_ X-MS-Office365-Filtering-Correlation-Id: 6c3d253e-d268-4fc9-ce01-08dc3cfae2d0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n7TnajoCR+rkDNZCqwz/Uif460KfSCS91HTK/KbgTM+DJwBFlfwIDyTGSEtpxwTZOdm1PPxAAM7J6qiV4PF9nSq8MrxlN5BAToycULrY2bxlx1FF5cEiRWoScGhUerejIgPOQPzwNFGCX8cRC/cDjuanQUsfD1l3T2MUDWuatTS9Kp9xVIbcjbwLjxXHbgHq2UUZoheuIYTLbT1HzOtFTvJOENZL2Mw4pZHbuMUtCG17t0M+0PNvBHXk6m3DWOcRS5hcoKy/O5ynyUhSGFeOoyLhQJqmtwDAFL1leRWpO5RFtX9zr3/nN2oj3KD3fSncDt0LkbEuYi42yAEIr2Y9HVtWLvhKI/e6jAMNRA6zRPTy1z4E4+A0OVqoVPrWYBQ9r0QcxwhgW1iKNzpLEmzkBBF13lDRGQFzcUZuGBuYWKQYPAi2da9jLKwmUXElG1oZUW3qwmBj+xZfn59/QWdKmLCfaN6DA01vpBLyWnr1h+G47epJ8Ytvjs4u1FAb5E5WOXTv5os82bpNEIftuXmmS0EzXbHiCBKo1cBU2JLXj4UDVP+SYCyy/BA9HaMYRXD1OXV1ZCdz+WVhDHKewTej5oMru5J9Xys7LWGJ0WX4CUk7MowA5xFABBlawn6p4oBIyoOYq80ZmVzDRUcbSIFOLf5e7ZxnOm5H9GcoRK39DLh7wBP9nL4nvXph0xDNwXE1U2MxtjOYoUHVi9L8dIIrejCTuALlgIvCEbrQwtUCSjLoUMGckuhh2szD6uhOOG7w 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:(13230031)(82310400014)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:59:02.3499 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6c3d253e-d268-4fc9-ce01-08dc3cfae2d0 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: CY4PEPF0000EDD4.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6076 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/24. 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=874fd2886685566630c7715424a6ad7961928182 Thanks. Xueming Li --- >From 874fd2886685566630c7715424a6ad7961928182 Mon Sep 17 00:00:00 2001 From: Kiran Kumar K Date: Fri, 15 Dec 2023 12:15:43 +0530 Subject: [PATCH] net/cnxk: fix flow RSS configuration Cc: Xueming Li [ upstream commit 752ce2f3e5bf7bd8add8dc9629f3b824886c641e ] While creating a RSS rule, if no RSS types are specified, use RSS types from dev config. Fixes: bc778a17fa46 ("net/cnxk: support flow RSS") Signed-off-by: Kiran Kumar K Reviewed-by: Satheesh Paul --- drivers/net/cnxk/cnxk_flow.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/net/cnxk/cnxk_flow.c b/drivers/net/cnxk/cnxk_flow.c index 08ab75e2bb..800ae5d1df 100644 --- a/drivers/net/cnxk/cnxk_flow.c +++ b/drivers/net/cnxk/cnxk_flow.c @@ -102,15 +102,19 @@ npc_rss_action_validate(struct rte_eth_dev *eth_dev, } static void -npc_rss_flowkey_get(struct cnxk_eth_dev *eth_dev, - const struct roc_npc_action *rss_action, - uint32_t *flowkey_cfg) +npc_rss_flowkey_get(struct cnxk_eth_dev *eth_dev, const struct roc_npc_action *rss_action, + uint32_t *flowkey_cfg, uint64_t default_rss_types) { const struct roc_npc_action_rss *rss; + uint64_t rss_types; rss = (const struct roc_npc_action_rss *)rss_action->conf; + rss_types = rss->types; + /* If no RSS types are specified, use default one */ + if (rss_types == 0) + rss_types = default_rss_types; - *flowkey_cfg = cnxk_rss_ethdev_to_nix(eth_dev, rss->types, rss->level); + *flowkey_cfg = cnxk_rss_ethdev_to_nix(eth_dev, rss_types, rss->level); } static int @@ -204,7 +208,8 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, goto err_exit; in_actions[i].type = ROC_NPC_ACTION_TYPE_RSS; in_actions[i].conf = actions->conf; - npc_rss_flowkey_get(dev, &in_actions[i], flowkey_cfg); + npc_rss_flowkey_get(dev, &in_actions[i], flowkey_cfg, + eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf); break; case RTE_FLOW_ACTION_TYPE_SECURITY: -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:34.559748519 +0800 +++ 0120-net-cnxk-fix-flow-RSS-configuration.patch 2024-03-05 17:39:30.953566499 +0800 @@ -1 +1 @@ -From 752ce2f3e5bf7bd8add8dc9629f3b824886c641e Mon Sep 17 00:00:00 2001 +From 874fd2886685566630c7715424a6ad7961928182 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 752ce2f3e5bf7bd8add8dc9629f3b824886c641e ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 11670d37e0..a92b61c332 100644 +index 08ab75e2bb..800ae5d1df 100644 @@ -22 +24 @@ -@@ -103,15 +103,19 @@ npc_rss_action_validate(struct rte_eth_dev *eth_dev, const struct rte_flow_attr +@@ -102,15 +102,19 @@ npc_rss_action_validate(struct rte_eth_dev *eth_dev, @@ -46 +48 @@ -@@ -293,7 +297,8 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, +@@ -204,7 +208,8 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,