From nobody Thu Oct 29 06:35:09 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 4jFZGj6jFFz6xtJ4 for ; Thu, 29 Oct 2026 06:35:09 +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 4jFZGj2TYMz572X for ; Thu, 29 Oct 2026 06:35:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793255709; 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=yV8IEVd19IiBFt3iWhjaiGQV+AvDmbsMA/NAyW/pySg=; b=BiyhIfWsicVDne5R5QKCbSdm3nfQrDD8jN2ALVnAbINzZJzQ7Vjgs9jI+WKd5z7Kvm1I7o 1bL6LKrJvLYDEFiNGr4aShWNfGpWt/Ek2ho0gkYSmBkwnDwIdxzJzHGVZMEMFOUX/S0MEZ o9V6rAlLlDtTGybmDewpa61Vx4Xl/Oy+OJym11ZppTuDnzLHqGHR0fcinXKbt1E+MBJ8AG ChuusjRSLqytWZ40OF0mtROgfTWkuL9f/kCWooqTET3D5a5jTF1/lCfjbJrfNW+1sc8ns6 8MTtntXpHoBxyo5uOmHUmVQcJdztPbzGFkfNKg+fOyJzFS/pvEPkS8h7YjYEJA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793255709; b=NSGtKgCHDvd4u+kOTIvE9NpEutH+45f+/P6lrs4TZwRHdUkR6XXwY1zJ+mn1t4aKEEg3fS R/uwR8LqXEMIWgsGQj7B5kWaFaS4IYGG44FvHFCK1jeanbBFxfxIP+H2aFc1GbdU6W/Lmq /xLxwQwMwCVv243Rv2mabQ3fsKO7p3U1ftV8OUCJ1F3HrWGKsVSrkys3bKNUtGHyG8oTkK dgoZSKfGTkj6qY3ex+XaoWB2UvDCoLWZEdvQrWwKLkQgYNXx2jPcs6GtVfmFbGtvcAjieE t0KQrDTkOMW5JB6p55hvgmc8vwTU97iJu4lcRfJlyDU9CWksvny+UCR01x0SEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793255709; 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=yV8IEVd19IiBFt3iWhjaiGQV+AvDmbsMA/NAyW/pySg=; b=KM1aOjCFmQn7SJ+ZEN7DJAXiKMjni7BAMt8b/0RrcStqcf01cAZV01VKVFFD/tECkYabQP cIZAEo6hf3BA/yf+rFaiDvaqdXDXrhrWxN9/CIb9xxm9OePa7ZboA+MunQ6fdKdVSSf85j FKnPE4oPHyh1JOedTW75kaJTCQic4MEsqkz/Odd0KyhJtraW+IZ5VodJqH+0IKEs0iF+uK 7J9i97x5MOL8cQZb4Ql7m2BILIE9yhohnJ48togv9C4f9lI/zx6vWXD/RJTiSZR+Ae4gR/ TwjGsItv5sNlZgALV1LXcim+yRahOPvJy5Wim4VlJW7TxE23a3PI+RmqMjq+DA== 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 4jFZGj27s1zRpc for ; Thu, 29 Oct 2026 06:35:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3de0f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:35:09 +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: 1fd03cef893f - stable/15 - ice: 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: 1fd03cef893fbcc172f6cef3d061affa4b8efa58 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:35:09 +0000 Message-Id: <6ae2e91d.3de0f.291a97b7@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=1fd03cef893fbcc172f6cef3d061affa4b8efa58 commit 1fd03cef893fbcc172f6cef3d061affa4b8efa58 Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:33 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 06:26:39 +0000 ice: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53096 Sponsored by: Netflix (cherry picked from commit 012ecdde3a810c52cc2f68a22afa1a1b7d699bff) --- 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 \