From nobody Thu Oct 29 06:35:02 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 4jFZGb06H6z6xtCb for ; Thu, 29 Oct 2026 06:35:03 +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 4jFZGZ69fbz571M for ; Thu, 29 Oct 2026 06:35:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793255702; 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=NCtmLutHrB0zIFmIO0Hoe01vUAU0+ekKpoNoPrX/BUE=; b=Eapfg4DR/rflxIvcMe/EJL1XI3YEimWNWkia8hEpsCT60R6uIKXZQ+/NCUOnhLs1ds/Ul9 wnC/a8w0NPSwrwIle/SwKRp/cxhj+t8Vm2zpvc/yd67bsOrp4B6uMvNArWVYu4rqxEfX6w aiMcIOVJ99bNfW6zq4TPEL4TRWAVVgQt8/4d1Y7bA4slIys8VnxH+nj7c1b/eZ37izDlWY H4GzzJ0Y0J6uh+5aAwDeffDrWkvUFAVFH0EVZW08VOpGZW3aJudF1dniJvTQFkYtYT4HRZ PLUiY2CykyW1y/Fa60zaYO83n1wSXG270OSKkZIoUg+uCsfxAT+1+PIaiLzT9w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793255702; b=lBV+V1kcJgF+dhQFCHkt6yuxD5W5zGows6AoBGxqK6ZOjuPmgHZYM0W0oIhu8anR8NwsD9 r4+JxtDdLgkTRmnMVDNS8h4zVB4/YmylKIF8+qWUas2ANWpQa/nBGQ14iZHZ6J8cnkcaLE dfo+ld0JqZfl5fRqchWNh92feLJuLgxmnKY0NAxF7Gj4GYOy0I+TQmtd1O3A+urr6q8vop ma6Ts/d/Gow9ssXeyaWPZY4QelSwF7R2s7SDuRrk+Q9h3S5f+HZD6WKvUfUAd8wramPkMv 0TYBx7BVtpn5fFEH8d3ARVMFqdF0lcspCb6boRLWuzVkG/lHlsCZxtfu0dxJoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793255702; 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=NCtmLutHrB0zIFmIO0Hoe01vUAU0+ekKpoNoPrX/BUE=; b=pMhcJmaZOTqOxzO50UkVL4zBfVMnJg/5Nk8Ozm/eKJNN12mh/Gm8ElN/6AbwyomWMfWoOr zwhzlY4a+lYQF77EDGxVNBosMHVvX16m669/icUc4BHPIsYf4kHe59OfwKBr1UAWULipW5 pFSOJBjPIaj0iCNDAfI2zg+UDrq78UOVsXm21FlVmfJtfYJh18WDN/61QR5pPeN39Ghs2c QPFBtwBAG0Quw33y1M9L6QwY22uiFt8yBwdV+gQDVFSxh+W/MSXiL/7K++BqYwWW4OD6O0 sfnIwr4grjq2nIZQJLuMH1U9DaCYk06r3iaK4avL3Ri+PjF00vLJ9Jpz477/0Q== 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 4jFZGZ5X7dzRkP for ; Thu, 29 Oct 2026 06:35:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d32d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:35:02 +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: ceb4116e0c72 - stable/15 - iavf: 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: ceb4116e0c72eb1b88b8eb55b410a8dd7536b99a Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:35:02 +0000 Message-Id: <6ae2e916.3d32d.3d430910@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=ceb4116e0c72eb1b88b8eb55b410a8dd7536b99a commit ceb4116e0c72eb1b88b8eb55b410a8dd7536b99a Author: Andrew Gallatin AuthorDate: 2025-11-22 14:29:33 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 06:19:18 +0000 iavf: use newly exposed RSS hash key API rather than ad-hoc hashing Differential Revision: https://reviews.freebsd.org/D53095 Sponsored by: Netflix (cherry picked from commit d2790dc77ef667d3477017b37db85378ce0bca8c) --- 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 d14f7cb49c59..e7cd9222bd68 100644 --- a/sys/dev/iavf/iavf_lib.c +++ b/sys/dev/iavf/iavf_lib.c @@ -1091,9 +1091,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) { @@ -1103,19 +1101,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); @@ -1131,9 +1124,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 82c3a5ad99e5..a483c9e4f755 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"