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 A7231A00C5 for ; Wed, 20 Jul 2022 10:23:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9E64940697; Wed, 20 Jul 2022 10:23:28 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2043.outbound.protection.outlook.com [40.107.220.43]) by mails.dpdk.org (Postfix) with ESMTP id 4569A4003C for ; Wed, 20 Jul 2022 10:23:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VpVBKhkvarcw/aHMH3GO+sAq7nihmJDY6pqYTm4axn1TJLCMPlVC9jpEq+TxLTDEAsF0xiHCTSrjRDNIVfGBdlBFlJtpp0Z8vebU2bwwujxjr9ewRcmUFVYmgLykjQf+fbiPUwzI//15VVYZ/vs3c/7qniw/76N/ifRx3eIDe/EvLqZ5J7pxeRH2ZYHG2PNDxSF0xQ77v8vtaKCGhS3ogCkhu0s4w6tIwe/VYfrsWwOo/Dus8fMuJeMv4y+nAefcaLjczCR8LBuurn8J5EG8b2HyuMuxpzhT0WSCMPAt4FakSzua6+3atw+tk/bRJ4lylgpzaJahWWQQcMdzF4LpLg== 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=JXK69LJPF8/b3ihHOy6R+IDm5tgoZLJFCURH9spi1E4=; b=hZvWNrqmJuS1XQPX4LW3GxVeZNv3LiIw0h9CuJVVx6vVlJlZ0bCopFvJK7w5UOKDuZOA9HaU516Yrn71JPsOLGVAYVw0mXM79zEPU0eyKRuTLfpuVdxBofueoj5bqN4ogw0Zf7A/0Jq7c8h3H9OHbE/ewzMzEJjjkyw59F412rfp2fJlB0NXqWhIAk4bf+iR9DLxAU4XR9LxJC9COUWpCXNZ0jITj5LO0qB3dGLr35OMVb4HGMMa6e7SA5e96BuI5KwWSThGruo4CiW6xScvJqe+S4ClyoUPG+fozKKYNW0PZf9b2wGEQ7jhXOZGIbdFa4jUqo2QAhfues7Qs+Stpw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.234) smtp.rcpttodomain=dpdk.org 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=JXK69LJPF8/b3ihHOy6R+IDm5tgoZLJFCURH9spi1E4=; b=OVcNv64S7YlYteCrdTAlQILcXAAoFiQd+x1v46ox3E/+BK8B6eyPDIpItGef3h5j205D3e8RYiQ9XwExKk6SNodmmto/c7ct0fIPTzoUPF4imWLCuITB2VuXlq7v23Xlbg5MfYog9HUXMGgWskvmKjmI7TDJ9jvZcszqfCe/knf6WUlxGNmMYJXYcVSdoMMC6T2+vLLtJpgVOm32t7+eP1FEL88mYQ6Q75RecJky/FijfouWJSRz281euGkf+sdIHM29nZt2+Xivo9gn4k3IURioNCd5ARz242qAhckg0QXJyh8vdrVu7MoKVavGmhZh2VbUmCDUwERvUDgCEDaUDQ== Received: from BN9PR03CA0750.namprd03.prod.outlook.com (2603:10b6:408:110::35) by BN8PR12MB3571.namprd12.prod.outlook.com (2603:10b6:408:62::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18; Wed, 20 Jul 2022 08:23:25 +0000 Received: from BN8NAM11FT047.eop-nam11.prod.protection.outlook.com (2603:10b6:408:110:cafe::36) by BN9PR03CA0750.outlook.office365.com (2603:10b6:408:110::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.19 via Frontend Transport; Wed, 20 Jul 2022 08:23:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.234) 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 12.22.5.234 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.234; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.234) by BN8NAM11FT047.mail.protection.outlook.com (10.13.177.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5458.17 via Frontend Transport; Wed, 20 Jul 2022 08:23:25 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL101.nvidia.com (10.27.9.10) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Wed, 20 Jul 2022 08:23:24 +0000 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.26; Wed, 20 Jul 2022 01:23:23 -0700 From: Xueming Li To: Huisong Li CC: , Min Hu , dpdk stable Subject: patch 'net/hns3: remove duplicate definition' has been queued to stable release 20.11.6 Date: Wed, 20 Jul 2022 11:20:46 +0300 Message-ID: <20220720082132.3954126-17-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220720082132.3954126-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> <20220720082132.3954126-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-Office365-Filtering-Correlation-Id: 342d1e62-d93a-4416-902d-08da6a291ddd X-MS-TrafficTypeDiagnostic: BN8PR12MB3571:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?VrQP9/zOi2d5P9sfZrrq+Yfr/U4eT/UCH01w/5sSTJCtS+kY0HoQbZ7Oqj1I?= =?us-ascii?Q?BxLD4S657Wjy6UUYqZ7qDQf/Tc0eHn1dLEXLgqHVMl8F2L/kvn+t9+e8WF7v?= =?us-ascii?Q?g+nSbNTq/hr2gn5SJK0xiGv8Q6eVDhfC/E2xls6QDX7vD5FLmmJZMbFAnCxf?= =?us-ascii?Q?YsAY3DGqhbFyEuwDC3qdzUIzvzwsUWa8LzLFVdlzbhRAeSS5o3q6VQeFXvbz?= =?us-ascii?Q?ZTpYGVXsbb93MBscAAe+soX3RcG+UWSmXzd1xC/Bng9JUAsIgh0tFT37xwx7?= =?us-ascii?Q?f8kwUQuRVbbbG5Ff5lANX+5IVaLADLRZPgaVIrYgi/6Qvkn0j+A+F8PLOd3y?= =?us-ascii?Q?4FElJdlfPVuVaa5rQ+c0NLh/G4Ru+aPd+YVAXhmo4ju0smzpMVsVSJXmTfwT?= =?us-ascii?Q?7a4LSfBwW499hX8B5fUGTXtzUtgm1gIJPua1acit+P8r2rnRfYXYfGKgeFia?= =?us-ascii?Q?UwH2xJvC8KiGmku/XFgUXBVmnkLzLDIXvWBhqsC+QfsqenpY1zsKUr3gxxth?= =?us-ascii?Q?2HB0a04ADuL66CZiNz6MH86+4oC1QIInvIjq1tTkgdWoi1zETJ4539UfRiLZ?= =?us-ascii?Q?0z0Oeuw7ArJhgx8kulxJG4O8pnTA2rPSmPcfEzQm4+P+M5IHfzltps3pSP+k?= =?us-ascii?Q?e0/43SwFh2PyaTM9WXmRv/Erfxgo+dFjNHW1oNpOOcJ67X5r7a3ybR36SIca?= =?us-ascii?Q?kc5Ji704dy7TJOOJMItIZAXQg3t48Tk1HD82zDC6cLi1hJ/peE1wCC32suvF?= =?us-ascii?Q?AiLw9kNHlVei7HxykeQoRCiUXVcMMCiTGSKD73kaBif0DFDNMwyqe+WvHSsk?= =?us-ascii?Q?5NSYrVOCAoTF8xtCMT3EBCvBEl+b0kl5J755veTX2IFfTGIiJKBnL77mOAsh?= =?us-ascii?Q?B5O39fM/48fFB9aoLe6ege7G3ZPNW6WbbbgPDqISZS2fIOPkZULFF1wUqMJH?= =?us-ascii?Q?nxeRiFhzWO6+Pn1/0fVzXg=3D=3D?= X-Forefront-Antispam-Report: CIP:12.22.5.234; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(396003)(39860400002)(376002)(346002)(136003)(36840700001)(46966006)(40470700004)(82310400005)(7696005)(6286002)(26005)(53546011)(6666004)(41300700001)(86362001)(40460700003)(54906003)(6916009)(55016003)(40480700001)(81166007)(316002)(478600001)(966005)(36860700001)(336012)(47076005)(426003)(2616005)(16526019)(186003)(1076003)(83380400001)(82740400003)(356005)(8676002)(70206006)(70586007)(2906002)(36756003)(4326008)(8936002)(5660300002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2022 08:23:25.1890 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 342d1e62-d93a-4416-902d-08da6a291ddd X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.234]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT047.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3571 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 20.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/22/22. 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://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/ecb5bc37dd37c7b6834ca6371b9fb99949baabb6 Thanks. Xueming Li --- >From ecb5bc37dd37c7b6834ca6371b9fb99949baabb6 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Wed, 1 Jun 2022 11:52:45 +0800 Subject: [PATCH] net/hns3: remove duplicate definition Cc: Xueming Li [ upstream commit d7050da870a9d259a6422e253d54fa552cbfa7c8 ] The default hash key array is defined twice. Remove the extra one. Fixes: c37ca66f2b27 ("net/hns3: support RSS") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_flow.c | 9 --------- drivers/net/hns3/hns3_rss.c | 6 ++---- drivers/net/hns3/hns3_rss.h | 2 ++ 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index 3d30070ee3..a1acb0ebd5 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -9,15 +9,6 @@ #include "hns3_ethdev.h" #include "hns3_logs.h" -/* Default default keys */ -static uint8_t hns3_hash_key[] = { - 0x6D, 0x5A, 0x56, 0xDA, 0x25, 0x5B, 0x0E, 0xC2, - 0x41, 0x67, 0x25, 0x3D, 0x43, 0xA3, 0x8F, 0xB0, - 0xD0, 0xCA, 0x2B, 0xCB, 0xAE, 0x7B, 0x30, 0xB4, - 0x77, 0xCB, 0x2D, 0xA3, 0x80, 0x30, 0xF2, 0x0C, - 0x6A, 0x42, 0xB7, 0x3B, 0xBE, 0xAC, 0x01, 0xFA -}; - static const uint8_t full_mask[VNI_OR_TNI_LEN] = { 0xFF, 0xFF, 0xFF }; static const uint8_t zero_mask[VNI_OR_TNI_LEN] = { 0x00, 0x00, 0x00 }; diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c index 50c4f21da3..6a4ba26b7e 100644 --- a/drivers/net/hns3/hns3_rss.c +++ b/drivers/net/hns3/hns3_rss.c @@ -9,10 +9,8 @@ #include "hns3_ethdev.h" #include "hns3_logs.h" -/* - * The hash key used for rss initialization. - */ -static const uint8_t hns3_hash_key[] = { +/* Default hash keys */ +const uint8_t hns3_hash_key[] = { 0x6D, 0x5A, 0x56, 0xDA, 0x25, 0x5B, 0x0E, 0xC2, 0x41, 0x67, 0x25, 0x3D, 0x43, 0xA3, 0x8F, 0xB0, 0xD0, 0xCA, 0x2B, 0xCB, 0xAE, 0x7B, 0x30, 0xB4, diff --git a/drivers/net/hns3/hns3_rss.h b/drivers/net/hns3/hns3_rss.h index 685d76491e..7493292a1a 100644 --- a/drivers/net/hns3/hns3_rss.h +++ b/drivers/net/hns3/hns3_rss.h @@ -88,6 +88,8 @@ static inline uint32_t roundup_pow_of_two(uint32_t x) return 1UL << fls(x - 1); } +extern const uint8_t hns3_hash_key[]; + struct hns3_adapter; int hns3_dev_rss_hash_update(struct rte_eth_dev *dev, -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-20 15:00:59.553606977 +0800 +++ 0017-net-hns3-remove-duplicate-definition.patch 2022-07-20 15:00:58.684333873 +0800 @@ -1 +1 @@ -From d7050da870a9d259a6422e253d54fa552cbfa7c8 Mon Sep 17 00:00:00 2001 +From ecb5bc37dd37c7b6834ca6371b9fb99949baabb6 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d7050da870a9d259a6422e253d54fa552cbfa7c8 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 86ebbf69b6..ca9edc5244 100644 +index 3d30070ee3..a1acb0ebd5 100644 @@ -23 +25,2 @@ -@@ -10,15 +10,6 @@ +@@ -9,15 +9,6 @@ + #include "hns3_ethdev.h" @@ -25 +27,0 @@ - #include "hns3_flow.h" @@ -40 +42 @@ -index 4c546c9363..1003daf03e 100644 +index 50c4f21da3..6a4ba26b7e 100644 @@ -57 +59 @@ -index 55d5718ffc..56627cbd4c 100644 +index 685d76491e..7493292a1a 100644