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 543F84624E for ; Mon, 17 Feb 2025 18:07:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4FC95402BB; Mon, 17 Feb 2025 18:07:36 +0100 (CET) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id 6182D402E4 for ; Mon, 17 Feb 2025 18:07:34 +0100 (CET) Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-38f406e9f80so1239658f8f.2 for ; Mon, 17 Feb 2025 09:07:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812054; x=1740416854; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6+XU1RT8cp/Eaw15HFBWJBhXe7v3+YCH8eZwrKnvl0k=; b=HFLPu/zKb7+c0gGn7sWnOeiNJUJoNPGAkQaUnhsgRpdwBc0QMgqGs9iEWQpdTGF2Yj fhdatoNj2VTdgDYSt/NOWWZjsA/rUtNYfJHbE6Y9vqiGpT0kzaTdsQa9J96Y3asBue+s 5pLhkL414MvxCJ5wCXlc6TrqNTIUZ/E/yOBJBVE5i/63zJYYIc8g/dkpfgxeTQoXwL3Q NAfvwdvobcG/oauhsVeCF0oDgWlhZ3xLHKdBcWUg46eX+56u8FtlxY7irNiEzocyF+ms lDcK9Ctm34tkap4P3KRATImtdsbiB3aND/JKQIGmSwbKf6k45hVQdWkkLi+ofzjfkDyb DtTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812054; x=1740416854; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6+XU1RT8cp/Eaw15HFBWJBhXe7v3+YCH8eZwrKnvl0k=; b=TQmI7basV+nb/IEfS24bKnykqQEcQ9bzFU+zC1zAfcrX9oynw4R0H1wnV0Vbsw9Zu3 7eMLYU1V32Pi6jc0dWlse7rJO0KhHxzWBez3d9VfSb6qNl/gj2HN6Qd4hNWLk+qcvvHd whRMCEt3h/pKf23f9qllkyGv44W9TU6VQiwk57RNuEBQzwLnDS0GvozvFIf3Rn7Vg//R RFvxGl/4DL1U8yzy+q/Vv23kKuXOh/ko4iqAeKkXhWQmKRjsJPAnXApjY4sb/ZIAlKEA WeN2CLOUkaGpiZlMqg5EjIK1aBply+t2FNm3jfVzeIuKaPxM7x1dzkvXnrywF3j1Ovk/ /HsQ== X-Forwarded-Encrypted: i=1; AJvYcCVLnxWQALbJ/xAUvNNiQWuw0k7DQqvMI7sGt2CSS/UGlNKiwwOZ/l7T2c/NJ/zDeojgdjoCXso=@dpdk.org X-Gm-Message-State: AOJu0YwHGvA2OyAtrC1aro1NfcfYcQvUt4hQs7zpWMXvSd8oFpt7Al6J FMAMBZdExlXe717cCVoPEgj/3PE+6+xfZLYBJ8WVHkzz0/hyyjqkolg0JJXQ3gmjKw== X-Gm-Gg: ASbGncsvzSKKD8eTcVziv+YCSc2G+bM3x9Bk6HKQ6P8eV5uBUjXYruXmjncOv50CQub yCwQYOu7Hj2VfI7wqE/dHTu002jK64uCmj4pH26/asBOQxV5xqLtf6BxwMSZLQ64vQ0hwICtPnk hJVvYaNXmYhJ8pjU7B+EofDSM12UjBRqQhsrxomZ0QRPdJtHva+keYgoMocc5XO+x9iKYHpEgGT YfZQ6JI77FTmjhD1WJdJnpAq1HhYxmlfmwuPDbL1l50wYXKRpoXSTEZk0HvNVM8Dr6zwW03Zkjp YXnH/XxV0lN8XO5fCv8kvw== X-Google-Smtp-Source: AGHT+IE/kJZ6CuoAnqE0c7tTG/NuuEa6Gza4J9z70n1iFzFC6b7O5filBnG+Dd7qZd0a1kXueLYiig== X-Received: by 2002:a5d:5f50:0:b0:385:f72a:a3b0 with SMTP id ffacd0b85a97d-38f33f510dfmr8637490f8f.55.1739812053840; Mon, 17 Feb 2025 09:07:33 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38f25914171sm12936351f8f.53.2025.02.17.09.07.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:07:33 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.8 Date: Mon, 17 Feb 2025 17:04:23 +0000 Message-ID: <20250217170456.1068278-50-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.8 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/19/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/00c8b88d3ccd0a4c0b73a78148b26758ddc5402c Thanks. Luca Boccassi --- >From 00c8b88d3ccd0a4c0b73a78148b26758ddc5402c 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 @@ -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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:18.626456735 +0000 +++ 0050-net-e1000-base-fix-MAC-address-hash-bit-shift.patch 2025-02-17 16:13:16.846441592 +0000 @@ -1 +1 @@ -From 1749e662f68ba6571ed81cd264cffd1107abc307 Mon Sep 17 00:00:00 2001 +From 00c8b88d3ccd0a4c0b73a78148b26758ddc5402c 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 @@ -47 +48 @@ -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 +50,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