From nobody Tue Aug 25 00:31:33 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hTTHB051kz6pMbq for ; Tue, 25 Aug 2026 00:31:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hTTH95RLcz49M7 for ; Tue, 25 Aug 2026 00:31:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787617893; 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; bh=pHFBL4IwcT6K7tL7NA1YqXDm9Cmx7wIjQFf+5ppBnqA=; b=hMrREJQ6ZCbRPDmKanU9Z7+qot58BDV1r/S4qtHGynhF+sQjM5gmXO4W7uXjoWmDlHlMOJ tIaSi2x4hjIaQcwh8zhhm/b2mQaukyQTn+5x+sj5UFB2cr8zZHUfw2m1jcdg6o923BwJ0e bQuGe3mPB0vCl+/60B0Ia7yUk/cnxRy2s3s6KRHcLRTWjE9+8gBGFvI8WduI8cZiY/yUcN 0UHA9RoXOQ8iHoW5W/osjG0a9WD3A5c5kKOedPDoQXbkd44mozLR3zJ4yXzbTgK9fOqqli hlAdWInnHuiXNhaS5X/BVAZv8h8vUjYMzSLntocsb4UBzy0kmviBgjPrC2seRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787617893; a=rsa-sha256; cv=none; b=fxdUQ7+AFQRWe/7zJD/mseMAlKOIwILBzA/6aUK/ry7MzsKzXH9WkCw0H2imkwRXF7M6Ng LelE32dwCPhNo7Eu+aoGmNlP8CQvjbVcZlJ5h4BNjuAGtx445Bg9q2HSaxxVtfDblyyTkN MJTDPGIiXJq2BQ0JUZ+aSraKdq5CkD6/nx3jVj7EWiwrN7OngH7fHX5WxL+b0HwutvXHEa ezDZ2MmHrLvhI0TLALTPNj4mhlYx5XSsm6WYpiPL07ALAqsuWxH5AOP5oczV2/YEOULejU VnfGxMsZDM8aYzSDSuEskGqsvr/N8EX+LwqtzALgYiFrfRzirFX1mhy5yplMUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787617893; 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; bh=pHFBL4IwcT6K7tL7NA1YqXDm9Cmx7wIjQFf+5ppBnqA=; b=Y7ZhLHEH2jZ+GLPATDLyD6gsxTL/wbydyD1w+iaCy1TRfTTE2MUEILYk8aVq6uw+IZY+O1 WyUtpg94f9KUB96U4EtpvbqwMND4+96f4Jn8a8QIaczaGxigE0PTQyJIhhBu2oCjtypQDL p1zDpII3080UwVtDNdJZ+fuAVU+HQQn4LvAvt1eaaeY3HJB2HE/Kf8AxZCdw3RVC71e5zP MDAX82iSmJXgRTyQVJ+KeBz7Kuc1R8/EbTMWBQXDgYzUu2ytPL4v0CV1X4d+tZJJkfGQBl q1ubJgdB2hbO+0JWpXo/xKYemxrQqVcxw0DeJYnVDP6GMQVheRwf++gGWSDcVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTTH9427vzC01 for ; Tue, 25 Aug 2026 00:31:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f938 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 00:31:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Aleksandr Loktionov From: Kevin Bowling Subject: git: 6b1f636ccceb - stable/15 - e1000: fix MAC address hash bit shift List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6b1f636ccceb262439f65157d18b87bcd16c7800 Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 00:31:33 +0000 Message-Id: <6a8ce265.3f938.6ffbb356@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=6b1f636ccceb262439f65157d18b87bcd16c7800 commit 6b1f636ccceb262439f65157d18b87bcd16c7800 Author: Aleksandr Loktionov AuthorDate: 2025-02-06 16:08:40 +0000 Commit: Kevin Bowling CommitDate: 2026-08-25 00:27:04 +0000 e1000: fix MAC address hash bit shift DPDK commit message net/e1000/base: fix MAC address hash bit shift 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") Cc: stable@dpdk.org Signed-off-by: Aleksandr Loktionov Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson Obtained from: DPDK (1749e662f6) (cherry picked from commit e7ffea395ee8add21b2cce0806285131e12cc454) --- sys/dev/e1000/e1000_mac.c | 4 ++-- sys/dev/e1000/e1000_vf.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/e1000/e1000_mac.c b/sys/dev/e1000/e1000_mac.c index 23cc89f92c6e..a34e2c873a0e 100644 --- a/sys/dev/e1000/e1000_mac.c +++ b/sys/dev/e1000/e1000_mac.c @@ -523,7 +523,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"); @@ -533,7 +533,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 (bit_shift < 4 && hash_mask >> bit_shift != 0xFF) bit_shift++; /* The portion of the address that is used for the hash table diff --git a/sys/dev/e1000/e1000_vf.c b/sys/dev/e1000/e1000_vf.c index 9bcd2798e486..89ce0181faef 100644 --- a/sys/dev/e1000/e1000_vf.c +++ b/sys/dev/e1000/e1000_vf.c @@ -357,7 +357,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"); @@ -368,7 +368,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 (bit_shift < 4 && hash_mask >> bit_shift != 0xFF) bit_shift++; hash_value = hash_mask & (((mc_addr[4] >> (8 - bit_shift)) |