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 7FBE846211 for ; Thu, 13 Feb 2025 11:03:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7B5F142F2D; Thu, 13 Feb 2025 11:03:10 +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 788E942EE7 for ; Thu, 13 Feb 2025 11:03:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440988; 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=CiirKskIAjg3302+euVJgA83PE7l6brjXuXOIieQc+I=; b=RlG/hDNLk9OlKH74y2yTUxcuQixV2zS9mQEAQloEFfprm6eEbexgY92uB5cunaKZWTWLIk LHKYm8tPuKnVpIcUynlPJd+svPnDGH4mbGVboTjrq75pxaAowLudP8xI+WDJooWRc/OTH7 e2Th35X+gPtG7naZyqjmSL0SXE4DklE= 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-130-wwiPf6IbPsWtBZ6kFc_VkQ-1; Thu, 13 Feb 2025 05:03:04 -0500 X-MC-Unique: wwiPf6IbPsWtBZ6kFc_VkQ-1 X-Mimecast-MFC-AGG-ID: wwiPf6IbPsWtBZ6kFc_VkQ_1739440983 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 AA6BD190F9E5; Thu, 13 Feb 2025 10:03:03 +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 B69271800359; Thu, 13 Feb 2025 10:03:01 +0000 (UTC) From: Kevin Traynor 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 24.11.2 Date: Thu, 13 Feb 2025 09:58:53 +0000 Message-ID: <20250213095933.362078-86-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: -aYhQPUn11yWirul0JSsswq5HNoGqCECo6v-El91qDM_1739440983 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/4e2a4f3e7c6ae7510829ce54884d98e3c3c0cbe1 Thanks. Kevin --- >From 4e2a4f3e7c6ae7510829ce54884d98e3c3c0cbe1 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 [ 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 @@ -487,5 +487,5 @@ 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"); @@ -497,5 +497,5 @@ u32 igc_hash_mc_addr_generic(struct igc_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:43.792290417 +0000 +++ 0086-net-igc-base-fix-MAC-address-hash-bit-shift.patch 2025-02-12 17:29:34.538947051 +0000 @@ -1 +1 @@ -From bccccacfb6f6f2e84a24c6733c7e3d4af05f73b5 Mon Sep 17 00:00:00 2001 +From 4e2a4f3e7c6ae7510829ce54884d98e3c3c0cbe1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bccccacfb6f6f2e84a24c6733c7e3d4af05f73b5 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ - drivers/net/intel/igc/base/igc_mac.c | 4 ++-- + drivers/net/igc/base/igc_mac.c | 4 ++-- @@ -24 +25 @@ -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 +27,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