From nobody Thu Oct 29 06:35:14 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 4jFZGq0nD4z6xtjj for ; Thu, 29 Oct 2026 06:35:15 +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 4jFZGp5jdhz57NB for ; Thu, 29 Oct 2026 06:35:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793255714; 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=S5vgrDnHFYvrOHbkwOzsfQN4anin67LfSOc19JF+Zlc=; b=TKaSVgLEb3vlcciUq1Xg4bQ6DwsoMppxxVusURaZx2SxGwRJRF3TOHaAljbkPjpkwVvQ0U 3/HtXionsuhj2pEs3vIRh1soHL/wUFkOy/Z70xt8ZZ5JBByGGh2xEoPyrFREGU0sHTe8H6 R+pKI0PnB012S7NZzVGqoHGj1NIMcM3DkTJ6wIjNA3S2sIKiww4e4Q6wybZBaU9b4WNQrX A5FBUcT/yJ6VrHE8m+l+HmPH69AdrvUE5tSVEbLTMu5D4o3Wd+LLMFIANn+WJx3a+UpCdn xlJhGNnNWulgXyWtkRFwW1BBDxnnCg5IRb2YJiVzmpufj8VeKyvSf9K7sqH9FA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793255714; b=PgPRA6pVQuba7WgnRnosR8MT3Oa2IGhp9m2lOlSEXPHKJ1mcGcLX+oj3hP1gdTEX9R/xSc D82R22S+aVrUZZz5MO4E6nWwghW3M1eWBhE5Zb+pM6bAUp3l5W7Vi9KlBgiLdlNG9eUOrm KGxbsLOhrnr0RjnPqm+MFXEWBaNFi3RJg1iCNZPP0LTUNYEnVmPwkSdxgnolFvdhLVNvl6 K2ApvKVI/8jpcmO+JOOl3TFMk2eqv60zz9nkjqgdcGUtDmyC+D94bTOjeLY5ARTqhPh4dK S1tvMqbcp4IsvtYOQpCjkdlocXep92Ww42cQuFXH3wE82XBuNWAke4et3xj5uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793255714; 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=S5vgrDnHFYvrOHbkwOzsfQN4anin67LfSOc19JF+Zlc=; b=hvFhrAdcSEZCtaRIOEDwszr3lmbEHQUDTIWgsU6vEIZiHMqm2kWViaGcjFO7gT5deOJFRQ ibd3rMFDTcCB/CWRlmUS/QVnTqnoaGIRgyJfbG+kO6EnYDpaBM6d75EkRat8/sj8rF5c/g rwqOxDs1C/pce9jvE3DXfTP/J3xfD5laeuBPyYqTsg4HkAXlE/5LM2kkoHUZgfkoC9Be4l XWn8eWHX4kd76hLZqDWb/8hmBFQ4aTNTSyzoxOfk/Efpbx5YE9s0rseB/8VrwSyUtxrpyW Y/nJp7BPNtZA5sJ/DlaPHkLfq7Gzk+/OFCPjziRbdjKLj3Cnx/ziqn02Yr94Yw== 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 4jFZGp5NTgzS0t for ; Thu, 29 Oct 2026 06:35:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c778 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:35:14 +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: 1cc913aa5b80 - stable/15 - lio: 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: 1cc913aa5b80ac8d45c9df51b595258de5226b4b Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:35:14 +0000 Message-Id: <6ae2e922.3c778.2dc536e2@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=1cc913aa5b80ac8d45c9df51b595258de5226b4b commit 1cc913aa5b80ac8d45c9df51b595258de5226b4b Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:34 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 06:26:40 +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 (cherry picked from commit 5a94c2e89f6a4fbdea49d6c3a51b5fe0154d2495) --- 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 911ea6ba2159..5da346e308ba 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; @@ -1435,13 +1433,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