From nobody Fri Sep 18 23:07:28 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 4hmpDc6vz7z6t6cZ for ; Fri, 18 Sep 2026 23:07:28 +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 4hmpDc6Cw5z3FxT for ; Fri, 18 Sep 2026 23:07:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789772848; 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=K0TVKscajGHXVWsMLRmEUMSZw5v/gE4jZOWgFa6Kv3I=; b=hZPWw0dFwxOJ99ygT7VD8nZuzVX+tArGriDxQ60Cfkk7cP1gWf0DnwKh2v4YjxG7s7nn4j 5/AiyhWMzkxUvUBYsy4RysWilzxgg9hElviVQB+LDjwRUNAWwkqHBrIyfZmuBtvlrxoV7n PeftEUoOoxL3F4Oewfj6/WmaEO0Pmg15aK1Ur9E9MXz3KFeinrxjgE3ALGCZo9W+2ewlXX Oisqv3N5hxfuxB3Ku7zsXwjx2Vmlru+Pzd4xOE0kmjuU2YOXnlOsBzcaE9r4dplrXVTxTH 4GXshSNVlNDOI37D9GuqRInkC/VBy7W2Rpjuj2ZK1nBmg21+PK6TwYrzvAFQrg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789772848; b=gBXP5oe18tdfTem8yBsZMBGC2D1PQpqMcOQjWEJCSMN915rdMA7bSLV1aavvOAqynbCxK+ 9I7mw9uP2v6BjHoASjFKltqGhpwQJeT8JF+cirnVcfKAyAc2AAut1QnV9ASVXSHRvfv4P8 rWXblS6ovY5NXLbV7QMKLa5jB4L4lYAkzorxgdb46OXaufgQRfApLpVkGUhzZ6iS2VTFHC +6uixEAcv2uTSdd9XeeBcDswyXvp0VCGj72xFWDD5RZ5ss5zAIeL0to68HnBSd8CBXEF1Z DjE1eFqUkQgNtwT8PsKnygP5AMVXqpxuh6pHSIzs370rA/qJPE5YIxVil5pkbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789772848; 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=K0TVKscajGHXVWsMLRmEUMSZw5v/gE4jZOWgFa6Kv3I=; b=BfuW3c/XJRhllMnMPUwpd7VgDUqYYBw2dhOSMihiL643FjY33TWB4OY/um2q9s1HMkI8lM wlq4zpkZA2A2KbP0sINHD7lqyJ5qVYFtq5L0gs5QqjIpSsAIOF4yBJGTQuxoxS9rda/j3r 1YuGk7TyyE3vsLRu2fd2Ulg4tQLzstoiJgvDdrq1dlzzMRi9JcNftngMDZ/wWhIWJLGKee PmBubDdOh/rN3g8jGxZewzyO6NMRm5ajzePzMSsmYfw7HpZpKCf8E5CNZy8bkNPisREldp uL76LAzcSSNBS892850OUsOFNg5GmjAiR9ws3bs7AE5of+dt+Qxkw+TYkvlYXQ== 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 4hmpDc5H9RzgRQ for ; Fri, 18 Sep 2026 23:07:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2520d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 18 Sep 2026 23:07:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: a5e3c38531cd - main - qlxge: Derive both RSS keys from the common key List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: a5e3c38531cd94d245372147f6f6e1d6d2f82a39 Auto-Submitted: auto-generated Date: Fri, 18 Sep 2026 23:07:28 +0000 Message-Id: <6aadc430.2520d.742b90bb@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a5e3c38531cd94d245372147f6f6e1d6d2f82a39 commit a5e3c38531cd94d245372147f6f6e1d6d2f82a39 Author: Kevin Bowling AuthorDate: 2026-09-18 08:29:21 +0000 Commit: Kevin Bowling CommitDate: 2026-09-18 23:06:33 +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 MFC after: 2 weeks Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D59802 --- 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);