From nobody Thu Oct 29 06:35:08 2026 X-Original-To: dev-commits-src-branches@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 4jFZGh60ygz6xtHy for ; Thu, 29 Oct 2026 06:35: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFZGh20xMz576W for ; Thu, 29 Oct 2026 06:35:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793255708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GdWs+UPwf0UAxJ1Qwfhcv6fAKYf58QGsU/NIZ9yjtBo=; b=uMyv9SQikvr4DffwqekJEVCk3Xr6GLCr6d3cD/tOJ9OZ/JHyambnWcIYcw72OxK4xsw2U9 wIgchY39cpArrWF7aTyEcYGWUSoyQAyaAGvJBgpf9fVDcoexyYwVAwG5aABvoPYVmvTNY/ fg9NWoUW6HMY9AkKrvTbgP+9wdIJ5YJ3gz2WnI7CQ1HlVpa5LDS/Bb1fgMoyWFuMYF2peJ PhMfR2Gsxvz2mDNy8gmfBDgMnVO6zv0Adc9Ajyldk2C0mxJxdNppmITBH214mXLzhEuZNp 9TErbnl2fSpfr76ebgYr3+xGB3ZOoH9jzDylwgE2037IR9bXUR+kaWuSHKIRIw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793255708; b=xTr8aWNovriwNqn+w7yq1Gvld/i6bzLWKCsg2EL8HKemYjI/C8YRHs5VfsPDq0puMWRj+N Wut6vI1BSIJKRQ8/c0TiWVnBcQ2OgwvzRIE6VgWkCe5rIVjhbfTyv36QufWAB4WMmb1ROf zWstRc0d6JIaGKW51s7TJAPyd/teWHceg3uvQUxoG29dzgS5EYFKLaYy1gfym+l+QWlqQn eFwW+RnSuImKxxSsheimEXA2MVlpw97+VXfWQUyu311UqOwGCPh20u0jlbueyyI2sAhu8I wD0gbv7edeI1f8r/Y/gqPKAdqesVATs0fFTFO97y1UILwZnQrbfCJtjuNdLkrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793255708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GdWs+UPwf0UAxJ1Qwfhcv6fAKYf58QGsU/NIZ9yjtBo=; b=wBam7a6q7/mFGi219bVvRrX3kw4xvmSDF0syayx4QkzpFPSV7K2d6gtz57asSWt5vdKRQ5 maxS1b0FA76XS6nXVp3KHTErhGH86vcXkOEGOk/IE7gwgWypnDAPFV5Hnc9zJ34L8/ToLH 7afZubZP/Kpa/2Iz/kCg11AhctIjMP5GErDw27wOwCuUrCpJDK7SFtXSNdbYQLuvsSTyF1 BkM9fPAkA9qtM3lRAwCS7I2eI/J4GSstQTMkAlvNkm8iRGbqW5CVfHrzVLsJLr1v4gIgGc T2aoamlvuXcM87voy2Y6YYLdy6OW6DnGs7VX/MVWhSzrrEVmv4W9bxIRJCLH2g== 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 4jFZGh1LQmzRkT for ; Thu, 29 Oct 2026 06:35:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e416 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:35:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andrew Gallatin From: Kevin Bowling Subject: git: 912c6b7f33db - stable/15 - cxgbe: use newly exposed RSS hash key API rather than ad-hoc hashing List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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: 912c6b7f33dbe1d2b49299645a6fb5c222fe1d21 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:35:08 +0000 Message-Id: <6ae2e91c.3e416.1c27c04e@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=912c6b7f33dbe1d2b49299645a6fb5c222fe1d21 commit 912c6b7f33dbe1d2b49299645a6fb5c222fe1d21 Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:32 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 06:19:25 +0000 cxgbe: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53092 Reviewed by: np (outside of differential) Sponsored by: Netflix (cherry picked from commit d381a6b4a552305de48027c51919a7cf28d52d02) --- sys/dev/cxgbe/t4_main.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 92e5d5ffd8ed..ae0dbc731207 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -57,9 +57,7 @@ #include #include #include -#ifdef RSS #include -#endif #include #include #ifdef KERN_TLS @@ -7017,7 +7015,6 @@ t4_setup_intr_handlers(struct adapter *sc) static void write_global_rss_key(struct adapter *sc) { -#ifdef RSS int i; uint32_t raw_rss_key[RSS_KEYSIZE / sizeof(uint32_t)]; uint32_t rss_key[RSS_KEYSIZE / sizeof(uint32_t)]; @@ -7029,7 +7026,6 @@ write_global_rss_key(struct adapter *sc) rss_key[i] = htobe32(raw_rss_key[nitems(rss_key) - 1 - i]); } t4_write_rss_key(sc, &rss_key[0], -1, 1); -#endif } /* @@ -7109,7 +7105,6 @@ adapter_full_uninit(struct adapter *sc) sc->flags &= ~FULL_INIT_DONE; } -#ifdef RSS #define SUPPORTED_RSS_HASHTYPES (RSS_HASHTYPE_RSS_IPV4 | \ RSS_HASHTYPE_RSS_TCP_IPV4 | RSS_HASHTYPE_RSS_IPV6 | \ RSS_HASHTYPE_RSS_TCP_IPV6 | RSS_HASHTYPE_RSS_UDP_IPV4 | \ @@ -7172,7 +7167,6 @@ hashen_to_hashconfig(int hashen) return (hashconfig); } -#endif /* * Idempotent. @@ -7183,9 +7177,9 @@ vi_full_init(struct vi_info *vi) struct adapter *sc = vi->adapter; struct sge_rxq *rxq; int rc, i, j; + int hashconfig = rss_gethashconfig(); #ifdef RSS int nbuckets = rss_getnumbuckets(); - int hashconfig = rss_gethashconfig(); int extra; #endif @@ -7241,9 +7235,9 @@ vi_full_init(struct vi_info *vi) return (rc); } -#ifdef RSS vi->hashen = hashconfig_to_hashen(hashconfig); +#ifdef RSS /* * We may have had to enable some hashes even though the global config * wants them disabled. This is a potential problem that must be @@ -7277,11 +7271,6 @@ vi_full_init(struct vi_info *vi) CH_ALERT(vi, "UDP/IPv4 4-tuple hashing forced on.\n"); if (extra & RSS_HASHTYPE_RSS_UDP_IPV6) CH_ALERT(vi, "UDP/IPv6 4-tuple hashing forced on.\n"); -#else - vi->hashen = F_FW_RSS_VI_CONFIG_CMD_IP6FOURTUPEN | - F_FW_RSS_VI_CONFIG_CMD_IP6TWOTUPEN | - F_FW_RSS_VI_CONFIG_CMD_IP4FOURTUPEN | - F_FW_RSS_VI_CONFIG_CMD_IP4TWOTUPEN | F_FW_RSS_VI_CONFIG_CMD_UDPEN; #endif rc = -t4_config_vi_rss(sc, sc->mbox, vi->viid, vi->hashen, vi->rss[0], 0, 0);