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 7E6C746211 for ; Thu, 13 Feb 2025 11:03:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7B0E642F3B; Thu, 13 Feb 2025 11:03:24 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 405DC42F3B for ; Thu, 13 Feb 2025 11:03:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739441002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=r4wBBIuvsTl2Wz5S9Rid3jo+qupf5kj3Xl89yMBYBfk=; b=QP7vifRn3jpUZn1e4hgPPsWJKqpegUv0gA0AgdeZxiXkYk7temIsw/bDIIoNUOVxey5wg5 OvwLkmcjqW/2VCfWzvEgF0BWHYquDfuckPZGS/m7iLxG775WQqAcgCVGFjfwlnEqQv93ds A0myeZjv/mmcsJYVLPXXXoy8d8aT8Go= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-612-C7LOjL8dONS_tlRBzLQK5g-1; Thu, 13 Feb 2025 05:03:19 -0500 X-MC-Unique: C7LOjL8dONS_tlRBzLQK5g-1 X-Mimecast-MFC-AGG-ID: C7LOjL8dONS_tlRBzLQK5g Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 707C919560B5; Thu, 13 Feb 2025 10:03:18 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9AFBC1800267; Thu, 13 Feb 2025 10:03:16 +0000 (UTC) From: Kevin Traynor 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 24.11.2 Date: Thu, 13 Feb 2025 09:58:59 +0000 Message-ID: <20250213095933.362078-92-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: j-xxR8D7Hts6gxRqHOd5ExCVStAWoqWbRS7gdp4USVo_1739440998 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.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 02/17/25. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/599c0373d9175635be4e8d3ae69565fcce6026b4 Thanks. Kevin --- >From 599c0373d9175635be4e8d3ae69565fcce6026b4 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 [ 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 @@ -489,5 +489,5 @@ 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"); @@ -499,5 +499,5 @@ u32 e1000_hash_mc_addr_generic(struct e1000_hw *hw, u8 *mc_addr) * 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++; 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 @@ -332,5 +332,5 @@ 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"); @@ -343,5 +343,5 @@ STATIC u32 e1000_hash_mc_addr_vf(struct e1000_hw *hw, u8 *mc_addr) * 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++; -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:44.413336187 +0000 +++ 0092-net-e1000-base-fix-MAC-address-hash-bit-shift.patch 2025-02-12 17:29:34.563947201 +0000 @@ -1 +1 @@ -From 1749e662f68ba6571ed81cd264cffd1107abc307 Mon Sep 17 00:00:00 2001 +From 599c0373d9175635be4e8d3ae69565fcce6026b4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1749e662f68ba6571ed81cd264cffd1107abc307 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -21,2 +22,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 +26 @@ -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 +28,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 @@ -43 +44 @@ -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 @@ -45,2 +46,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