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 DE7424625C for ; Tue, 18 Feb 2025 13:42:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D7825402A0; Tue, 18 Feb 2025 13:42:03 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2080.outbound.protection.outlook.com [40.107.236.80]) by mails.dpdk.org (Postfix) with ESMTP id 7D007402A0 for ; Tue, 18 Feb 2025 13:42:02 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xJAFWNxsaNJ6BAwdt0BEGB3XQSK/Y6Zj3Dsouu2M5ND+iLZoKbyud8VpzKQrfPRLIFOnlE6T+jR22z1WdZ07bSSliukqJvLzEhiXYoXgpnT/Qc94Ktgayl9ofbZhBrl/tqvWBoSr5xFnKAf1/OljWGOOr3dbXsVFaap1NLSg8SeHiEe3TpmP15m8+v0yMhaHoc6L653RRVV5NSFosJkLqhIDfan5nuOd2pdvs7wkfOQMsoycFAq1FzQ7aqqeEsouaH+16uxgpbbgy6FsK0JHi+ktJne/mSbnZBM5F+mcQE8pVy1tarJTQk7sKbb6lgjxd7llB2vQA7gwiJ7+GNqEaw== 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=X1NUUSKzJQ3aKKvQsMME/UF2lD9FFtxKdOBKPCKZLgY=; b=llNQma5QB5SoPw/yKkABYsI4Ti5yECjqiIIT5VBu6muJlh2o7L9wKnw6lhBXDUJgIAw8HeZUrGeaI/Dd5TwQoSux1ndealgS9NpEMvaXzoMZY1jaZhYxtQdT77M/v3pL97nH46hVIffBcECmvISdz/NQBWNhEoc0z1l1MpjstgrrXRUeignOVsLBP/Se41C9ZlA/EQrkNtO5HMDuBTFTLOWLunKzL0k87dmWmSBskTEii4LfNjFKnHwnHu5neOXPQvTEAg0ezLWaQscbakIHYy1xNBXEEyIvyIFdg9ROB8knYxbq+AD3jnCxIYc/Wci9uYM+piqsLVZv45qX0lsiTA== 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=X1NUUSKzJQ3aKKvQsMME/UF2lD9FFtxKdOBKPCKZLgY=; b=lBXkquXyGpURXbCAW9oLHM5IjTmwsEa93dpQSxfwIEMpORDiB/LlqO/lz/17dgjggWQkMbWbd53K166NnKndVKUJJXc7ma8HUzKURkp7cFZaMHYZL1L7uqyNVNNcVLGcF6B/R5J/lAS0zZTrEKn9ns3vamTH3/QNsPkhHgUuFWjE3GIUAJ/eGKu8MrvZM5Xv0WSFwKTEw7AmEY3+5GgdoD3rOZrbrByOBEXMWBeY4bn4wzCb4yORQ+7OBAHDRKap5g5eRWKl9IajgPAiQ7GQj72phmeGE5ZlTjMLlz8VScZAWDj7RQBtelXgqQba/yLP3DvDap3MG8QB0G0FNDUZBg== Received: from SJ0PR03CA0213.namprd03.prod.outlook.com (2603:10b6:a03:39f::8) by CY5PR12MB6129.namprd12.prod.outlook.com (2603:10b6:930:27::8) 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:59 +0000 Received: from SJ1PEPF00002325.namprd03.prod.outlook.com (2603:10b6:a03:39f:cafe::72) by SJ0PR03CA0213.outlook.office365.com (2603:10b6:a03:39f::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.14 via Frontend Transport; Tue, 18 Feb 2025 12:41:58 +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 SJ1PEPF00002325.mail.protection.outlook.com (10.167.242.88) 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:58 +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:54 -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:52 -0800 From: Xueming Li To: Aleksandr Loktionov CC: , Anatoly Burakov , "Bruce Richardson" , dpdk stable Subject: patch 'net/e1000/base: fix MAC address hash bit shift' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:56 +0800 Message-ID: <20250218123523.36836-62-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: SJ1PEPF00002325:EE_|CY5PR12MB6129:EE_ X-MS-Office365-Filtering-Correlation-Id: 21e4adda-ab02-468d-317a-08dd5019a2a9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|82310400026|376014|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?zAPbXCxijLdA3jzKQeVFytQKOEWnStEUqT+abslxhrB/HXjlgrWHbVCsiqma?= =?us-ascii?Q?dixbBZ3lSd8jmJhxJRUAbfG8fG2rQ/374OsgmQfSxFwQfvE/s0PhMR5H6Rbw?= =?us-ascii?Q?OVrByiQJoija8EUK3h2Zs6LmuqclTv/TQJqPjmgSaRKny0dgbD1W7Nn0/ZUI?= =?us-ascii?Q?y+Yvrovnv7GfFnBLI63Xbx0qVnkif47z3Pka99JYPqgda6Lo5zSpDrzXo6xm?= =?us-ascii?Q?7yKo+o0U3/KHo+FFIRRcfBux29e+7vWLCJmVuoU2bdB7/pWwgIzDZGBVXDA2?= =?us-ascii?Q?92GXx2UHRRKroqu8+VtQiBMKibEveOIptLHlP/qyee7aWJJ1GvOUVfEV8y2+?= =?us-ascii?Q?A0nOeTX2JeMCvviIiJGKTdoqSvc/HiJI4gZHdEAlj5ogFeJ6piTqnPdGbARP?= =?us-ascii?Q?ByEaoyWpaObo7J3X1TiG5P8b0cKkkmft9Q/pknJ7Q1LL9naExUOA0D32jExi?= =?us-ascii?Q?Jr/AfNvctTQoUVFPBMtyx9kYho2HMRyoqN2GO55xjAjH1f1GKJzD52DHgTqf?= =?us-ascii?Q?yB31Mmxb0GgljTV4oFXXH8hKMrwT6RB5kbTGz5BihYl1vUiJz0jSZ8o8JR1Z?= =?us-ascii?Q?obdif0hK6xde7kaXM8O4ErYSS37vH1cqEyhGipOuzX6haKGC0pyDm6d1AUSr?= =?us-ascii?Q?IsC65xWJejlQwy+vLYWPkVxZl8PjB3L5NgEZctqdHrGPNhfi9uDzlBP+gQ9a?= =?us-ascii?Q?Aqd6/ZVxgF+c79IlEtOTU4qa2zZ6oQ/wIVUQsXbHI5uGmDPYTfOniY8g1/aq?= =?us-ascii?Q?p7GV2qgFuf9mk1+TlFGRW68KHoxScYpaE4ei0dM5r9EhHPs6OkZAlpzifAue?= =?us-ascii?Q?m85lUFVapvzoqOLErRuOcJd34O92HIZWX4LgcU067dnVHsRsl7FG937zrypM?= =?us-ascii?Q?2ZTSFSvwcg4r0gDSxcLhyIY/kNDOI9/G3ReyOHYxIk8YMMBPgNxPj5ey12+a?= =?us-ascii?Q?t3kBozy1QNx24qbMadcHgsUg62wI9vPLThlXNprnYPIQdGYuy8z3T8N/ST7V?= =?us-ascii?Q?SdvN8rZM9cc59K74ovPn2vrRKU57vAmHVbjmP+weX/hlu9NiUb8+Y4gesoDR?= =?us-ascii?Q?9j4nRqrEbavGVevBDEWjUVKU7Urt0qa+J+IBzxEx8r8zmBELC3mPoAkYwEl5?= =?us-ascii?Q?/MY9g4aJUf9hLLNu0ibvjeZSHeyig7jggVIreNShALpQ6AmBt/5Aj8UVDmeS?= =?us-ascii?Q?YC3P7H3TcNvlYGVIV49jOhOYEkzWaKHM5Wr1RNHxcbrVqK1oc5X+Qe9sihzz?= =?us-ascii?Q?T/B4RcxXtcEQOAvXeaKi8XNf/lCIGmvTorgJ5LFY68ZNwJVv97ZH8FCoFSUU?= =?us-ascii?Q?5zrD/WFFZLoJ69sTEcA1Zbxj1VuTOhYsGkyCcmtRy8lqw/Z9WKaQZDjGisYs?= =?us-ascii?Q?9f0CPUPtSDd0EfKHBq4P7c5goH5sNnJmNzLQIeCjB0Kc5nBNteIdIVjkxkli?= =?us-ascii?Q?zDfdqED03sVniSYN7cThc4u8g3+vlJe6UvP/TfdNHeHX9lFdIlddTPsDPQGl?= =?us-ascii?Q?VT2xtbKxcyyqRFA=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)(1800799024)(36860700013)(82310400026)(376014)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:41:58.9567 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 21e4adda-ab02-468d-317a-08dd5019a2a9 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: SJ1PEPF00002325.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6129 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=5b1825dc24c291cd19f94bcb92c7947c5cc11e54 Thanks. Xueming Li --- >From 5b1825dc24c291cd19f94bcb92c7947c5cc11e54 Mon Sep 17 00:00:00 2001 From: Aleksandr Loktionov Date: Thu, 6 Feb 2025 16:08:40 +0000 Subject: [PATCH] net/e1000/base: fix MAC address hash bit shift Cc: Xueming Li [ upstream commit 1749e662f68ba6571ed81cd264cffd1107abc307 ] 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: af75078fece3 ("first public release") Signed-off-by: Aleksandr Loktionov Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/e1000/base/e1000_mac.c | 4 ++-- drivers/net/e1000/base/e1000_vf.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/e1000/base/e1000_mac.c b/drivers/net/e1000/base/e1000_mac.c index cf0a9f21e1..2b8482e114 100644 --- a/drivers/net/e1000/base/e1000_mac.c +++ b/drivers/net/e1000/base/e1000_mac.c @@ -488,7 +488,7 @@ int e1000_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index) u32 e1000_hash_mc_addr_generic(struct e1000_hw *hw, u8 *mc_addr) { u32 hash_value, hash_mask; - u8 bit_shift = 0; + u8 bit_shift = 1; DEBUGFUNC("e1000_hash_mc_addr_generic"); @@ -498,7 +498,7 @@ u32 e1000_hash_mc_addr_generic(struct e1000_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 diff --git a/drivers/net/e1000/base/e1000_vf.c b/drivers/net/e1000/base/e1000_vf.c index 44ebe07ee4..3d0383fcbb 100644 --- a/drivers/net/e1000/base/e1000_vf.c +++ b/drivers/net/e1000/base/e1000_vf.c @@ -331,7 +331,7 @@ STATIC int e1000_rar_set_vf(struct e1000_hw *hw, u8 *addr, STATIC u32 e1000_hash_mc_addr_vf(struct e1000_hw *hw, u8 *mc_addr) { u32 hash_value, hash_mask; - u8 bit_shift = 0; + u8 bit_shift = 1; DEBUGFUNC("e1000_hash_mc_addr_generic"); @@ -342,7 +342,7 @@ STATIC u32 e1000_hash_mc_addr_vf(struct e1000_hw *hw, u8 *mc_addr) * The 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++; hash_value = hash_mask & (((mc_addr[4] >> (8 - bit_shift)) | -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:02.870345661 +0800 +++ 0061-net-e1000-base-fix-MAC-address-hash-bit-shift.patch 2025-02-18 19:39:00.668244041 +0800 @@ -1 +1 @@ -From 1749e662f68ba6571ed81cd264cffd1107abc307 Mon Sep 17 00:00:00 2001 +From 5b1825dc24c291cd19f94bcb92c7947c5cc11e54 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 1749e662f68ba6571ed81cd264cffd1107abc307 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -21,2 +23,2 @@ - drivers/net/intel/e1000/base/e1000_mac.c | 4 ++-- - drivers/net/intel/e1000/base/e1000_vf.c | 4 ++-- + drivers/net/e1000/base/e1000_mac.c | 4 ++-- + drivers/net/e1000/base/e1000_vf.c | 4 ++-- @@ -25 +27 @@ -diff --git a/drivers/net/intel/e1000/base/e1000_mac.c b/drivers/net/intel/e1000/base/e1000_mac.c +diff --git a/drivers/net/e1000/base/e1000_mac.c b/drivers/net/e1000/base/e1000_mac.c @@ -27,2 +29,2 @@ ---- a/drivers/net/intel/e1000/base/e1000_mac.c -+++ b/drivers/net/intel/e1000/base/e1000_mac.c +--- a/drivers/net/e1000/base/e1000_mac.c ++++ b/drivers/net/e1000/base/e1000_mac.c @@ -47 +49 @@ -diff --git a/drivers/net/intel/e1000/base/e1000_vf.c b/drivers/net/intel/e1000/base/e1000_vf.c +diff --git a/drivers/net/e1000/base/e1000_vf.c b/drivers/net/e1000/base/e1000_vf.c @@ -49,2 +51,2 @@ ---- a/drivers/net/intel/e1000/base/e1000_vf.c -+++ b/drivers/net/intel/e1000/base/e1000_vf.c +--- a/drivers/net/e1000/base/e1000_vf.c ++++ b/drivers/net/e1000/base/e1000_vf.c