From nobody Fri Sep 18 22:46:36 2026 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 4hmnmZ2j9xz6t55C for ; Fri, 18 Sep 2026 22:46:38 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hmnmZ1fz2z562P for ; Fri, 18 Sep 2026 22:46:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789771598; 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=T+Y69aNZsUmvX08yj0lJnIkowZBLf9G5HNngKARK/ZY=; b=lJHJUiOb40v1DdigVFqgsP6nPzjgS82s6XRMWogAwZ/3KKwcqNPoS+p65AzsUWvTL4+R+0 4I1RZkFGct4mPqwyH/zrWeC458KVlXKs/yKNsWHyIphZYjUfs6b7cAnhLfAh7EkKmAS97B 5geGjE8TSJRkNyMAwWGLvHrr24E1EBbCr3gSOtWwv7lSZRtdLsgQwHJyg9jKjrLv/MOuOy mfN6L6ky4HdH8Y+lA5GNrvRxTOEBIYUVyNjH325rwdHcmpS+sQ4DfcjTEq+s1Ii8CjgWUs oKNXmfnJE5HbU7B6MRcdSQKowrpy9r16khLp1j3+46Rxof448Bn8icCL89W9XA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789771598; b=bJrmTw5Rz8rrJqhamlVgmNghP6CjHo8fMWfGtBk0cMVhTZtIhWz+Wn8DZred3I5mIcM+5T rSOsfwrVu9eNamJD2yAhzELNPnIRyU3mmwTtLjYZYVrj+dhL/Or9VVfogr2cg/ceVx1Z3y 7BrUm5VsLLNmdAvdDXq+7Oo4XqeyWYZBJ8vPy8PuEUNMp+65DZgtXnIi1feLzordjKAnNm bIHEwpyttjYoHfzKnHm2VY8pOm7G7DO9NS9ot/V2QbRgxHEHL0ryU7WU3Yl6k+ZgGy7bQU yuqCvcxrspOjryZPGVGEqgXnxm3cHLDRTHmDB6RJhq8pwFum/7nZR9dGbqDFJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789771598; 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=T+Y69aNZsUmvX08yj0lJnIkowZBLf9G5HNngKARK/ZY=; b=LCGZDvCXo6llMcGEw8cRyIUpQv+CGFdQAShSPKrsiVlhvTKAgre8kR7fV+9v9DQov0Z8qA Tqy3cOHU0zJf0dQ/9LRaS8zqJBJ62xKkwtAXg7gHwnpIuET51LAontEafdtGwX/S0+FYd+ 5uYM+0qBuny6VSFDeo/XWU2hHgins59QhdqRXLCWKrFccVBNDN5KZRvWyDWHlOMD8j0hq9 cOOQvklXcF6xQRmmcGEAVkwPQs8XivpQiGsAJBy/7qIQx2ZrBmcPHr1YqCkWnFR0J0og2r 32l1Q+QWB/YnCJlRDMNFmbCxd2XL1Gllm5Zli2XzHnh56rn3JN/lf5Ksu9TuyQ== 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 4hmnmX2cNjzfKh for ; Fri, 18 Sep 2026 22:46:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22659 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 18 Sep 2026 22:46:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 7f1e93b1e57f - main - iavf: Use the common RSS key without options RSS 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 List-Id: 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/main X-Git-Reftype: branch X-Git-Commit: 7f1e93b1e57fedc10e149d606c64a8610245acb4 Auto-Submitted: auto-generated Date: Fri, 18 Sep 2026 22:46:36 +0000 Message-Id: <6aadbf4c.22659.5e9c13fd@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=7f1e93b1e57fedc10e149d606c64a8610245acb4 commit 7f1e93b1e57fedc10e149d606c64a8610245acb4 Author: Kevin Bowling AuthorDate: 2026-09-18 08:09:59 +0000 Commit: Kevin Bowling CommitDate: 2026-09-18 22:45:38 +0000 iavf: Use the common RSS key without options RSS Use rss_getkey() when programming the RSS key through virtchnl regardless of options RSS, matching the register-programming path. The common key is available independently of RSS queue placement; the driver-specific default otherwise makes the chosen key depend on the PF's configuration interface. Remove the unused default-key helper and its declarations. Preserve the negotiated key length, zero padding, hash selections, and indirection-table policy. Reviewed by: gallatin MFC after: 2 weeks Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D59790 --- sys/dev/iavf/iavf_iflib.h | 1 - sys/dev/iavf/iavf_lib.c | 23 ----------------------- sys/dev/iavf/iavf_lib.h | 1 - sys/dev/iavf/iavf_vc_common.c | 4 ---- 4 files changed, 29 deletions(-) diff --git a/sys/dev/iavf/iavf_iflib.h b/sys/dev/iavf/iavf_iflib.h index b9289d8d4050..bbd05e8279ca 100644 --- a/sys/dev/iavf/iavf_iflib.h +++ b/sys/dev/iavf/iavf_iflib.h @@ -393,7 +393,6 @@ struct iavf_sc { /* Function prototypes */ void iavf_init_tx_ring(struct iavf_vsi *vsi, struct iavf_tx_queue *que); -void iavf_get_default_rss_key(u32 *); const char * iavf_vc_stat_str(struct iavf_hw *hw, enum virtchnl_status_code stat_err); void iavf_init_tx_rsqs(struct iavf_vsi *vsi); diff --git a/sys/dev/iavf/iavf_lib.c b/sys/dev/iavf/iavf_lib.c index 9d6d64829268..c23e14a47444 100644 --- a/sys/dev/iavf/iavf_lib.c +++ b/sys/dev/iavf/iavf_lib.c @@ -57,29 +57,6 @@ iavf_msec_pause(int msecs) pause("iavf_msec_pause", MSEC_2_TICKS(msecs)); } -/** - * iavf_get_default_rss_key - Get the default RSS key for this driver - * @key: output parameter to store the key in - * - * Copies the driver's default RSS key into the provided key variable. - * - * @pre assumes that key is not NULL and has at least IAVF_RSS_KEY_SIZE - * storage space. - */ -void -iavf_get_default_rss_key(u32 *key) -{ - MPASS(key != NULL); - - u32 rss_seed[IAVF_RSS_KEY_SIZE_REG] = {0x41b01687, - 0x183cfd8c, 0xce880440, 0x580cbc3c, - 0x35897377, 0x328b25e1, 0x4fa98922, - 0xb7d90c14, 0xd5bad70d, 0xcd15a2c1, - 0x0, 0x0, 0x0}; - - bcopy(rss_seed, key, IAVF_RSS_KEY_SIZE); -} - /** * iavf_allocate_pci_resources_common - Allocate PCI resources * @sc: the private device softc pointer diff --git a/sys/dev/iavf/iavf_lib.h b/sys/dev/iavf/iavf_lib.h index a483c9e4f755..c56e55b555a0 100644 --- a/sys/dev/iavf/iavf_lib.h +++ b/sys/dev/iavf/iavf_lib.h @@ -430,7 +430,6 @@ bool iavf_mbx_log_allowed(struct iavf_sc *sc); void iavf_update_link_status(struct iavf_sc *); bool iavf_driver_is_detaching(struct iavf_sc *sc); void iavf_msec_pause(int msecs); -void iavf_get_default_rss_key(u32 *key); int iavf_allocate_pci_resources_common(struct iavf_sc *sc); bool iavf_reset_is_complete(struct iavf_hw *hw); int iavf_reset_complete(struct iavf_hw *hw); diff --git a/sys/dev/iavf/iavf_vc_common.c b/sys/dev/iavf/iavf_vc_common.c index 9470d764d610..5f39f0334e83 100644 --- a/sys/dev/iavf/iavf_vc_common.c +++ b/sys/dev/iavf/iavf_vc_common.c @@ -726,12 +726,8 @@ iavf_config_rss_key(struct iavf_sc *sc) int msg_len, key_length; u32 rss_seed[IAVF_RSS_KEY_SIZE_REG] = {0}; -#ifdef RSS /* Fetch the configured RSS key */ rss_getkey((uint8_t *) &rss_seed); -#else - iavf_get_default_rss_key(rss_seed); -#endif /* Send the fetched key */ key_length = sc->vf_res->rss_key_size;