From nobody Sat Nov 22 14:30:55 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 4dDDz425lBz6HDGd for ; Sat, 22 Nov 2025 14:30:56 +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 4dDDz36SSqz40lm for ; Sat, 22 Nov 2025 14:30:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821855; 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=VUwMe9BW9lQWvWSpdI0DBoIcgm/Gb8iuBcZOcPpFIi4=; b=fRPCegA6GtpEAGaJ3t3BR+BrlqJEtsM5Tjip+BsFd9RYkWgQotnTewV49fytD38QyLQ8E5 p+alXkZcL3nabvsuP6hoH9+sBCUXNMQXhd8JN5ep6IAbztTo5sYWG1RAbZoQfRK3UPXh7s uTV4mWUtcl45/sT++QUpcn9dbiilCYZSSAc1ngStluJ8FfygtGqi2TEHHXOiQvTjDINoZW ixGhh7LwvDyXdwbtm3EX1yl5j7Io4oIfQU8yHn6WonxG9QWFec85XA9qmNlRNKy7/QILGf mSCrBo8TFQW49VnXdUbnZfMcsn7je3iIKPI1GTd5vVGQQBSx7rFzoK3o6aiCxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821855; 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=VUwMe9BW9lQWvWSpdI0DBoIcgm/Gb8iuBcZOcPpFIi4=; b=YbK6yooVaSJCjzwatPBqKwkhnc5UWPXbK6H3U9jyNUC0e9BowD88ZOEVUJEWTmdV2WT5Ul Xr0SFc7k5VhhJeq3y8+q2jNA+9it6M9oUYtoy+3QO/PvI5OkGaiev72U84CQMf6Rk5/m7F J7z3K6Bo2BznbX5jbwbf0/+HaEDCI5O3TuRMpcWYRioLBh/lsXVbFT+mTfxDZyKXyZJkdT DsgXpEsGE8InJ+gTHIqc9L7N8Oeh9VQ8DHO5LZZ+QRWTsjDVUfiACR+UapkwRsCy8uXGxG eYLu9drgjk/T54m9CdGTAAVYX65O5X+BYXOr/yryhfeGB+UWx1QylB8i0qinkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821855; a=rsa-sha256; cv=none; b=ouXYQp7BXjO3AQlHoJJu+StHtOERCi0rNbKvOnW3IkHNr3uHxrMKmzqbSizaBEvKEh7vBo nu4VBATiao2I1iPQr3Q/noFJ2T9gh31EPTB5m2dWacWaUSOP77P2NEBcvlU7rYfJRrREQh mnhIlxOHsmDO5rbjZaweJRv3sUOcrvF8IH9QlcRwENCBLYyLQTSKHwWRc80CV0oNMuPnWL WYL2uGcsCesxyc5NFo3K0Ckr0JgL9lxT5Vp7Ri7WuD6haHQAARglAsZlqg84YCTcghxloG CjswwkoQvgfjk7oddf9QX4New0PNr98vNPWDcdEw10Lefo4ifM0l8xn8igBOnA== 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 4dDDz35zt9z12CN for ; Sat, 22 Nov 2025 14:30:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f7be by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:30:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: d2790dc77ef6 - main - iavf: 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: d2790dc77ef667d3477017b37db85378ce0bca8c Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:30:55 +0000 Message-Id: <6921c91f.2f7be.28d09069@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=d2790dc77ef667d3477017b37db85378ce0bca8c commit d2790dc77ef667d3477017b37db85378ce0bca8c Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:33 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:33 +0000 iavf: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53095 Sponsored by: Netflix --- sys/dev/iavf/iavf_lib.c | 10 ---------- sys/dev/iavf/iavf_lib.h | 2 -- 2 files changed, 12 deletions(-) diff --git a/sys/dev/iavf/iavf_lib.c b/sys/dev/iavf/iavf_lib.c index 433d31904ea4..8596cf71bfff 100644 --- a/sys/dev/iavf/iavf_lib.c +++ b/sys/dev/iavf/iavf_lib.c @@ -1079,9 +1079,7 @@ iavf_config_rss_reg(struct iavf_sc *sc) u64 set_hena = 0, hena; int i, j, que_id; u32 rss_seed[IAVF_RSS_KEY_SIZE_REG]; -#ifdef RSS u32 rss_hash_config; -#endif /* Don't set up RSS if using a single queue */ if (IAVF_NRXQS(vsi) == 1) { @@ -1091,19 +1089,14 @@ iavf_config_rss_reg(struct iavf_sc *sc) return; } -#ifdef RSS /* Fetch the configured RSS key */ rss_getkey((uint8_t *) &rss_seed); -#else - iavf_get_default_rss_key(rss_seed); -#endif /* Fill out hash function seed */ for (i = 0; i < IAVF_RSS_KEY_SIZE_REG; i++) wr32(hw, IAVF_VFQF_HKEY(i), rss_seed[i]); /* Enable PCTYPES for RSS: */ -#ifdef RSS rss_hash_config = rss_gethashconfig(); if (rss_hash_config & RSS_HASHTYPE_RSS_IPV4) set_hena |= ((u64)1 << IAVF_FILTER_PCTYPE_NONF_IPV4_OTHER); @@ -1119,9 +1112,6 @@ iavf_config_rss_reg(struct iavf_sc *sc) set_hena |= ((u64)1 << IAVF_FILTER_PCTYPE_NONF_IPV6_TCP); if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6) set_hena |= ((u64)1 << IAVF_FILTER_PCTYPE_NONF_IPV6_UDP); -#else - set_hena = IAVF_DEFAULT_RSS_HENA_XL710; -#endif hena = (u64)rd32(hw, IAVF_VFQF_HENA(0)) | ((u64)rd32(hw, IAVF_VFQF_HENA(1)) << 32); hena |= set_hena; diff --git a/sys/dev/iavf/iavf_lib.h b/sys/dev/iavf/iavf_lib.h index 48c0f4560e5a..955f5c69288b 100644 --- a/sys/dev/iavf/iavf_lib.h +++ b/sys/dev/iavf/iavf_lib.h @@ -42,9 +42,7 @@ #include #include #include -#ifdef RSS #include -#endif #include "iavf_debug.h" #include "iavf_osdep.h"