From nobody Thu Oct 29 06:49:02 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 4jFZZk6QGPz6xvZH for ; Thu, 29 Oct 2026 06:49:02 +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 4jFZZk1xTFz4BJG for ; Thu, 29 Oct 2026 06:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793256542; 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=ly0Gncz3GWIeUPRLbQUTOVJQJfc5sbu20wt9tZeTQi0=; b=O1c74HLUfZ26Um/qjQmTjIuQPyA+MV6TByUoBYKoXI7X2M8XihI8lQH2+pW86rY/rAmtL1 VeOuUrhlGkMJhTrKbykTIRDvqC6owlKYBzydt9Fz2wemx6EsqhZlvnjGC9WyluPB4W1aU5 SLlLmPraLlc7OH8GMVkEQCquj2xA890vVQTe3iouhfiW/rB7BlueotC0ks8Umm/NJeTbYZ yzXauipFdrJV8NiEDOJB9i9jzO9O8E+MPrOXkkLPgwC+TRxu2E9WDI+dstEFPgTgnampxp 4cILOPCtXwywYD4RxKihckMUm+MHlFhGk81ztgmtCGVUgbBwMu3PfwVL1BM7Gg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793256542; b=P6jOZEXLtUPrX+nlGythCtnVgDnkOZf4/uDjpx3pRxqFu/XkIe8M/EBmPlqa9hccgDh6T6 RZXIBa8ZIxBzI/szfq1tRz7EJaSM466j9UKLdlU39qvGV10yGMusfKDuzKQOOxSA+B2LGY Q5x91BDOSfiwcjr0TkpcNzaJ6781Tbzw+OR5lipL2nrHCWs/a5UZEDxzfjk9s+AEvnNQoY v4m6a95PWF+0IwN2YQFaGP9uG0uG9aJdo78SEklkIsY79GDhqAz1K/jZ5krwbeJSKJoPnp JiNQszVbBfMesTzCCgRslvo02V/UF9o9FxQFeQxivVOIfPBc94Rb3LGgbsZ9fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793256542; 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=ly0Gncz3GWIeUPRLbQUTOVJQJfc5sbu20wt9tZeTQi0=; b=sC/HRgZiGuAV3D8cSJ1hkeuHRVB1FmawvMiG2NfJeLQIstWj9KLynWtjJx23O8uy8VEwmS qdzB1IbUFIFdyP2gvPEw4MK7izkwhRzpbpJbh+dktHAb/KbVoxAdEZHaF01bx9lAHnzqo2 7NP5dH5BB49lfcpiuNDvfA4kp5gXOh2UAM/PLVQj3/Il9SjhqnxM03mY4HTQelANAthZmc KXBcvaVQMobOjkQoKNUB4n9kO84btdiRkItPNBohEzH3eywtef+Eu0Z8ISmt7c+rzoU022 oemzsPE8bwasAlgNtp+U0hT1kXNfuiSIZt7iybUvvN5CH4x1j1jKBkWFw+iPzw== 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 4jFZZk187fzRqw for ; Thu, 29 Oct 2026 06:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d8c6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:49:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: d38a29eb6819 - stable/15 - mana: Initialize ports with the common RSS key List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the 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: d38a29eb6819b4087e924b84e1e041a9b2709994 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:49:02 +0000 Message-Id: <6ae2ec5e.3d8c6.6aa764ee@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=d38a29eb6819b4087e924b84e1e041a9b2709994 commit d38a29eb6819b4087e924b84e1e041a9b2709994 Author: Kevin Bowling AuthorDate: 2026-09-18 08:29:20 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 06:47:07 +0000 mana: Initialize ports with the common RSS key Use rss_getkey() for each port's initial key instead of a lazily generated driver-global random key. Remove the obsolete helper and its unsynchronized initialization flag. Make the common-key declaration available without options RSS. The port still retains the key used for hardware programming and the existing SIOCGIFRSSKEY response. Leave hash types and queue placement unchanged. Reviewed by: gallatin Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D59799 (cherry picked from commit aef4c3eb31d9c29c6aeb08023b1c9d2457d817e3) --- sys/dev/mana/mana_en.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index bc8c172bab69..2c6007dff909 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -49,9 +49,7 @@ #include #include #include -#ifdef RSS #include -#endif #include #include @@ -71,22 +69,6 @@ extern unsigned int mana_tx_req_size; extern unsigned int mana_rx_req_size; extern unsigned int mana_rx_refill_threshold; -static void -mana_rss_key_fill(void *k, size_t size) -{ - static bool rss_key_generated = false; - static uint8_t rss_key[MANA_HASH_KEY_SIZE]; - - KASSERT(size <= MANA_HASH_KEY_SIZE, - ("Request more buytes than MANA RSS key can hold")); - - if (!rss_key_generated) { - arc4random_buf(rss_key, MANA_HASH_KEY_SIZE); - rss_key_generated = true; - } - memcpy(k, rss_key, size); -} - static int mana_ifmedia_change(if_t ifp __unused) { @@ -2958,7 +2940,9 @@ mana_probe_port(struct mana_context *ac, int port_idx, if_setmtu(ndev, apc->mtu); if_setbaudrate(ndev, IF_Gbps(100)); - mana_rss_key_fill(apc->hashkey, MANA_HASH_KEY_SIZE); + _Static_assert(sizeof(apc->hashkey) == RSS_KEYSIZE, + "RSS key size mismatch"); + rss_getkey(apc->hashkey); err = mana_init_port(ndev); if (err)