From nobody Sat Nov 22 14:30:52 2025 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 4dDDz05Pgtz6HDPX for ; Sat, 22 Nov 2025 14:30:52 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDDz04P60z40VP for ; Sat, 22 Nov 2025 14:30:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821852; 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=aVExHbEmWsPplXAatF6NKFgSKMREpXhl+IU+2g3yPcY=; b=ZZpXiAXPd/H0fheijdSKPjhfyaPepWY8kl1PrrrUfMVSFwBYDnBcxzMODoaaT4Xe1dnTMl RZlo06q4v0dPEJ8h7HwR6Wf1c07AFz1Ve0dNGu2aJ2EBh8wd436oAhd0LeN+4O1KmV15gE DIT1OynBHPd1r9AGqo4Dr6qN6ugCuqv34kh3NX1bl05KHk3nVjvuujT1/Se2rQvGCHDx5M BXszfs6IvckRwI66Dv49nhY3b1LOa1zZcetDnwgeKhKaPSMSKQxPFfook/Xv9X55uJFz3O Sx8mIt8MjSpu6lkTW5d5VKBpzzMaZIDkK+Nyypp168yRX7OQD6M7gF/Zw3SQaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821852; 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=aVExHbEmWsPplXAatF6NKFgSKMREpXhl+IU+2g3yPcY=; b=qim09DVI71KNwZXZzSCsdTWAsNH5Bkkq2TZ+poWxML1OzjWOVplPAsYxtlwbVGDl3XL15s DlUT4Yu2ilNcO6jiNvNReU3IxsXtKqFQHHcQc3QhSvYxTOvRi8V5FSNKQKZ6fVm8TpRSnK jJfhKvPSdS2o6mqdMUvWIto8DeRGVfRNLtdGKUGlzk0u1tAMDqe/2NUcv9/JjKXK8buQSD +QwpeF3sFWelbMUNJU+MrYQtcMDp8taeor2vPpzdGkYNoZMWs5Pr8+R4YmL3YW0sugh+Ak LuXWO23hoR7ZfyHo+R/Qw8iMMoD7WgAFulwmj0+42MIdMnF4afZUs0UPaNxZCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821852; a=rsa-sha256; cv=none; b=FisoD0Xsh3H3IXAnolLIJwhourOmP007bCk8bKY+BrNOCp1k/6r590CB3yr5b7lJsfAqJh wtM3Yyb2XMJE0gGGZEZWJCMhrZGyPR7XmF42MCETOJ4AwuNgqcYRNZQf/jl1JEwTw9qqMd GxFkEweUPh8gt44HWXvYBU7A5ojGR/Rfgmj9sZHZEvIU+y12o3sZqL4UbgUp24Flw2zKNM dok9wPPz2D19nV9nmQMUPZ3RRDPAiWqy8fV67ncas1PqC+92VZ2CWbL80a5rHPlMuX3kBt hdZ1yeuNT5/cpwD9fmNsmFnfqqNRwvU/+vzGLiPYlDynJvdtSCJfL4Nj/7WgJA== 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 4dDDz03yJPz12FC for ; Sat, 22 Nov 2025 14:30:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f9ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:30:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: d381a6b4a552 - main - cxgbe: use newly exposed RSS hash key API rather than ad-hoc hashing 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d381a6b4a552305de48027c51919a7cf28d52d02 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:30:52 +0000 Message-Id: <6921c91c.2f9ff.4a45c816@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=d381a6b4a552305de48027c51919a7cf28d52d02 commit d381a6b4a552305de48027c51919a7cf28d52d02 Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:32 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:32 +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 --- 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 9bd5e02fabf0..15b3fd94fa54 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 @@ -7035,7 +7033,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)]; @@ -7047,7 +7044,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 } /* @@ -7127,7 +7123,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 | \ @@ -7190,7 +7185,6 @@ hashen_to_hashconfig(int hashen) return (hashconfig); } -#endif /* * Idempotent. @@ -7201,9 +7195,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 @@ -7259,9 +7253,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 @@ -7295,11 +7289,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);