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 08CC04625C for ; Tue, 18 Feb 2025 13:42:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 02648402A0; Tue, 18 Feb 2025 13:42:08 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2086.outbound.protection.outlook.com [40.107.212.86]) by mails.dpdk.org (Postfix) with ESMTP id 461F4402A0 for ; Tue, 18 Feb 2025 13:42:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=zHRzbSEARvGB6d7HBExWF1eC5C+hR9RNA9NcasmJxgGJNwyl2adfoc660sS+JCiTVCj3aHCwybZ5ztiLtSY4P14K1pTetzDORx1Gk/72KZCsQGWdfDbrRFpGJBwLuzu8a+uXJYI+iXH8Zu823nAMlE2yEFfmOOiXCMieoM1eu1uqgOi1gjai1L7QXUQP/Zu49tUoihc+n6Q8D3IvfJidnddMf4ID1uLtBkO4Z4j66gtjQfaQsRaFy0A+AAK1hNM1gjcA3sfIbAyCfVEjvV5fdR3g+1kvXCF827Pm02z34L214mV4mWnz+jVbok6jo3jSksGBR0TUsXqw7wPIlbdD+g== 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=8TFUK1emDYRlmEFbSH4xR1pClfhXGh/SNEzTNNfak0o=; b=PPxoexSzqfOco+ZQ+DZ30m6ZuGb6tnz0NG0DaSf4HMBIX4Ve2n6tgo/nAwRnZKFT4P0rTFbEZjvGDSI9myJkdaVALNSUrm1IWU2V+RoB4/whE7/lHtdQU2shi0n/Bd5VYBpMkjAExrIkVzgegT6Nd7M6vkptJSCC9SbW9MHocjQpdQmXKwpXpFnYsQJOhoF4mzGkoUlQJ2FvBKRjdDdgi6s+rWeSO/tG/ELfLFEvjmxFap2GuqqhnWMI9rBf/XEX3dQpZQssRFBjLC2CT1iB8trN+XnijbmOau0yucF6T1G4E7shPAWyFglUy5P3b/B62o1aI1XI8PHGuBnMP4Frjg== 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=8TFUK1emDYRlmEFbSH4xR1pClfhXGh/SNEzTNNfak0o=; b=hlJgyujxTTF0tVpIm+DX1lIOyhdYaCJooIfQLCRfjsIldmyhNzich/8ZuRAQTrovqK0lw0gF22SrKjetU5A8ZyI5xt+Tl5htMRca+4i1UKjh65Kg2aGPqft/ESYjjFp4K4PwqvwSnOcEMyZ9O8/JdhgqtLdk+zItkyUFF1vSQH2f7dFrsS4vKazAaJw5PK2dlAAF8lSX0i20dl1402SycbOTpuoEzcNf1IpgE3T4viQ6V5Yfdpn9YB+VmSo+EA05NARv5z5v4jS56UE+i64pxHGFMcaAY2Q5//jXqaFC64BFtUGeRSaQlgGDEKgHk2qt1AgeC082okPg8US5viU50g== Received: from SJ0PR03CA0221.namprd03.prod.outlook.com (2603:10b6:a03:39f::16) by DS0PR12MB6485.namprd12.prod.outlook.com (2603:10b6:8:c6::9) 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:42:01 +0000 Received: from SJ1PEPF00002325.namprd03.prod.outlook.com (2603:10b6:a03:39f:cafe::55) by SJ0PR03CA0221.outlook.office365.com (2603:10b6:a03:39f::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.20 via Frontend Transport; Tue, 18 Feb 2025 12:42:01 +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:42:01 +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:56 -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:54 -0800 From: Xueming Li To: Barbara Skobiej CC: , Anatoly Burakov , "Bruce Richardson" , dpdk stable Subject: patch 'net/e1000/base: fix data type in MAC hash' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:57 +0800 Message-ID: <20250218123523.36836-63-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_|DS0PR12MB6485:EE_ X-MS-Office365-Filtering-Correlation-Id: 013368c8-7d59-479f-e88c-08dd5019a3e3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|1800799024|376014|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?oCJl8vdsqqjTD1IybGoCn8KAfYjbmgqiO41nSwgGdKyxpGqe5aWunzwlOUQh?= =?us-ascii?Q?6qLTggLSUigqPW2309Zhg2ghilmuS5QQS9VUiSkU67iNNwQ/9Jy8Oe5eCnn+?= =?us-ascii?Q?Lur7pIVnRm6XsFEb+8/Vx/xAs59V4fm2PRd55Szqs3+mIFyJx2mTDWiGxqZR?= =?us-ascii?Q?WdHFHkq0p+/ib9KMD9KjmSGL7/NBrq0eIn9oFqrG9SZZ5w0aEHR/zPaSUcZ3?= =?us-ascii?Q?6vGBP/UitzRdOGtjPCsT0A4TkKe5u3V9Wrynr1bOk9sDRVbWXlf6UzBjmi95?= =?us-ascii?Q?/2yE8+PejUqWJEFH9r6ztqXp7dy0yPO6WNdcnLI49HvrV68bGZLMZNPpjdVo?= =?us-ascii?Q?YDwEsXKh7e/Uz6NyxWvjAeHumpzH69RpM3eKZL/PQ5s0fuIc2Rcwpn9sDj0L?= =?us-ascii?Q?4z+VM90TnAmZ4Ai0efiZqByTfbwbxfnuXVlVA6hGjge6Xu6HMHNdEuaQjZmA?= =?us-ascii?Q?Cx+jBXAVRa9oZhXBn7n9RMTUpw0tTqRQ1vZf+q4kDf1ZiRJLHVwrzbWqKyT6?= =?us-ascii?Q?Te+6+/8DGx3W8ttfuRR8BLVEqKI4BhTZyXp4kB83ksQ6lNGwfa4Eoxt8YLmn?= =?us-ascii?Q?jmbDGaLfgwo9GwFWR1l++X76vFY+e52MUY7MpbBdmpuammZ7AVSSTx/ys40w?= =?us-ascii?Q?5rvnYDh5nf1CW9gtxajpiqRpG6+2etu/NyWogWaSE9Le7mMQ5GQs0wSuTEe2?= =?us-ascii?Q?LqkF0tnvKTkqQ+gMGul/zmqWgnYnHMcufl8htowz8kLcn9qAhxyRr365aNB/?= =?us-ascii?Q?3bSiNos6g/c+Ar4zgeCbjYlCfOHuROFiG7DT+T/hY9ORQeojI812Bv08IQtk?= =?us-ascii?Q?dwUDWe/5Fnr+bxhopi25jvMmaBA/aI2x2mBYBcKHt00Osf0u2fOsiGOfa29J?= =?us-ascii?Q?Nw+mkw01dOQOeGRNCSM/s6TJEn1oWldxIW0jMY9ZoN0MqEnHDNODvtEyhiJX?= =?us-ascii?Q?0Hl8O+A+uCh0UQnIuh3l3VlIaX0MRo2hpmPvrIBqOGeKOVLw5gbpbA+rEDu6?= =?us-ascii?Q?F/ofwIJKhSpHMNKbt+Q8q1Up1Mc9jrwY+2o1xltgtwj23zU3E+I1yoJvJAeu?= =?us-ascii?Q?z+Zbo4gT9WvfnBeQcbmHfIiNe2yA1Yg3y+DtBlofwdnNMihXyuu1u7Guu9EN?= =?us-ascii?Q?GunRISdjECCFAEvL6B+LyepKMuDT/Wu6zcvCFdZK4KTAiLb8xL63N9pUPMf8?= =?us-ascii?Q?XGf3spKu9XCBVA1I+XlIGEsidtUupXm9vovjIC8BlGIpsxH29aESrf0q6U6j?= =?us-ascii?Q?bM7tgye59xE9v2oQXDgID8xH94jftInJ34rQ6B45Nsmv+u3GCCP0B8tp4H1w?= =?us-ascii?Q?O4i0tSNokWHM3TbGMyMSEgvYQOnvn+v4gZzELY572Wki2GpGUOpQRnROpkQR?= =?us-ascii?Q?ch/QsEUYQatsFDXiEBxQKRuJUb6A5btpF1eijYn3a3jtmegKsxmV4pcQNMRT?= =?us-ascii?Q?6YOSV6kJBR5CL4DkIwmL1JuZj20mQlSv6GEGzFAERiV/sIwA0XtePbvppFkZ?= =?us-ascii?Q?NW8a5m0oWsdffL4=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)(82310400026)(36860700013)(1800799024)(376014)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:42:01.0192 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 013368c8-7d59-479f-e88c-08dd5019a3e3 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: DS0PR12MB6485 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=aa5d1f8824a72dfc6217232c7f372d9c8c985893 Thanks. Xueming Li --- >From aa5d1f8824a72dfc6217232c7f372d9c8c985893 Mon Sep 17 00:00:00 2001 From: Barbara Skobiej Date: Thu, 6 Feb 2025 16:08:41 +0000 Subject: [PATCH] net/e1000/base: fix data type in MAC hash Cc: Xueming Li [ upstream commit 458734aaac3225d98aeee5f4c45b3d39a7d82949 ] One of the bit shifts in MAC hash calculation triggers a static analysis warning about a potential overflow. Fix the data type to avoid this. Fixes: af75078fece3 ("first public release") Signed-off-by: Barbara Skobiej Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/e1000/base/e1000_mac.c | 6 ++++-- drivers/net/e1000/base/e1000_vf.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/e1000/base/e1000_mac.c b/drivers/net/e1000/base/e1000_mac.c index 2b8482e114..5bb77d9e09 100644 --- a/drivers/net/e1000/base/e1000_mac.c +++ b/drivers/net/e1000/base/e1000_mac.c @@ -541,8 +541,10 @@ u32 e1000_hash_mc_addr_generic(struct e1000_hw *hw, u8 *mc_addr) break; } - hash_value = hash_mask & (((mc_addr[4] >> (8 - bit_shift)) | - (((u16) mc_addr[5]) << bit_shift))); + hash_value = (u32)mc_addr[4]; + hash_value = hash_value >> (8 - bit_shift); + hash_value |= (((u32)mc_addr[5]) << bit_shift); + hash_value &= hash_mask; return hash_value; } diff --git a/drivers/net/e1000/base/e1000_vf.c b/drivers/net/e1000/base/e1000_vf.c index 3d0383fcbb..fc30357c17 100644 --- a/drivers/net/e1000/base/e1000_vf.c +++ b/drivers/net/e1000/base/e1000_vf.c @@ -345,8 +345,10 @@ STATIC u32 e1000_hash_mc_addr_vf(struct e1000_hw *hw, u8 *mc_addr) while (hash_mask >> bit_shift != 0xFF && bit_shift < 4) bit_shift++; - hash_value = hash_mask & (((mc_addr[4] >> (8 - bit_shift)) | - (((u16) mc_addr[5]) << bit_shift))); + hash_value = (u32)mc_addr[4]; + hash_value = hash_value >> (8 - bit_shift); + hash_value |= (((u32)mc_addr[5]) << bit_shift); + hash_value &= hash_mask; return hash_value; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:02.901986456 +0800 +++ 0062-net-e1000-base-fix-data-type-in-MAC-hash.patch 2025-02-18 19:39:00.668244041 +0800 @@ -1 +1 @@ -From 458734aaac3225d98aeee5f4c45b3d39a7d82949 Mon Sep 17 00:00:00 2001 +From aa5d1f8824a72dfc6217232c7f372d9c8c985893 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 458734aaac3225d98aeee5f4c45b3d39a7d82949 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -16,2 +18,2 @@ - drivers/net/intel/e1000/base/e1000_mac.c | 6 ++++-- - drivers/net/intel/e1000/base/e1000_vf.c | 6 ++++-- + drivers/net/e1000/base/e1000_mac.c | 6 ++++-- + drivers/net/e1000/base/e1000_vf.c | 6 ++++-- @@ -20 +22 @@ -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 @@ -22,2 +24,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 @@ -37 +39 @@ -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 @@ -39,2 +41,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