From nobody Sat Nov 22 14:30:56 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 4dDDz54b4nz6HDSB for ; Sat, 22 Nov 2025 14:30:57 +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 4dDDz50Fhhz40m5 for ; Sat, 22 Nov 2025 14:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821857; 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=+bMoTK6tidDm9lrZ9egm4NQhVCKlCBoWQTsGK5Gh6M4=; b=Cv3EBhvLIceWwzqqmmIRhN0FLsa5py1ugWy8ZmoK59JCuuHU2smsx+q4DXxMV8rhrRJqL3 taNY6r0xkNgrLrysWOPTCsyGI9LLk4BBRXypQvKgReLxiwxh41MNZgPdrDb/OblZ+gTEbw h7NHNAZmLkkrDL+fGPomAc+weLJAFabmrdJoYYGT+XJRL6NnryqYb5V3U73HMRfFvUG/EZ zadh0ILfunSnAuhIHt0Gt8NxRaST/rEpGkP0jTqX0LaETu+Fv/tGo4uCMbUrNtDV5Z4cxh cb6RU6fuqWz6JVNrMwtAqXju2sBwGfIKyZsXDQIYswDk4xcaAf+U1OVywg8l1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821857; 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=+bMoTK6tidDm9lrZ9egm4NQhVCKlCBoWQTsGK5Gh6M4=; b=lx9PAeibtDKKGDOzxfNbUS8i624r+odgZyDbKCZAJsP6/AWhqg18+b6ITgaU64Z11UrwdI v8tv05gsy5xtaU/VAwAU+rbtlsTA8EBoLLOSYxF0XAufZO0lXT81EfRFbUvfUx8m1t/7iL CysG8kSh8AW1Fd1Ia/BybmGBr2bZcomEWrVDUaiCkmULQjPxi9vDmA910BNdofg57iwp/A Nz/WGRerp4xKISOTCb32escAjIfnO5lhVrbGdOpBnHRjimcE97FzFBjXzTBW0n4oglSo/R 1UsudDKyMaxGYXfldgWWG/5yb32m6sOBbBmUwQExzpTRKDPGISI4nkr37OT01A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821857; a=rsa-sha256; cv=none; b=dK0cwGtOfrE5HBcgXxes9/dH3wEtBmie/Y4kWK2//hhp6bQ7q44lh3jhRuc75m/DDTJTq0 Ov0va2ZggUnB2d4ajNAJALn6BWqKlbiTg2/iMsaPoYV/mlBC2J+Co+BzuTx8n3d8L73Vn3 LaQFLupkvUsQVLD7PIE1debm9HaVS7PEMhmO2Q4fyNrYHMCLWwWh74SNXPgLw45Q0pAl5e jbiAVj2MTnnzReDoPk2UNdPcYPQyRfJKmVvQ2RI5sw5eaz57P0Ns+TP1blmM+lTZ1CihfC jbEXsSqzOvIb5WECsIKVacqtS1YqyDypvOi33MOHl7uSb9QgL+8ZR1u3uEiTWg== 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 4dDDz46my7z12Tc for ; Sat, 22 Nov 2025 14:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 308a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:30:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 012ecdde3a81 - main - ice: 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: 012ecdde3a810c52cc2f68a22afa1a1b7d699bff Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:30:56 +0000 Message-Id: <6921c920.308a4.39021509@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=012ecdde3a810c52cc2f68a22afa1a1b7d699bff commit 012ecdde3a810c52cc2f68a22afa1a1b7d699bff Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:33 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:33 +0000 ice: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53096 Sponsored by: Netflix --- sys/dev/ice/ice_rss.h | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/sys/dev/ice/ice_rss.h b/sys/dev/ice/ice_rss.h index df485f4b1f5a..4efebb362025 100644 --- a/sys/dev/ice/ice_rss.h +++ b/sys/dev/ice/ice_rss.h @@ -42,36 +42,17 @@ #ifndef _ICE_RSS_H_ #define _ICE_RSS_H_ -#ifdef RSS -// We have the kernel RSS interface available #include /* Make sure our key size buffer has enough space to store the kernel RSS key */ CTASSERT(ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE >= RSS_KEYSIZE); -#else -/* The kernel RSS interface is not enabled. Use suitable defaults for the RSS - * configuration functions. - * - * The RSS hash key will be a pre-generated random key. - * The number of buckets will just match the number of CPUs. - * The lookup table will be assigned using round-robin with no indirection. - * The RSS hash configuration will be set to suitable defaults. - */ -#define RSS_HASHTYPE_RSS_IPV4 (1 << 1) /* IPv4 2-tuple */ -#define RSS_HASHTYPE_RSS_TCP_IPV4 (1 << 2) /* TCPv4 4-tuple */ -#define RSS_HASHTYPE_RSS_IPV6 (1 << 3) /* IPv6 2-tuple */ -#define RSS_HASHTYPE_RSS_TCP_IPV6 (1 << 4) /* TCPv6 4-tuple */ -#define RSS_HASHTYPE_RSS_IPV6_EX (1 << 5) /* IPv6 2-tuple + ext hdrs */ -#define RSS_HASHTYPE_RSS_TCP_IPV6_EX (1 << 6) /* TCPv6 4-tiple + ext hdrs */ -#define RSS_HASHTYPE_RSS_UDP_IPV4 (1 << 7) /* IPv4 UDP 4-tuple */ -#define RSS_HASHTYPE_RSS_UDP_IPV6 (1 << 9) /* IPv6 UDP 4-tuple */ -#define RSS_HASHTYPE_RSS_UDP_IPV6_EX (1 << 10) /* IPv6 UDP 4-tuple + ext hdrs */ - -#define rss_getkey(key) ice_get_default_rss_key(key) +#ifdef RSS +/* RSS CPU/bucket mapping functions - only available with options RSS */ +#else +/* Stub CPU/bucket functions when RSS not configured */ #define rss_getnumbuckets() (mp_ncpus) #define rss_get_indirection_to_bucket(index) (index) -#define rss_gethashconfig() (ICE_DEFAULT_RSS_HASH_CONFIG) /** * rss_hash2bucket - Determine the bucket for a given hash value @@ -102,7 +83,6 @@ rss_hash2bucket(uint32_t hash_val, uint32_t hash_type, uint32_t *bucket_id) return (-1); } } - #endif /* !RSS */ #define ICE_DEFAULT_RSS_HASH_CONFIG \