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 1E2BA4625C for ; Tue, 18 Feb 2025 13:41:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 15976402A0; Tue, 18 Feb 2025 13:41:36 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2065.outbound.protection.outlook.com [40.107.237.65]) by mails.dpdk.org (Postfix) with ESMTP id B87B3402A0 for ; Tue, 18 Feb 2025 13:41:34 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=d0ZXbQUrA5zebNOVjnXpI5zOeK0jN+tPj48W1WB57xEkz+T0zbsOSNDPrGO2A4kCtKa7LFguZ0MrAwvvHVpdwHlXIPJ378xlmvpmUtgMHXk4qEaF6y+og5dczmcqx93eZ5oovG17RHnX2y+83LXJS7EU+oOoclJayWOFOye+dr3ZrHyyhCE2oCXxrqb6Szfb6PlSsmycXvhk2/Ze/EGtekJ285UMTin/nYvlyYIZzATfEfRSg3uwajrU4r1ZE/cYKrlvO7hp7siVxrF/cmt9eSakWVtCZEUMEBcnc6Vg7nfUBqmvuSGvdnmc7zfQiI6Ph+GUoTSo/N18zxzlbRHG4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=RaDZTDW6fKD01ER5UP1ezsYDmVNRV/IWsvaHNU+J2WA=; b=jAw0c1rD+wkSrI96gunQkeqU0l3Bi8ph6aK8bUCldC0R869mhqW3WUA278p46JQEWwJNhjOYaDz7rQIsIlXhuq85YazJM8M/bjWextbTLuwbfnE0C/bCyPQ59PGa1x6GsdSmHqbX3LYjWEX+lMwnQA4/cvhAsB6Cr3auPEb3IFiSH+ixgwQjH/QvZ0VBDDmPjTIR1ovOCeFejJONoQAmehVFNV7Ys1W/a2fA7WukFmctNvp3KZ/zTY6oziIIsuTkdP1JoDCqFAuuJwV0Z5ndZKIWIDJMUUWoqG+6Il7zpCuEMnWe3m3vrHYOSz5exy2lIX1cSbzi+PggbRV9c3lOrA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.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=RaDZTDW6fKD01ER5UP1ezsYDmVNRV/IWsvaHNU+J2WA=; b=Vzxdfa0+4H6Ir82XZi8VUc6IgdXk4mO4exWSbgXvuG0LQp3Z0FCpuZxuQYAy+vtYKYVVx+NK3x0BwkEnB29bNIGF/ZnE9FUjE0jywoPLDTwudgPA1bGyQzriNpRgunsEZ8jJyp62wZOsrT0Mp8ulozufs7RAXHBE8+rnW4Hn4NV/a4IbLi5vNPmMZjDs+aIL+HBzrwxwJa6tUQqnSe0rU0lFezYll5l/7T5moZsysAi32tBxDpA8oCNFje4HZcFWfPkTvLn/v37bGFr0hgdahndEF0n2w0J/8vbZRt1hJyOFEtb8A0Fi0txWekJNff/JgT2VU9oG+ZkgTS74iWhEfg== Received: from BYAPR21CA0020.namprd21.prod.outlook.com (2603:10b6:a03:114::30) by IA0PR12MB7580.namprd12.prod.outlook.com (2603:10b6:208:43b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Tue, 18 Feb 2025 12:41:28 +0000 Received: from SJ1PEPF00002323.namprd03.prod.outlook.com (2603:10b6:a03:114:cafe::c4) by BYAPR21CA0020.outlook.office365.com (2603:10b6:a03:114::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.12 via Frontend Transport; Tue, 18 Feb 2025 12:41:28 +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 SJ1PEPF00002323.mail.protection.outlook.com (10.167.242.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:41:28 +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.1544.4; Tue, 18 Feb 2025 04:41:17 -0800 Received: from nvidia.com (10.126.230.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.1544.14; Tue, 18 Feb 2025 04:41:15 -0800 From: Xueming Li To: Aleksandr Loktionov CC: , Anatoly Burakov , "Bruce Richardson" , dpdk stable Subject: patch 'net/igc/base: fix MAC address hash bit shift' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:50 +0800 Message-ID: <20250218123523.36836-56-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: SJ1PEPF00002323:EE_|IA0PR12MB7580:EE_ X-MS-Office365-Filtering-Correlation-Id: 722dce13-bef2-4bb4-79bf-08dd50199040 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|36860700013|1800799024|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?oHUNVr1H1kCSjIFQR4saHHxZIzAbL5aKdgz/cl/MjFvpw7tt1aTYsOS1tlVg?= =?us-ascii?Q?Hbv08C+m7EilXl7Liz/mP7nbRoc9/CiWwoh4v06uaBX11Mp3Nb6Tjw7Oa5wQ?= =?us-ascii?Q?/mY6K/Ml1nTeDxFH07PrZpbPc9Rkl77UizLoUGrXxt7oQsN6dqOFtgOnmDkh?= =?us-ascii?Q?5g04BYQEPsX30c3LMyFM0a8dF8DkGPo9xpM1o4xUXAVsTnkSUHX8Iwf7qblo?= =?us-ascii?Q?+anyyrJYyTBaC04G6W585unE9LzJlBn0AysS98WVmG+QL3BYA1ROly4AJf1r?= =?us-ascii?Q?dbnDCLH3Rm0wo5kT+YKt6F9YnjW5zpu1R8hWcRA06XZNrSLvjFnC5odfWM4n?= =?us-ascii?Q?ALM8BKUPodpEyAMm+woInIpgqUo+U2iLutXQ9JosGFT8UzDVaXWdS5j668nj?= =?us-ascii?Q?xYZ/kYmQ2iC4a922lPlz0BWkZVOZ/B+4dUIIeuMGERuftodRR3HUwJD5VP+K?= =?us-ascii?Q?sepgzs3srBJW85vqzWXqsy4b2t/0zjgg8TyoFLmc7X/PLOMdGZcDsUJNuUxD?= =?us-ascii?Q?jQlTitfGBvjHjb8qW7qaVo1ZiM+dWIgUaI4/u98Uy3hhxVCzuL5NkHPqSS7M?= =?us-ascii?Q?VVw4FW2gOyoaqZ7FOxX+ZtQwru9bUQ0pCvs19s/unLQwCB752Kn6roC7G0XC?= =?us-ascii?Q?XYyoY8kQShW3izbbtwfyGizpmBjSTOmLqKqnI6nKuIDDvMMh4RyGdBe5yh9X?= =?us-ascii?Q?twkSLwvXhK6MzphTXmMVnPDNN6zBjDgtZZ5n5BnDD2NKKVaL0+ODq9lnBQN/?= =?us-ascii?Q?TWbhvgIuGCfnc7wwi5lNDPAOnujunVsvbaLjLHj4TgoAYUa7VEvAY6lPrF1e?= =?us-ascii?Q?Aj7WDI1Wr2wX8Kz3w42wLiwCbAAWEZz+QRiCs0JMXgZSP0qHTHwgb3r2S+yH?= =?us-ascii?Q?sWCOt5yDdNlVdL6Cf3By2nF+jOLdXJEVydXIUWMmj+49yNcYSBeGzG1MGcg4?= =?us-ascii?Q?6InGI5X+TSlc4yAAh7oxuZ9fFc4s8N6mi74IMDKZBJ71aCJti+0aJ6/eiZ1j?= =?us-ascii?Q?a8/nY68rNWazY08o7NLK+WpGMGl7XU0eCeknbmyptgBL4q6h4NxHvWCXp9go?= =?us-ascii?Q?MWptRH4P7hzuqSxhb4mQncA2wwQb+vNuTW8fc7TyfUAYMLkLDLAoWR6NMv0n?= =?us-ascii?Q?AwJcSX07Ggm1kcZneXEgcfWd9o33EXGuPZXRu/LPH2PSFl7ne7wYIWr2p8sV?= =?us-ascii?Q?cC+JZZkRMJzaUA4onFVTKBReXhCmlYFUl/Qt8Yf2p0gTy8J9z/hBMUDpXWWw?= =?us-ascii?Q?A91WmtgV31dVKIIo8sDM9YNhchdHVDbq/yO3SOnlq/nQO6xABfT8mbyPYcMq?= =?us-ascii?Q?/cj9pe/KwcFL12vzpDnGulwVSzF20uNgu/aIL4n8jQTd7wbnfHB+aH+4PayI?= =?us-ascii?Q?r+k/HnAl13i3PHv9L/YU+4OpSeEhdCyag+u8HWUBXdTTg6kZziwHLdGy9XQC?= =?us-ascii?Q?oJ7WvzqOJYlv4pXvi4877yAI0THU6/s1MOK+1jsiYjsAxL6wSDAQEzRqPRXs?= =?us-ascii?Q?bKf4BAUubP5m+jY=3D?= 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:(13230040)(376014)(82310400026)(36860700013)(1800799024)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:41:28.0715 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 722dce13-bef2-4bb4-79bf-08dd50199040 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: SJ1PEPF00002323.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7580 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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=a9583ad550e01cef45cf1e0b18c36665f8a964fe Thanks. Xueming Li --- >From a9583ad550e01cef45cf1e0b18c36665f8a964fe Mon Sep 17 00:00:00 2001 From: Aleksandr Loktionov Date: Thu, 6 Feb 2025 16:08:34 +0000 Subject: [PATCH] net/igc/base: fix MAC address hash bit shift Cc: Xueming Li [ upstream commit bccccacfb6f6f2e84a24c6733c7e3d4af05f73b5 ] In e1000_hash_mc_addr_generic() the expression: "mc_addr[4] >> 8 - bit_shift", right shifting "mc_addr[4]" shift by more than 7 bits always yields zero, so hash becomes not so different. Add initialization with bit_shift = 1, and add a loop condition to ensure bit_shift will be always in [1..8] range. Fixes: 8cb7c57d9b3c ("net/igc: support device initialization") Signed-off-by: Aleksandr Loktionov Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/igc/base/igc_mac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/igc/base/igc_mac.c b/drivers/net/igc/base/igc_mac.c index 3cd6506e5e..c69f8ac73b 100644 --- a/drivers/net/igc/base/igc_mac.c +++ b/drivers/net/igc/base/igc_mac.c @@ -486,7 +486,7 @@ static int igc_rar_set_generic(struct igc_hw *hw, u8 *addr, u32 index) u32 igc_hash_mc_addr_generic(struct igc_hw *hw, u8 *mc_addr) { u32 hash_value, hash_mask; - u8 bit_shift = 0; + u8 bit_shift = 1; DEBUGFUNC("igc_hash_mc_addr_generic"); @@ -496,7 +496,7 @@ u32 igc_hash_mc_addr_generic(struct igc_hw *hw, u8 *mc_addr) /* For a mc_filter_type of 0, bit_shift is the number of left-shifts * where 0xFF would still fall within the hash mask. */ - while (hash_mask >> bit_shift != 0xFF) + while (hash_mask >> bit_shift != 0xFF && bit_shift < 4) bit_shift++; /* The portion of the address that is used for the hash table -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:02.673692295 +0800 +++ 0055-net-igc-base-fix-MAC-address-hash-bit-shift.patch 2025-02-18 19:39:00.648244044 +0800 @@ -1 +1 @@ -From bccccacfb6f6f2e84a24c6733c7e3d4af05f73b5 Mon Sep 17 00:00:00 2001 +From a9583ad550e01cef45cf1e0b18c36665f8a964fe Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit bccccacfb6f6f2e84a24c6733c7e3d4af05f73b5 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ - drivers/net/intel/igc/base/igc_mac.c | 4 ++-- + drivers/net/igc/base/igc_mac.c | 4 ++-- @@ -24 +26 @@ -diff --git a/drivers/net/intel/igc/base/igc_mac.c b/drivers/net/intel/igc/base/igc_mac.c +diff --git a/drivers/net/igc/base/igc_mac.c b/drivers/net/igc/base/igc_mac.c @@ -26,2 +28,2 @@ ---- a/drivers/net/intel/igc/base/igc_mac.c -+++ b/drivers/net/intel/igc/base/igc_mac.c +--- a/drivers/net/igc/base/igc_mac.c ++++ b/drivers/net/igc/base/igc_mac.c