From nobody Thu Oct 29 06:48:57 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 4jFZZd72n5z6xvR0 for ; Thu, 29 Oct 2026 06:48:57 +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 4jFZZd6MkGz3R61 for ; Thu, 29 Oct 2026 06:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793256537; 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=3Xc1DiBE2QxkbCJQp3RrGy71lBptJ630L7llAysLyhM=; b=PaEQ23LStpKy4HdAh51Pc2L+GE/nfVJmfKs9BGIfpqD6hWBYF9Rf5QT4UyZHeZPPNGCfsH XRxLKXCG8GB10QTl+QFCngp4AT6IAIEV/MEege3RJUz7j9oUcb2ecOzj6Ta5Ts3RwWKctC 1JzlEqzP8KuFwi0vXC+FKmpRmtjqslwWOGcZxHbac1kyl3jYSyQ6ed8osdUADgpS1SzYMG nk+VL3JdKTVBQvTA7/D5qFdl4X4fre69Z1SjA1OUZFO+c8TtRkxlQhDN6mdWODKV7XLVHH c7BA7UZj7FS5Q5qkAXZKiBunwuVjgactuEtRPGZhGG4kc+hHHfnEmG6yPcr1KA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793256537; b=V02LpxWQ3w9BR+uYDU+UnGyxrMDZ6GCz7NVhTN56G2qnIMGIUDJ+rO9JYGcUT1vSeHVqpH fQE4hZhap3q4q8OSTRib9pLjaHQzGn5M9n3aS1CGFxd+Mvc5fnnSeU1iPrKtHIr4gqsjBu jHqfNhJhEozlEeYs7dnQ1A8QbxUI5uc9WU2efO1T3KnWRlOAyfJQZiY/VwdJgur86BZzM6 IFNNzxEeyyG6DH5ge7cKBqzibKu+u7Y+l29LJlfSKZ0j/QewX73NqW+6AcOgxLvlxweb/E me9C3WJbKaUEdF4d8nlWl4a5nwVtR88kdha0l31TU1HSImnmyRHbskU9U+7KMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793256537; 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=3Xc1DiBE2QxkbCJQp3RrGy71lBptJ630L7llAysLyhM=; b=kN7of5OuwAa4HeDt9RdjNUBES/d11X9YMSoOG46UvDpi/+yC9hqmL16YcmGQ9xUa7HWfU9 BGIt3q4SH/nQAY1L4Ms+xksjIfZ3/KclkSpFyL1c/o+nYTf7gawy8YxtRfYL8GdSbzvEpf RQOyA2IkgvSUYIp3pF6MdOQevrU2mSOOrwQeKcjBe1PNay98oI3U0UBSlOio/jI/K4CVZX FD8pI0UPi/QZh9EKMXZGqWQO7RZdL7h5qoOc3KgtrAFdtyN0ARdyHJPp+hyZJfqm1JlmbJ x87f5NYDMaj08JKG50QX5IE6oGxHnt/zajZFZk+WGIDH4w+wCHmYCMcS4RXGJQ== 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 4jFZZd5mvszS1d for ; Thu, 29 Oct 2026 06:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3edb9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:48:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: dddc7c128c33 - stable/15 - axgbe: Use the common RSS key without options RSS 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: dddc7c128c332bce1edeca38d5a4217ead7c8f25 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:48:57 +0000 Message-Id: <6ae2ec59.3edb9.68f30474@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=dddc7c128c332bce1edeca38d5a4217ead7c8f25 commit dddc7c128c332bce1edeca38d5a4217ead7c8f25 Author: Kevin Bowling AuthorDate: 2026-09-18 08:29:17 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 06:46:26 +0000 axgbe: Use the common RSS key without options RSS Fetch the common key in the PCI iflib frontend regardless of options RSS and make the key API declaration available in both configurations. Retain the existing hash-field selection and queue-placement branches. The independent ARM frontend is unchanged. Reviewed by: gallatin Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D59794 (cherry picked from commit e94de94f8d14ede98d38c9fc506ddf5c77ee9788) --- sys/dev/axgbe/if_axgbe_pci.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/dev/axgbe/if_axgbe_pci.c b/sys/dev/axgbe/if_axgbe_pci.c index 7cf74b49e339..47a2db91821c 100644 --- a/sys/dev/axgbe/if_axgbe_pci.c +++ b/sys/dev/axgbe/if_axgbe_pci.c @@ -59,8 +59,8 @@ #include "opt_inet6.h" #include "opt_rss.h" -#ifdef RSS #include +#ifdef RSS #include #endif @@ -723,13 +723,17 @@ axgbe_initialize_rss_mapping(struct xgbe_prv_data *pdata) { int i; - /* Get RSS key */ #ifdef RSS int qid; uint32_t rss_hash_config = 0; +#endif + /* Get RSS key independently of software RSS queue placement. */ + _Static_assert(sizeof(pdata->rss_key) == RSS_KEYSIZE, + "RSS key size mismatch"); rss_getkey((uint8_t *)&pdata->rss_key); +#ifdef RSS rss_hash_config = rss_gethashconfig(); if (rss_hash_config & RSS_HASHTYPE_RSS_IPV4) @@ -739,8 +743,6 @@ axgbe_initialize_rss_mapping(struct xgbe_prv_data *pdata) if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV4) XGMAC_SET_BITS(pdata->rss_options, MAC_RSSCR, UDP4TE, 1); #else - arc4rand(&pdata->rss_key, ARRAY_SIZE(pdata->rss_key), 0); - XGMAC_SET_BITS(pdata->rss_options, MAC_RSSCR, IP2TE, 1); XGMAC_SET_BITS(pdata->rss_options, MAC_RSSCR, TCP4TE, 1); XGMAC_SET_BITS(pdata->rss_options, MAC_RSSCR, UDP4TE, 1);