From nobody Thu Oct 29 06:49:05 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 4jFZZn6Jcnz6xvZc for ; Thu, 29 Oct 2026 06:49:05 +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 4jFZZn3m34z3RFL for ; Thu, 29 Oct 2026 06:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793256545; 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=wm6XmA1WDuqHwfYKusxW0xydtgxBzKrqB+C2kPFdtMk=; b=sZLxA0d9YgJhKHU8mczFCqlZCC/UHd+Pz4Q/KtG/gIzmLGiNqwS+Jg1Ab+HvMv5u2M0vQP JDm7mCIqHFdBoxhYCxQznDKaoi+mLO6ifk6h895cEPaVwjlCROQm1cqJbr3LaQfuSQc6vj 9rhkE5XZvcRPI+glywU/lAyuwuINCSskywaWxJ1U4YkzBbBgz6V3meV/5mrp/7KLVZk3tw 1mb8GGEP45THn/PmNqrazx8s+KFcOaaCxdKVopc5MvK9Vxk1QYwv3fzTwBvgaKCTACnDyL CSxf58oRpzG8tbdX3w4TdlQvxEPPl7QFL3QGEtLhc/I135okTuMBZUwVYs3fdw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793256545; b=ybTTrvgAmgIcDJKNDx5QKUyTE2iOctP0avvtv5QMMRgdCc51EaILaQlNIBxk3f22GiYp1F /Gd2qUjVO5arkX4rKBc6D1irUzhMA6NXO064c17///IITjAFFn4pFHmAuq6k+CWV0HZKF0 2qPhaDwCSlAQqGyPoBCa87KUFbLep/z45r7x+JaI35Q8OGSu7z5A0Ab5anHcevoDGi7Qj7 apGVGYXEguiwwNa8fW+Bn68Z/ikucqIaV442NcaXOcbQ235M/2FWq2L0Wsjb++77n6sxSK HeNWlf5Re3eHRewA2ylmn+BbQdGDEZOsXXE80nyp9HkzARO1uqg5N9JxA7g42A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793256545; 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=wm6XmA1WDuqHwfYKusxW0xydtgxBzKrqB+C2kPFdtMk=; b=iOYOfim6kStu8cd3l/MNzyi1Fu0KRawkWcZdLp+8UCASS+jcK7Q2tVzjlxt8TPfChKZvVx ZA2Pnp1sTS6H1DJ+8nFNaelx5y7F+MKW4yYcjuJYVoN5jJC5se+iwHAVvm5xn/UwUH9bKr 9nwT7Rh711G4KdxEv4kOtJlVL+IXB1FPQT5NOsXA27qf2+vhKe9lEtbLt2lMRcGI1edyb2 jpoPFxZQ/XV/la/zECsHhBVn/E5z3MnKEpn6TbqPVg/wGqpCgthNzLuPXLn1R8IbiEtMvV 39/6KBIw6vVZJWBQdBayzAQlWUnbHukkw9HxNdUXhb4pVKFIuvcbg9YMGkwm1g== 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 4jFZZn3JSHzS5F for ; Thu, 29 Oct 2026 06:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e373 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:49:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 56f734ff2dc3 - stable/15 - qlxge: Derive both RSS keys from the common 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: 56f734ff2dc379498189447100b8016d0dbcfe1e Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:49:05 +0000 Message-Id: <6ae2ec61.3e373.6c075c93@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=56f734ff2dc379498189447100b8016d0dbcfe1e commit 56f734ff2dc379498189447100b8016d0dbcfe1e Author: Kevin Bowling AuthorDate: 2026-09-18 08:29:21 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 06:47:38 +0000 qlxge: Derive both RSS keys from the common key Replace the embedded default with rss_getkey(). Preserve the ICB's little-endian representation of each big-endian key word, then copy the initial 16 bytes of the serialized IPv6 key into the IPv4 key. This retains the old default-key bytes and allows a configured common key to take effect. Leave RSS flags and queue mapping unchanged. Reviewed by: gallatin Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D59802 (cherry picked from commit a5e3c38531cd94d245372147f6f6e1d6d2f82a39) --- sys/dev/qlxge/qls_hw.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/sys/dev/qlxge/qls_hw.c b/sys/dev/qlxge/qls_hw.c index 02cb81c46d9f..5fb6d470299a 100644 --- a/sys/dev/qlxge/qls_hw.c +++ b/sys/dev/qlxge/qls_hw.c @@ -34,6 +34,7 @@ */ #include #include "qls_os.h" +#include #include "qls_hw.h" #include "qls_def.h" #include "qls_inline.h" @@ -969,21 +970,10 @@ qls_wait_for_config_reg_bits(qla_host_t *ha, uint32_t bits, uint32_t value) return (-1); } -static uint8_t q81_hash_key[] = { - 0xda, 0x56, 0x5a, 0x6d, - 0xc2, 0x0e, 0x5b, 0x25, - 0x3d, 0x25, 0x67, 0x41, - 0xb0, 0x8f, 0xa3, 0x43, - 0xcb, 0x2b, 0xca, 0xd0, - 0xb4, 0x30, 0x7b, 0xae, - 0xa3, 0x2d, 0xcb, 0x77, - 0x0c, 0xf2, 0x30, 0x80, - 0x3b, 0xb7, 0x42, 0x6a, - 0xfa, 0x01, 0xac, 0xbe }; - static int qls_init_rss(qla_host_t *ha) { + uint8_t rss_key[RSS_KEYSIZE]; q81_rss_icb_t *rss_icb; int ret = 0; int i; @@ -1004,8 +994,17 @@ qls_init_rss(qla_host_t *ha) rss_icb->cq_id[i] = (i & (ha->num_rx_rings - 1)); } - memcpy(rss_icb->ipv6_rss_hash_key, q81_hash_key, 40); - memcpy(rss_icb->ipv4_rss_hash_key, q81_hash_key, 16); + _Static_assert(sizeof(rss_icb->ipv6_rss_hash_key) == RSS_KEYSIZE, + "RSS key size mismatch"); + _Static_assert(sizeof(rss_icb->ipv4_rss_hash_key) <= RSS_KEYSIZE, + "IPv4 RSS key exceeds common key size"); + rss_getkey(rss_key); + /* The ICB stores each network-order key word in little-endian order. */ + for (i = 0; i < nitems(rss_icb->ipv6_rss_hash_key); i++) + le32enc(&rss_icb->ipv6_rss_hash_key[i], + be32dec(rss_key + i * sizeof(uint32_t))); + memcpy(rss_icb->ipv4_rss_hash_key, rss_icb->ipv6_rss_hash_key, + sizeof(rss_icb->ipv4_rss_hash_key)); ret = qls_wait_for_config_reg_bits(ha, Q81_CTL_CONFIG_LR, 0);