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 54591428F8 for ; Sun, 9 Apr 2023 17:32:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4FAB942B8E; Sun, 9 Apr 2023 17:32:56 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2055.outbound.protection.outlook.com [40.107.220.55]) by mails.dpdk.org (Postfix) with ESMTP id EC70B40A80 for ; Sun, 9 Apr 2023 17:32:53 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=La8GxSz0I0HcrXMw/29rcSkEQF1rHddwiCU8Hbl4CDHJc/7Wu3FRfsEO0+vP50VAUUqG3wgcCg/PqJTGg1cz6Lh/i1Op/CdJWA5zJSoMIs2G46SwejiWXUYGuYb4friXgfkQyRGHE9vFo+NK1zSYeXv9uQY0f2d/1siqMOwMDAvTr7ceYCjlN0keaTsMc4jpeA1sT5oTtdOvnyxE5bbpsq9YoP1Q5709n7D0w1od0fBcgqgOAFgdIVhtzU2oSZ7HwCRFaaFlI1ABezP8sXq8+mq3Of4wnLELJrAd3X8GoZjEgyLwEUVAMWqMoF40hmQ3sONmWbjubXcAxxHpnqHCxQ== 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=CCfRKEZGMf4IXJXnnUYf6LqE+Uc9JRvuEujWntsM62k=; b=P4ZrONx1Fy6U2Q9yGLfGg1baum/MkBgg1TyptdkiGJgOcrn/uT9ahQ4Ov2pre3fD9jrLYgzGsanArnZ5FXJ4PRB2kYsGS73ybcnvFywQmxm9PrG5yiqG2mFdVw+NRIwTwZmdIXvwUG4Bh2Xq2ygJkdLdJa6LXLMKPqfYYsP/MHN6hzdDbTTQklsC6jb9pusiVw9KDk6++gYFapEobua8EPySSS/rbHYnrxt0egaEDIUVyeQuukhL8Y34tA3kh7o5OWgxyUcBqjpHNsobbDymj9JbTsQCph10T6U7doia7muRukY5h9phWm92g83n5TIJIyaVsfXApaJ+wPm/Ex/+ig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=huawei.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=CCfRKEZGMf4IXJXnnUYf6LqE+Uc9JRvuEujWntsM62k=; b=dcHtVjQCfeA2uKfqeVKsZx3WSLE/nkzs6MHUXXdbkfsw6N6UFmkhteXDJCIldQCvSOPPKobjmcAzQxD+h6xLSlpV1BrNeECyB/gn6ymyPuNuLIFIGbHs8n3346c4ew5Ne0vG3EBVbvb+vslJWxfia1zoymGg/5mTBLJ97yCApTu/b11RujaM7t6EuM8V3nykgWAjA5gtpgjaYVjbKvrT96pshgBmJB3Q2Rff93Cj4nx+OGB0E9aVOcU8vs0SlAtH2obxl4XAyz3FwBcjNb3Xr4qfByEK1KMJJHKnUCW5n8SBOe5q2jON1QaWTL3Wbokccet/iomSI5hBN4P6A/oWkw== Received: from BN9PR03CA0979.namprd03.prod.outlook.com (2603:10b6:408:109::24) by CY5PR12MB6575.namprd12.prod.outlook.com (2603:10b6:930:41::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.35; Sun, 9 Apr 2023 15:32:52 +0000 Received: from BN8NAM11FT097.eop-nam11.prod.protection.outlook.com (2603:10b6:408:109:cafe::cc) by BN9PR03CA0979.outlook.office365.com (2603:10b6:408:109::24) 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:32:52 +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 BN8NAM11FT097.mail.protection.outlook.com (10.13.176.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.20 via Frontend Transport; Sun, 9 Apr 2023 15:32:51 +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.5; Sun, 9 Apr 2023 08:32:38 -0700 Received: from nvidia.com (10.126.230.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:32:37 -0700 From: Xueming Li To: Huisong Li CC: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: save hash algo to RSS filter list node' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:24:31 +0800 Message-ID: <20230409152529.5308-84-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-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: BN8NAM11FT097:EE_|CY5PR12MB6575:EE_ X-MS-Office365-Filtering-Correlation-Id: 5d221162-27c4-4818-d419-08db390faeab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R5DLQhZwv+NuFTVLze5R3kfVwbW5eXw6HETRQdjuAI/8OAVba/HMsxN+y7J3AlBSCZPCjNjlq0IKT6oMXw+jG6nDR+aWP8o9GoT5DlUP7jM9dL3KugSVqQsi1HOzuPgH/V8tYfJosd1Kq8y9GEarPoSi+Mbb9sJMdnS4zhI7Cby/cg2inQGzAFzu0L0sC8hkjfKSRQXY4ctYWopT3kI+zSQpwmKezYe7wxAbPDJ61e0B/eXv9v+D5u6AWRfbMJ/cDoCAIR97iai5V+6gMO9knBXnFAafFGbjff3D4I4tDwiJ1pjj0xUo0/gPmN/zYMpVHpyMMennIHpvjtSpfOf2dPiTDbpZKrQEZdvSLLh28TQwoIQ99z5N+MP2k0pAlpDVNSBo3Jd6VWpgg6oMd6sCFuR7ibb4ftPsyuzHos4RnR4TbtU4tCrnRcsatwpf4/BOGv6Lhy53XQDmn63XLWo37ceWiL0c8w2wXlJi3c7hk4Nqkr5D16uDWdlVMglwc43IghEZ3tKZxg5JLpuScUPuQ+03BaNJz2C6DtSfPIGFwJVo4gPfyRME1r8zdTHh1J4CnX8zPGrAVbqS0kMcFVbb9pgdEyna90YOovrw8k6hHO/4gtfIw7jWCf2+7PTglSaIU8d+z9OjD3b6i8TLx55NFjvpiKiRK8VqLdAvMR4bAfCr0BgGfZ3lpl7v0XWj3rrQRYGji4wlPpCLMtT8gap9uWZ6Tw6V4J2SkbrSb9shBWFB5Utg7QgvO7lgFs6ynNNULODK+f4xlxUC0lITLxhiMD+8McMUqtrnYfZbRYmFVG0ZzHYEjX8xIxJtNFhzeExPMXQD05/zDU5nvV19fdKvtg== 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:(13230028)(4636009)(346002)(396003)(136003)(39860400002)(376002)(451199021)(36840700001)(40470700004)(46966006)(70206006)(478600001)(54906003)(316002)(47076005)(83380400001)(6286002)(2616005)(1076003)(53546011)(336012)(6666004)(36756003)(82310400005)(26005)(426003)(16526019)(86362001)(186003)(40480700001)(356005)(55016003)(82740400003)(7636003)(36860700001)(7696005)(40460700003)(966005)(8936002)(41300700001)(2906002)(5660300002)(4326008)(6916009)(8676002)(70586007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:32:51.8815 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5d221162-27c4-4818-d419-08db390faeab 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: BN8NAM11FT097.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6575 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/adf239587c322fccab9d6d0040302e4c34896d75 Thanks. Xueming Li --- >From adf239587c322fccab9d6d0040302e4c34896d75 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Fri, 10 Mar 2023 17:35:14 +0800 Subject: [PATCH] net/hns3: save hash algo to RSS filter list node Cc: Xueming Li [ upstream commit 9d34b8a181bf022fe3a3a3ae8511f3d921fc5c67 ] Save hash algo from rte flow RSS rule to RSS filter list node instead of struct hns3_rss_conf. Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_flow.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index 3ac5279538..f073adebb6 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1439,7 +1439,7 @@ hns3_disable_rss(struct hns3_hw *hw) } static int -hns3_parse_rss_algorithm(struct hns3_hw *hw, enum rte_eth_hash_function func, +hns3_parse_rss_algorithm(struct hns3_hw *hw, struct hns3_rss_conf *rss_conf, uint8_t *hash_algo) { const uint8_t hash_func_map[] = { @@ -1451,7 +1451,7 @@ hns3_parse_rss_algorithm(struct hns3_hw *hw, enum rte_eth_hash_function func, uint8_t key[HNS3_RSS_KEY_SIZE_MAX] = {0}; int ret; - if (func == RTE_ETH_HASH_FUNCTION_DEFAULT) { + if (rss_conf->conf.func == RTE_ETH_HASH_FUNCTION_DEFAULT) { ret = hns3_rss_get_algo_key(hw, hash_algo, key, hw->rss_key_size); if (ret != 0) { @@ -1466,20 +1466,21 @@ hns3_parse_rss_algorithm(struct hns3_hw *hw, enum rte_eth_hash_function func, * rte_flow_hash_algo) when this rule is delivered. */ if (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED) && - *hash_algo != hw->rss_info.rte_flow_hash_algo) - *hash_algo = hw->rss_info.rte_flow_hash_algo; + *hash_algo != rss_conf->rte_flow_hash_algo) + *hash_algo = rss_conf->rte_flow_hash_algo; return 0; } - *hash_algo = hash_func_map[func]; + *hash_algo = hash_func_map[rss_conf->conf.func]; return 0; } static int -hns3_hw_rss_hash_set(struct hns3_hw *hw, struct rte_flow_action_rss *rss_config) +hns3_hw_rss_hash_set(struct hns3_hw *hw, struct hns3_rss_conf *conf) { + struct rte_flow_action_rss *rss_config = &conf->conf; uint8_t rss_key[HNS3_RSS_KEY_SIZE_MAX] = {0}; bool use_default_key = false; uint64_t flow_types; @@ -1493,7 +1494,7 @@ hns3_hw_rss_hash_set(struct hns3_hw *hw, struct rte_flow_action_rss *rss_config) use_default_key = true; } - ret = hns3_parse_rss_algorithm(hw, rss_config->func, &hash_algo); + ret = hns3_parse_rss_algorithm(hw, conf, &hash_algo); if (ret) return ret; @@ -1502,7 +1503,7 @@ hns3_hw_rss_hash_set(struct hns3_hw *hw, struct rte_flow_action_rss *rss_config) hw->rss_key_size); if (ret) return ret; - hw->rss_info.rte_flow_hash_algo = hash_algo; + conf->rte_flow_hash_algo = hash_algo; /* Filter the unsupported flow types */ flow_types = rss_config->types ? @@ -1579,7 +1580,7 @@ hns3_config_rss_filter(struct hns3_hw *hw, struct hns3_rss_conf *conf) } /* Set hash algorithm and flow types by the user's config */ - return hns3_hw_rss_hash_set(hw, rss_act); + return hns3_hw_rss_hash_set(hw, conf); } static int -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:40.898199100 +0800 +++ 0083-net-hns3-save-hash-algo-to-RSS-filter-list-node.patch 2023-04-09 21:45:38.699042200 +0800 @@ -1 +1 @@ -From 9d34b8a181bf022fe3a3a3ae8511f3d921fc5c67 Mon Sep 17 00:00:00 2001 +From adf239587c322fccab9d6d0040302e4c34896d75 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9d34b8a181bf022fe3a3a3ae8511f3d921fc5c67 ] @@ -9,2 +11,0 @@ -Cc: stable@dpdk.org - @@ -18 +19 @@ -index 3700d073b1..527874df44 100644 +index 3ac5279538..f073adebb6 100644