From nobody Thu Oct 29 06:46:15 2026 X-Original-To: dev-commits-src-branches@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 4jFZWX21jNz6xvj8 for ; Thu, 29 Oct 2026 06:46:16 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFZWX1MRwz3Qnt for ; Thu, 29 Oct 2026 06:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793256376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6PBXkpETKUuhPYfSZSQpZhUf/ch+d3QfpJ9E3M3WZzY=; b=M00MVX85QJEebrt4rRRgFRcF/YT9IvMlnTeLxLtdSExpCobF4/31GIoEN8B+N4JaxFDTlr AiANiQno+NhEVuaJPzejLS3dKczO/3r8vh48WKT0Pf3mZUbkAts0LFcI9y1CCwkIpO9wtK dRJ4hhMDfsXg/vyp837fajtK/Scxy1SMhtR1cuPVMMKbWAQ3mDQJ+GhhX3jAoJq1tQtR1S sFhT3YbgggcGE6czW4D5ZVqy2ztNEZV/XIvFJce9RWlrNKK7dzkQuecz7KqC/jGbGrNFTo wtL/Y/9RSgDV/XcZE3SU6HCjwcBDZKp2ggcizySg0V6CGKsTj9RCZ8ohI5b3mw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793256376; b=pvmeEa3E8SzHy8MI21V1Cn73BOP5glnj51MHfLbmJq4vNdPUiUlxDqQqh8HQTFJaWvRlJY k3HTaXIJWjRVpzB12O1wi44z+eIg71x8WKitCF5LiYeXwzvslkx2ifX6HTY3w130nL8o/w 5aVv/2Y0yIhRotHqLmpekm2JNw+lb4EpTTb4S0OvL8TBhwJSKKJg5vQMh0mhrv7gaps6FO O4QzxmGWY9G7eubh8ug3CoLDNGrDBiCIbE3eB3yUIS6PKvjflPvKargvQxEw9QhG2w84Mw ywjTs7IAWoRAMaC/ticTKZJNDmNB/CTyoY9sn42ebNsgaIjOFea3zznJ1mTQ8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793256376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6PBXkpETKUuhPYfSZSQpZhUf/ch+d3QfpJ9E3M3WZzY=; b=Tqs8xxuVmUKDCzbd1b/2mUmzp9nBBJl2ikv/8LJ3GVPtTT/Whe82Gi++CLmiX9BZv95Rs8 DVxImsd90qfdszKJiuPaSc8Vk6WmzkELDCUcqzgYQE4kC+JyP7H3ypmQo5fvxOri9pYUiU ib+rHlZj+Kv+fKEjFSS2f5+0UM9rzVOGQIG0aox+GrK74SA5vTyUgKHCqkWkGnjPvV7PCa HtS5HQr8yiSUUaexyP1RKLCSfvPf5dhCS7hTZHBrH0V6o/V4p72WNBa802Gd8HLd1QyOxi YiUM4RY3H6IZDaOJxr6ngxRuVXKsrVJ6TeUyxidQVZHgCYUsHIkq/Y9Jzc7z0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jFZWX0T7wzSB2 for ; Thu, 29 Oct 2026 06:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f480 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:46:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 2174d5db8d5a - stable/15 - e1000: Use the common RSS key for 82574 List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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: 2174d5db8d5aeef61d13020859373c10c15a2cd2 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:46:15 +0000 Message-Id: <6ae2ebb7.3f480.2a3eebe7@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=2174d5db8d5aeef61d13020859373c10c15a2cd2 commit 2174d5db8d5aeef61d13020859373c10c15a2cd2 Author: Kevin Bowling AuthorDate: 2026-09-18 08:29:16 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 06:46:06 +0000 e1000: Use the common RSS key for 82574 Use rss_getkey() in the older em multi-queue RSS path, which is reached by 82574 with two receive queues. This replaces a private key generated on each initialization and matches the common-key policy already used by the igb path. Decode each register word with le32dec() and remove the private assembly macro, avoiding signed integer shifts while preserving the register byte order. Leave the redirection table and hash fields unchanged. This does not change single-queue em devices or PF-owned igb VF RSS settings. Reviewed by: erj, gallatin Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D59792 (cherry picked from commit a666f1564501734d3d7ec05ab516e40309e81454) --- sys/dev/e1000/if_em.c | 6 ++++-- sys/dev/e1000/if_em.h | 5 ----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 8d17116129d6..bfcb8d808344 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -4688,11 +4688,13 @@ em_initialize_rss_mapping(struct e1000_softc *sc) /* * Configure RSS key */ - arc4rand(rss_key, sizeof(rss_key), 0); + _Static_assert(sizeof(rss_key) == RSS_KEYSIZE, + "RSS key size mismatch"); + rss_getkey(rss_key); for (i = 0; i < RSSKEYLEN; ++i) { uint32_t rssrk = 0; - rssrk = EM_RSSRK_VAL(rss_key, i); + rssrk = le32dec(rss_key + i * sizeof(rssrk)); E1000_WRITE_REG(hw,E1000_RSSRK(i), rssrk); } diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h index 2971872fb600..7c6354c04c74 100644 --- a/sys/dev/e1000/if_em.h +++ b/sys/dev/e1000/if_em.h @@ -693,9 +693,4 @@ typedef struct _em_vendor_info_t { void em_dump_rs(struct e1000_softc *); -#define EM_RSSRK_SIZE 4 -#define EM_RSSRK_VAL(key, i) (key[(i) * EM_RSSRK_SIZE] | \ - key[(i) * EM_RSSRK_SIZE + 1] << 8 | \ - key[(i) * EM_RSSRK_SIZE + 2] << 16 | \ - key[(i) * EM_RSSRK_SIZE + 3] << 24) #endif /* _EM_H_DEFINED_ */