From nobody Sat Nov 22 14:31:02 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 4dDDzC2Xgrz6HDjN for ; Sat, 22 Nov 2025 14:31:03 +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 4dDDzB4fvkz40r7 for ; Sat, 22 Nov 2025 14:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821862; 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=Uu0yBrZUKmU3BJ5xnUMbTtrdyxaAis4jFdp3rWtIOmI=; b=O3Qybf8uggiJuATooovnaCvqmTvdmiqBTavxUymxWOSZwD98oAEC7VbWCng2aTCov2Ly4v FzmU6FAeWNtqea5CLPrL4Sgast/0YN+9DBSYIXQCG+yq5dL8mcGQJWHu0MXpvdULC81pSA vcedXoOW6u9KKmOMPkG53YO2figlmopLJTbIvjzIpXvB+8xAbQFo6JJslrvosGKU6MaqZv 2JY4sZPXhE3GDFdpdC+0Ri6ZeoBZPAdfSrc7hr2fsuqzYsKNNQ9xTPsLyKpOOrdnyEddC+ /c3M+4RU4LqK5AQryeMRuuTLs6bkU0tLX08JHwzBA1w32WtFN5CIo4IqL2r0uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821862; 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=Uu0yBrZUKmU3BJ5xnUMbTtrdyxaAis4jFdp3rWtIOmI=; b=IV/lBMxqWg5Y0AI7Ycr+sDAXZAnH9g69lYGQnXI0aTXnKOG/a9eJW3+Cl++hc1kIms+1Uc eUmLJHawgOidYuaLqEqrLdgYc+rmFxIGVEPM9GXzGGqpO1MWJJ2iWp/rzP7y6n09TZZb7S ClJQWIbhcCQzkST0KIhUbc5wcpE8mVAf5HeqNvmDzfh7UH3H0LIBKNEI+b5NIg9YIUW1Dg 7MxT5Sb3qGVYtNPSZJKULaXNT4mWVLnw3ioaMMbvnFToEdro2FLrAqcjeUGWD4fRph8UcB bPA1Ur8G9B30tWPvEZ/nfAnWWKhrWkcL/2yNMQO+Faj4FQh6rL19CLNLfdLvFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821862; a=rsa-sha256; cv=none; b=Nze34bOrHVIpAm3IdD0Eq8AHNCbeNe8eYwSu4cRCnXIUgcwpGgo76nlT/0IwuIPcYewieo TakR4nlE4K2XVmBc8Q27wHLZcF7DfUz9eSLRMhkG+tDJjsFcmqeuyKr6e/OZVQkrQQK8Aw H9RFBNKT+zDi0UEKjKmfUEmDXc/F+tRhsfTaEd+AhKiSPwDS5Si04pz8e4cDUereKXamCG 0i4v9CsANCdCiTWx+Sqa1UgxLXlH5GYphLgyqjP1w8phoc8ZW8f5ueAJrDVckRlMlWsJGB VnX9iYfY4nC6DLyTfHMJD3vu76O5RFiEa6bT1EycxkG6H/iaakzYJYGSKP5cCw== 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 4dDDzB3Ynfz11t0 for ; Sat, 22 Nov 2025 14:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f362 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:31:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 5a94c2e89f6a - main - lio: 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: 5a94c2e89f6a4fbdea49d6c3a51b5fe0154d2495 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:31:02 +0000 Message-Id: <6921c926.2f362.6af0f437@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=5a94c2e89f6a4fbdea49d6c3a51b5fe0154d2495 commit 5a94c2e89f6a4fbdea49d6c3a51b5fe0154d2495 Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:34 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:34 +0000 lio: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53101 Reviewed by: zlei Sponsored by: Netflix --- sys/dev/liquidio/lio_main.c | 5 ----- sys/dev/liquidio/lio_network.h | 2 -- sys/dev/liquidio/lio_rss.c | 8 ++++---- sys/dev/liquidio/lio_rss.h | 4 ---- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/sys/dev/liquidio/lio_main.c b/sys/dev/liquidio/lio_main.c index 3c73a6b10eed..7b6eeb460095 100644 --- a/sys/dev/liquidio/lio_main.c +++ b/sys/dev/liquidio/lio_main.c @@ -64,10 +64,8 @@ static int num_queues_per_pf1; TUNABLE_INT("hw.lio.num_queues_per_pf0", &num_queues_per_pf0); TUNABLE_INT("hw.lio.num_queues_per_pf1", &num_queues_per_pf1); -#ifdef RSS static int lio_rss = 1; TUNABLE_INT("hw.lio.rss", &lio_rss); -#endif /* RSS */ /* Hardware LRO */ unsigned int lio_hwlro = 0; @@ -1437,13 +1435,10 @@ lio_setup_nic_devices(struct octeon_device *octeon_dev) lio_set_feature(ifp, LIO_CMD_TNL_TX_CSUM_CTL, LIO_CMD_TXCSUM_ENABLE); -#ifdef RSS if (lio_rss) { if (lio_send_rss_param(lio)) goto setup_nic_dev_fail; } else -#endif /* RSS */ - lio_set_feature(ifp, LIO_CMD_SET_FNV, LIO_CMD_FNV_ENABLE); diff --git a/sys/dev/liquidio/lio_network.h b/sys/dev/liquidio/lio_network.h index 856cc8f7ab09..65896bf8cfa9 100644 --- a/sys/dev/liquidio/lio_network.h +++ b/sys/dev/liquidio/lio_network.h @@ -125,9 +125,7 @@ struct lio { /* VLAN Filtering related */ eventhandler_tag vlan_attach; eventhandler_tag vlan_detach; -#ifdef RSS struct lio_rss_params_set rss_set; -#endif /* RSS */ }; #define LIO_MAX_CORES 12 diff --git a/sys/dev/liquidio/lio_rss.c b/sys/dev/liquidio/lio_rss.c index df10cbbe3a05..da1e18142e81 100644 --- a/sys/dev/liquidio/lio_rss.c +++ b/sys/dev/liquidio/lio_rss.c @@ -31,8 +31,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef RSS - #include "lio_bsd.h" #include "lio_common.h" #include "lio_droq.h" @@ -69,7 +67,11 @@ lio_set_rss_info(struct lio *lio) uint8_t queue_id; for (i = 0; i < LIO_RSS_TABLE_SZ; i++) { +#ifdef RSS queue_id = rss_get_indirection_to_bucket(i); +#else + queue_id = i; +#endif queue_id = queue_id % oct->num_oqs; rss_set->fw_itable[i] = queue_id; } @@ -168,5 +170,3 @@ lio_send_rss_param(struct lio *lio) return (0); } - -#endif /* RSS */ diff --git a/sys/dev/liquidio/lio_rss.h b/sys/dev/liquidio/lio_rss.h index 8a5020d47f7e..727f08b5fb0d 100644 --- a/sys/dev/liquidio/lio_rss.h +++ b/sys/dev/liquidio/lio_rss.h @@ -34,8 +34,6 @@ #ifndef __LIO_RSS_H__ #define __LIO_RSS_H__ -#ifdef RSS - #include #include @@ -76,8 +74,6 @@ struct lio_rss_params_set { }; -#endif /* RSS */ - #define LIO_RSS_HASH_IPV4 0x100 #define LIO_RSS_HASH_TCP_IPV4 0x200 #define LIO_RSS_HASH_IPV6 0x400