From nobody Sat Nov 22 14:30:54 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 4dDDz30WwGz6HDBC for ; Sat, 22 Nov 2025 14:30:55 +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 4dDDz25rXGz40lb for ; Sat, 22 Nov 2025 14:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821854; 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=vEAS4CCnIlZQAjgSG6gx5qwuTXJXsA4jTG68IXCL1K0=; b=rt9Dm+dmNtWYafThy7aa6gP+tBo32o+ZI24agoWzGSFMFYLghaklTA/OIG6iRnanKKSsFQ R9XQznjHMuu72wKzJhOAjts55dLpmbZyoEh+cIjKWvkvpJyKlnkLyA4rshXyXlgp0JGsh4 lZnJt9FJaM1gg8XXFmziX8IWOHTScp4tycqJmPtctNSAyNiLlFyZ0o2C1uonlkFI4A6y5I kBPB0VM3Hjs6DE1R1UBXEC2k5/tZPoVnCXXjaTbcvjiPwv4uU6CfUzTiAz9YvBEXzsaMO/ 2Q1LpHZR7Ea3ptEHvbArlRLidoA8xbF0wK84Zygwe3LHEwCRmIUzfz4drVBpmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763821854; 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=vEAS4CCnIlZQAjgSG6gx5qwuTXJXsA4jTG68IXCL1K0=; b=E3/BNwZs4dfV5Q1VP8+yBKlXikAdAyFkeRWwaJTBNUTzD1911Z/ig2KyHVAlR6GHlvM836 IMJhpJaY9Pkw4CmN5nuIuFuLaQArDKCE48ARsB2n83yb28PQJaEv3GLGxn/iUNmzMiseem TzMh2dhth0930zx/mO4FBDQAUsv621BBQ5XhX9gWlTUjzaqy0nTT3GFf75RA3nfOKQyEqd l2qXxHHZmungv6PL/1CIRBBj8feAh+gkbIE8G2LEwF/VsU+h5EhskXjtUWCv0sw/T4WhdY dF6aLB8NhJdGHMzJcq/3PqAZFCzmtgPWAubqGKvxKWYNwUiGq90sKSLYGyqgSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763821854; a=rsa-sha256; cv=none; b=t00Sok2AH2ErrXIQYl/UtuxDCjZLE+4p+on4Y41njrei7YvrRvQrJVxpRKYzNoGpZ9fStX OuhCbsfTyD+buv65OVkO/ybGqSgmHUlyRtlmXg6vvPoXd7S8oOshL6jqTq1PLOGDNAekDW 50fdyRwg9bqEwK41yzUXot9srvXir03/BjRPzvos6MUS/9BYurYvgYWu88A5qFH6yw+x0Q tcfoa0yoZ+hO9uLhzY8/A/4aIJFbvMLaszMZeOXSHVPneCyIKkF3re9XbOmH8A5C8ohkYu 61GO/S43EktuhKJjQ1iNvVu3GKQKzmiUtXovD2MMaH6yUW/42agBmWSh2x5hRg== 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 4dDDz258npz12Hw for ; Sat, 22 Nov 2025 14:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30529 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 14:30:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: dd615b57df62 - main - ixl: 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: dd615b57df62e2fa858569d66164dcd1ef840c94 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 14:30:54 +0000 Message-Id: <6921c91e.30529.57dc3e60@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=dd615b57df62e2fa858569d66164dcd1ef840c94 commit dd615b57df62e2fa858569d66164dcd1ef840c94 Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:32 +0000 Commit: Andrew Gallatin CommitDate: 2025-11-22 14:29:32 +0000 ixl: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53094 Sponsored by: Netflix --- sys/dev/ixl/ixl.h | 2 -- sys/dev/ixl/ixl_pf_main.c | 15 ++------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/sys/dev/ixl/ixl.h b/sys/dev/ixl/ixl.h index ab0f38307d90..e265c8fbe3eb 100644 --- a/sys/dev/ixl/ixl.h +++ b/sys/dev/ixl/ixl.h @@ -98,10 +98,8 @@ #include #include -#ifdef RSS #include #include -#endif #include "ifdi_if.h" #include "i40e_type.h" diff --git a/sys/dev/ixl/ixl_pf_main.c b/sys/dev/ixl/ixl_pf_main.c index b62619ced5cb..674e45823cc4 100644 --- a/sys/dev/ixl/ixl_pf_main.c +++ b/sys/dev/ixl/ixl_pf_main.c @@ -1101,12 +1101,8 @@ ixl_set_rss_key(struct ixl_pf *pf) u32 rss_seed[IXL_RSS_KEY_SIZE_REG]; enum i40e_status_code status; -#ifdef RSS - /* Fetch the configured RSS key */ - rss_getkey((uint8_t *) &rss_seed); -#else - ixl_get_default_rss_key(rss_seed); -#endif + /* Fetch the configured RSS key */ + rss_getkey((uint8_t *) &rss_seed); /* Fill out hash function seed */ if (hw->mac.type == I40E_MAC_X722) { struct i40e_aqc_get_set_rss_key_data key_data; @@ -1132,7 +1128,6 @@ ixl_set_rss_pctypes(struct ixl_pf *pf) struct i40e_hw *hw = &pf->hw; u64 set_hena = 0, hena; -#ifdef RSS u32 rss_hash_config; rss_hash_config = rss_gethashconfig(); @@ -1150,12 +1145,6 @@ ixl_set_rss_pctypes(struct ixl_pf *pf) set_hena |= ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_TCP); if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6) set_hena |= ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_UDP); -#else - if (hw->mac.type == I40E_MAC_X722) - set_hena = IXL_DEFAULT_RSS_HENA_X722; - else - set_hena = IXL_DEFAULT_RSS_HENA_XL710; -#endif hena = (u64)i40e_read_rx_ctl(hw, I40E_PFQF_HENA(0)) | ((u64)i40e_read_rx_ctl(hw, I40E_PFQF_HENA(1)) << 32); hena |= set_hena;