From nobody Thu Oct 29 06:43:24 2026 X-Original-To: dev-commits-src-all@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 4jFZSF1sJPz6xvBd for ; Thu, 29 Oct 2026 06:43:25 +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 4jFZSD4rWBz3Nmy for ; Thu, 29 Oct 2026 06:43:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793256204; 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=FxFvKBFjzoP68tX0eqlyzC2oh06nnE4C+3UgMZozAds=; b=YXwH0q0UaDMRvqdVresd8Vwd1Rn8HFTxX5T6oG8ZuvnC9iug27ETodsMHvNwgWUn1plkQf ZB73mrm3eSGg1mAc+R2Jm1PApGXxEyY8eVRRvgi8viZIt3PKGSerp6G2c5kkdgaWZstRAR 3kOZO8m3knWhssN8/tZrRXnK/oHdLgB9Zy1o4YMH+NiUGjQxwjZFa2lBmaZi6tNUHueivz Sg8vPEwIuieUjdIUPOAwdnPyu0KnO7V0NHv257wEC9NWZ4BrUCD8KMJM/DSkhMDUorEVW6 7GYvo5/rHjbx3BLFAk+1vuQS5R1+rVfyZXKtD3aLisgcLmgkPTQSna8QWznHoA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793256204; b=AEWMj8Kvw/kF/3f9XaQErdS9e5+3I7bakaJ9vK5wJ10f9Blcg/66M/ghqtbBebe9YV4PPp 5L8CkbZQ3XuSDawIkWH9a5/Yz8MrjdQajXd6ddOiI2dMI8pSv/cjTVjNfF6BOWZFgDBuL1 4uGUJyT+9Fr5KdqqrA9r+1mT/wcxLrsJaQBEZKZphnhv5UnLV4wcOzBk76h8a3nGvCy2/H nkUu3m5JnGmTuSovAjnErTh3NBUNubkBZj1vt1t5MeL7vlKZkDINF1shTV37hvucIgnMDz gIn2WBwSjImXEjucAS2OQVAGozZ2dhZKqManqJ1G3lXHz6b2y0ohNOsZ4Sjxcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793256204; 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=FxFvKBFjzoP68tX0eqlyzC2oh06nnE4C+3UgMZozAds=; b=qucmpCG2EsX5lN8qlP/wybUf0Z92EP96ooKk1gCb55mz0nw32jii3vnQLLZFQS57cjgYh9 HS0ySCugeSc4qzDEXDlzoETBslJ4uVooSLS6KU/kS7t/hGUdYRquTMyykpOFoqfQ2VGh7Z LrOMX2/36j4y7/+4jyQh62W0BBDWpgxDOfFKkSX6AwzspddHJNNqP1JSu0qHehZV6RGrCt A4p534nsQ/WSxBEvCQCBelIe8IB/Y9+VJHxKeG4jTvDlt8Y/HoIg4maCwtMFJMuhmuLXZT R42YVGPk5/B+GxchtxGq/WDSn18eWVSuDBUGPyazc1LcYpINX6qbbJpsnMc6LQ== 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 4jFZSD3vXWzSFl for ; Thu, 29 Oct 2026 06:43:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dcda by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:43:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 64480d60309a - stable/15 - iavf: Use the common RSS key without options RSS List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the 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: 64480d60309a25b9a844093cee75771e79d30865 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:43:24 +0000 Message-Id: <6ae2eb0c.3dcda.55be0a73@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=64480d60309a25b9a844093cee75771e79d30865 commit 64480d60309a25b9a844093cee75771e79d30865 Author: Kevin Bowling AuthorDate: 2026-09-18 08:09:59 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 06:42:56 +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 Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D59790 (cherry picked from commit 7f1e93b1e57fedc10e149d606c64a8610245acb4) --- 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;