From nobody Fri Sep 18 23:02:08 2026 X-Original-To: dev-commits-src-main@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 4hmp6S4jBQz6t68D for ; Fri, 18 Sep 2026 23:02:08 +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 4hmp6S4CLqz3DtY for ; Fri, 18 Sep 2026 23:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789772528; 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=Wov4nVLlfceYAr0jM61TvGTBafJfRJl8f5ckzw+tJcE=; b=YvBn23PR1QT4irYkY5Agyx1elbF6qKDaRc466RnDXYGfkmA4xPOgkGFsQ7SMTr6cSjLVvP PnCmWysi4sYTpHYgIwXzVf50GUhwpfK2j6FieIp75nFMiURufKTS54rXE4VsWupeZ0QgV7 YO6GxYoYc0NzymI2qRtsiyp4YAesrMJfa+AIzyW3sZf8rrlk8NtoaglMS1SeOW92VE44VH j+QG6ANo1Xwa5QMr3lUzylcMz8XO5w4jICm6VT+Vg+6mK4rynfligDyuY2Z1AZUPNf/pr6 lAzlnroi5cS6gbzwdJyYvoKwgP8dsz8JjkB6R6P02CKSNb9m/WYCiRimOESpUQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789772528; b=DQwn94GYNaDLNN8uCra5qbwubEDQyX2frsJgstjz0Gm515TxFHA6Q88B2DNs0yGKp3I90l 5E3jgq3yKfa0MFVTc1MOvL0fWdnjQ253GozqsysIhHknhKpsCnCPx8ZYXi8vBxq7LJL9TO b35/PepTKgMaXXpZy2ZkkAJVyRnQGeoakDgMlcF1NVxZr0ctkEcjSpQgmC8ONd1n40BhCt rv0vyqTl3H6x77CPxZyUtDX3P/e5OaGrVBtqBYsOvi+fIcSkB66smjyAf27+5tTmA3RELJ psFMh8LbJYn7ZymaWHS+sibmZhEy5XFrmVgh0Bdcnqmz40Px/uSI2Iz+faqPlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789772528; 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=Wov4nVLlfceYAr0jM61TvGTBafJfRJl8f5ckzw+tJcE=; b=pEL1+M85SbvboSsvPxHyD1eHuqU8rsNLflcZgS0ngzMFnrcnzvjr2WYHIZeCrRyOjdiIgC BJlckBqgKIS4Uf1kG6pPHLTzaPXfolDOTy3ovC7BrUdqIPes4FeTPSQhgoHexTo2cocoCT PqV4+zR0Z8y2H+V5M35d+0izB/eBH0t2MZcIViIsIlh/fCnm0ENcIkgmdQzPo79VXACp+J Gu9Lh5ddxa3suGRpLsbUglgXgaAEojJCYv2d2gLK8bRkWEL7dCubDIrWJo0lrz+LiGFScy dkxlbYmKla/gC7vi2eUgw/YolXmmLASkLIYzzV/HnW7nyYa6my8Gt9lMk99CEw== 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 4hmp6S3GmXzgk4 for ; Fri, 18 Sep 2026 23:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25883 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 18 Sep 2026 23:02:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: aef4c3eb31d9 - main - mana: Initialize ports with the common RSS key List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: aef4c3eb31d9c29c6aeb08023b1c9d2457d817e3 Auto-Submitted: auto-generated Date: Fri, 18 Sep 2026 23:02:08 +0000 Message-Id: <6aadc2f0.25883.307490a5@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=aef4c3eb31d9c29c6aeb08023b1c9d2457d817e3 commit aef4c3eb31d9c29c6aeb08023b1c9d2457d817e3 Author: Kevin Bowling AuthorDate: 2026-09-18 08:29:20 +0000 Commit: Kevin Bowling CommitDate: 2026-09-18 23:01:09 +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 MFC after: 2 weeks Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D59799 --- 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)