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 34703428F8 for ; Sun, 9 Apr 2023 17:28:54 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2E0AD40A80; Sun, 9 Apr 2023 17:28:54 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2080.outbound.protection.outlook.com [40.107.94.80]) by mails.dpdk.org (Postfix) with ESMTP id C6BC440EDE for ; Sun, 9 Apr 2023 17:28:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wq3d9AExJn8Kbrv8SmsmApqntTh7J1PGo+Y42lgx0e056xBLKWYBcSQnLUJWn6NYMHRewnpF2nmofCI7bRUG3WdUwakOw/UTgBKRKcgaeD11IbkaydjM+QgbKvuMG2KW7vMZC0tpywUGK7Ks+YJHxhAAoC9kwx/ngh/mlhaIroy1dl/jIspPIr1ty99XDM/nkj1FzIcR5v0G8nJBjgQoTHwB1UXN5XtMW6XMAQXSYhk5/0YgiS2jHxnWKS5G1XUYEqX9de8yA6EWXhRdWub3m0/L6ycMZfxuiao2NZMsE68qdqeyXVbwCakyZxIbpBm+pfqAhzeyhxWC4nCIG6FvGw== 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=HPBQq4kdNusu5UmS3H2rQiinzrG2HRlVcflJknlpWYs=; b=AmH8zYQ1OeTapMZtXaxWQY2pj+anWG8jNjI5JlBREFdyMmuEXvwXOCkbfCHgyL+UAsAr7HoFss55pJDLWDFq2Jgf/peg4p8MlrOLczi4wv9+zpSnUyRGcyI3et44AnhdKmsbvn4xZ2xZrTyhcAnPanEcm2lH8dlq5qD0AYVcxziBkHH78vEh75Ag9SJpDI/my9we0B94EX3rb6AUJyljxIQHWvAoWolDzKPUhTAUmwTl7R0ixMU9yArqvNVypEtkfjL7PlhHJ8I45RLq9GMsR8DK+4BrYm2wQIFH1RAJnv3sAN37XqmndM7FxZcHBsjc19ybLFP5wQu0iN0NyOUzsg== 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 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=HPBQq4kdNusu5UmS3H2rQiinzrG2HRlVcflJknlpWYs=; b=p27anUg8MXxq6aL9zCTcQboC3Vd4mHcStqQYB+safW8xmWFoVVxBSK/Ch1sY3MmntTuRYfqZEMKpm3zmXSFcNCUqFEWHRIUGo8+YbCMb3Im6BQjUkkQJpnNXFoMjgOnUyMZf5qfvXqtD6deVCak0zDo2V7ANcGEMZEafgyTiOTQuJ/HxMlqBBSCRzEfTqpnWNykNmUUXZ24scJrYnF6XtFOvXhPZa7f3PuRVwPqZ3NTU28dmK/lBhtLPfc2sa7pFN7NdyJQzt5q8Y+AdFQ7TDxtNwL44ufmiwSb8paZUcCpMuGXooTC+aTvagz6sgAH0pAn55l4RGB7uXgqKPvKM0w== Received: from BN9PR03CA0221.namprd03.prod.outlook.com (2603:10b6:408:f8::16) by CH2PR12MB4248.namprd12.prod.outlook.com (2603:10b6:610:7a::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.30; Sun, 9 Apr 2023 15:28:49 +0000 Received: from BN8NAM11FT004.eop-nam11.prod.protection.outlook.com (2603:10b6:408:f8:cafe::47) by BN9PR03CA0221.outlook.office365.com (2603:10b6:408:f8::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38 via Frontend Transport; Sun, 9 Apr 2023 15:28:48 +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 BN8NAM11FT004.mail.protection.outlook.com (10.13.176.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.22 via Frontend Transport; Sun, 9 Apr 2023 15:28:48 +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.5; Sun, 9 Apr 2023 08:28:48 -0700 Received: from nvidia.com (10.126.231.37) 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.37; Sun, 9 Apr 2023 08:28:46 -0700 From: Xueming Li To: Long Wu CC: Chaoyong He , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "dpdk stable" Subject: patch 'net/nfp: fix getting RSS configuration' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:23:45 +0800 Message-ID: <20230409152529.5308-38-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT004:EE_|CH2PR12MB4248:EE_ X-MS-Office365-Filtering-Correlation-Id: 15306c76-f164-4a70-c9a2-08db390f1dac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JG011JbX9oR79fE9+wJLhlG8Z20X9mXj/yTKjRkgeTPDCg/zUznUlTJKBTw8MfPl7l0D9Qdumb3209ckP8GcC3R9ZFM3hu+7BmgjrTeLHqMehRvVNJrKy/PSSTTUK2yp/1Go1GMW5T3phFjxJcJpjdSpa5n1NGnVPvD/ZPILyC5ZKiwuRVXSGIH27Rw58TvlJ3KQzk33WfpGRa6fSSLzOXElwZJkR9F+jzUpu6mOeyKzjNcmZ7fQpGChC70hWuggHLKd3F1eOtkv8jU1b5PiC3UB7XS+9Ue+vtFChYBnJ9X+r2nm3Ff9c6EQHRcpR2H/nS7WR+9GOcO79ejzUOcX5hAh4OWmmrCsfHLIqP73+Q+hVJBi7RUDnum/k0pIPPxzejqg5En9wCNFZkV/nrwTJDFNuptsviBH2db34qybQ7N5JR5at1Bhw83XfskQcuz7yh5xa+dPzSR43k2MjKaGUFvQXmuAt4RO4zwaKDVU6nUInI5XApDlu48lnMPiAUb12L66Zo2VZtQ66LYuEWJEttCN0vzD0NrLnkc3YntassScd6j21wKtqQFgWcg8kOswR1ptz4JXFxOXxhviCOGSVq3PuuCRhI8+8AgWDATSVpXz9ZPxT8XNnVQslNB61/Y5I4s82a4kjee2ZXBvSUAR5+9yuHhVpi4En4avjSQ+sc6PNxchfYnro/gwb00DRh/yJTU9mao7DySMClDGCrV/yaECm+HjWDN7bE8xHa/uhk+5PhiCEfCfJsHqotOao67mMDP0iaLSM2kZNCnMqCOuY+yOc8VLZFwL6qm8pLph+D+aou3wx035voqvsKXJfSUKvaeAFrJQFl6vHXboo7YLBQ== 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:(13230028)(4636009)(136003)(346002)(376002)(396003)(39860400002)(451199021)(36840700001)(40470700004)(46966006)(82310400005)(55016003)(36860700001)(8676002)(40460700003)(36756003)(5660300002)(82740400003)(2906002)(40480700001)(8936002)(70586007)(86362001)(356005)(41300700001)(7636003)(70206006)(6916009)(4326008)(966005)(336012)(66574015)(83380400001)(2616005)(47076005)(426003)(26005)(1076003)(54906003)(316002)(186003)(478600001)(7696005)(53546011)(6286002)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:28:48.6181 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 15306c76-f164-4a70-c9a2-08db390f1dac 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: BN8NAM11FT004.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4248 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/11/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/log/?h=22.11-staging/commit/03cfac3c9935306137f5c4b48beedb179b394577 Thanks. Xueming Li --- >From 03cfac3c9935306137f5c4b48beedb179b394577 Mon Sep 17 00:00:00 2001 From: Long Wu Date: Tue, 21 Feb 2023 13:52:22 +0800 Subject: [PATCH] net/nfp: fix getting RSS configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit ef26b8a08cd2ba0b47d3ca71316ea6e865abb6fd ] "NFP_NET_CFG_RSS_IPV4" and "NFP_NET_CFG_RSS_IPV6" represent that firmware will calculate RSS base on L3 rather than UDP or TCP information from packets. So the logic of return RSS configuration in driver is wrong. Modify code to return the right configuration. Fixes: 934e4c60fbff ("nfp: add RSS") Signed-off-by: Long Wu Reviewed-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index c962ed0fc0..c9eeaa02fc 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -1256,7 +1256,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev, cfg_rss_ctrl = nn_cfg_readl(hw, NFP_NET_CFG_RSS_CTRL); if (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4) - rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_TCP | RTE_ETH_RSS_NONFRAG_IPV4_UDP; + rss_hf |= RTE_ETH_RSS_IPV4; if (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_TCP) rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_TCP; @@ -1271,7 +1271,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev, rss_hf |= RTE_ETH_RSS_NONFRAG_IPV6_UDP; if (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6) - rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_UDP | RTE_ETH_RSS_NONFRAG_IPV6_UDP; + rss_hf |= RTE_ETH_RSS_IPV6; /* Propagate current RSS hash functions to caller */ rss_conf->rss_hf = rss_hf; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:39.746208000 +0800 +++ 0037-net-nfp-fix-getting-RSS-configuration.patch 2023-04-09 21:45:38.619042200 +0800 @@ -1 +1 @@ -From ef26b8a08cd2ba0b47d3ca71316ea6e865abb6fd Mon Sep 17 00:00:00 2001 +From 03cfac3c9935306137f5c4b48beedb179b394577 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit ef26b8a08cd2ba0b47d3ca71316ea6e865abb6fd ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +29 @@ -index 837056cc12..5922bfea8e 100644 +index c962ed0fc0..c9eeaa02fc 100644 @@ -30 +32 @@ -@@ -1420,7 +1420,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev, +@@ -1256,7 +1256,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev, @@ -39 +41 @@ -@@ -1435,7 +1435,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev, +@@ -1271,7 +1271,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev, @@ -46,2 +48,2 @@ - if (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_SCTP) - rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_SCTP; + /* Propagate current RSS hash functions to caller */ + rss_conf->rss_hf = rss_hf;