From nobody Thu Oct 29 06:35:19 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 4jFZGv6J9Pz6xtjy for ; Thu, 29 Oct 2026 06:35:19 +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 4jFZGv2nsJz57SQ for ; Thu, 29 Oct 2026 06:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793255719; 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=uhgAV4/qNmELJ6DQGMzrubRHohwO6akJsn1/XuLUIOo=; b=LkCVLtlpMb+e3G8yHMzowKVu1nj5t1QrLSCnmdQbVQ1YwFH6O0V3DyOWzk1qRjkndE9drS ejreLkVVuk09U99IZNrb71i3GBQw5TJfzCfpkZEB+77xZopyzDv3NwSAA1FKgo2ZG120QC yx5Yy7o+iDvlXp5j8nC70b8N5cgQPC6WSv1au8HCidfSyinFAIwrlprVwg7GB1CsYCJWiS yobue9rajbXssjHlRgxPTlL0qAW/1Qyl/1cR9h7GDML0RroeQX2+zQ/pHb0XxnEdrLLXnC 8jJJIUCDkYvoqKTdmwH3IgXYFcRmxqM6LVg7q2WEZpTJPX6wAZ9D5C8Euqypfw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793255719; b=aXB991nseMvA5UWS0wEOmA+kgiYksXW4X8rpxDuv7ELK+4QfmCqu91cyGKpHk/cEbHnA+U JDmWfsFFBTD6TQtOIFAZBN1h9kEbgA7U0WChid2/jO9t7Bx2tw/3X5QYVDuD9dUhJMJy6m zcfQWTnBhDCcrBZ3T7B4w0XWhKB7oeR1cD6EFlcLd1jPrMtJKyvbG1nPoV3lHOyMbESO0v Lq2CX78dkdk8fFkaSjILW5ehxUcdRrrW3If65X1++iKmMHcFwoaIuxvJe4AbyDhCw4geY9 Jm1z+6o9yi/76Ml1Uu0ul/A1JSqzQEVd1y109XR6c9xoZ7Tf+lTlN9LkyaifHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793255719; 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=uhgAV4/qNmELJ6DQGMzrubRHohwO6akJsn1/XuLUIOo=; b=uJxaeE8/5Ox6d5uOhTwmbx+mkOfWmZa/6I/XdWJ7qD1WAt9xoDHOi6eEvgHJqtsW/dmaJZ MZuDbfar4cm/8/O7dLieHL7+rlyn6c3+bobhgwo8xcwawxE55LsdLgyvN2dkaLwxudmEJO 0+d6yWdoeht/hheZRZbIi7bmOFb+q8eps8eSsEKN5bJ/6JnC75qPoFLr2Q/TK1K+/99v8Q FdImDa3a9tjB/7DK+rF0x6SdvFQerxvC4KdAkfcBuejuLEfkUFwCDgYYV58exSQJb40SFE Rmq1TUTT4XOym30fbrianeTTCJYpd98CR4RhApXUyyR/FFv8mshD/OM5bKWwbQ== 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 4jFZGv1yLKzRWS for ; Thu, 29 Oct 2026 06:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b6e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:35:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Krzysztof Galazka From: Kevin Bowling Subject: git: 2f786c58c608 - stable/15 - ice(4): Remove unused function 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: 2f786c58c60840557f4727b010e4df528a7c78f9 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:35:19 +0000 Message-Id: <6ae2e927.3b6e3.48ef7d9e@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=2f786c58c60840557f4727b010e4df528a7c78f9 commit 2f786c58c60840557f4727b010e4df528a7c78f9 Author: Krzysztof Galazka AuthorDate: 2025-12-18 19:47:50 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 06:26:40 +0000 ice(4): Remove unused function rss_getkey function is now available even if kernel RSS option is disabled. This makes ice_get_default_rss_key no longer needed. Signed-off-by: Krzysztof Galazka Reviewed by: gallatin Approved by: kbowling (mentor) Fixes: 012ecdde3a810 ("ice: use newly exposed RSS hash key API rather than ad-hoc hashing") Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D54281 (cherry picked from commit ca10598b10bc906938195af2268256ae08647039) --- sys/dev/ice/ice_lib.c | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/sys/dev/ice/ice_lib.c b/sys/dev/ice/ice_lib.c index e84895393175..2e29ed5f2073 100644 --- a/sys/dev/ice/ice_lib.c +++ b/sys/dev/ice/ice_lib.c @@ -90,7 +90,6 @@ static u_int ice_sync_one_mcast_filter(void *p, struct sockaddr_dl *sdl, u_int e static void ice_add_debug_tunables(struct ice_softc *sc); static void ice_add_debug_sysctls(struct ice_softc *sc); static void ice_vsi_set_rss_params(struct ice_vsi *vsi); -static void ice_get_default_rss_key(u8 *seed); static int ice_set_rss_key(struct ice_vsi *vsi); static int ice_set_rss_lut(struct ice_vsi *vsi); static void ice_set_rss_flow_flds(struct ice_vsi *vsi); @@ -7346,38 +7345,11 @@ ice_add_rxq_sysctls(struct ice_rx_queue *rxq) "Traffic Class that Queue belongs to"); } -/** - * ice_get_default_rss_key - Obtain a default RSS key - * @seed: storage for the RSS key data - * - * Copies a pre-generated RSS key into the seed memory. The seed pointer must - * point to a block of memory that is at least 40 bytes in size. - * - * The key isn't randomly generated each time this function is called because - * that makes the RSS key change every time we reconfigure RSS. This does mean - * that we're hard coding a possibly 'well known' key. We might want to - * investigate randomly generating this key once during the first call. - */ -static void -ice_get_default_rss_key(u8 *seed) -{ - const u8 default_seed[ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE] = { - 0x39, 0xed, 0xff, 0x4d, 0x43, 0x58, 0x42, 0xc3, 0x5f, 0xb8, - 0xa5, 0x32, 0x95, 0x65, 0x81, 0xcd, 0x36, 0x79, 0x71, 0x97, - 0xde, 0xa4, 0x41, 0x40, 0x6f, 0x27, 0xe9, 0x81, 0x13, 0xa0, - 0x95, 0x93, 0x5b, 0x1e, 0x9d, 0x27, 0x9d, 0x24, 0x84, 0xb5, - }; - - bcopy(default_seed, seed, ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE); -} - /** * ice_set_rss_key - Configure a given VSI with the default RSS key * @vsi: the VSI to configure * * Program the hardware RSS key. We use rss_getkey to grab the kernel RSS key. - * If the kernel RSS interface is not available, this will fall back to our - * pre-generated hash seed from ice_get_default_rss_key(). */ static int ice_set_rss_key(struct ice_vsi *vsi) @@ -7388,16 +7360,16 @@ ice_set_rss_key(struct ice_vsi *vsi) int status; /* - * If the RSS kernel interface is disabled, this will return the - * default RSS key above. + * Even if the RSS kernel interface is disabled, this function + * is still available. */ rss_getkey(keydata.standard_rss_key); status = ice_aq_set_rss_key(hw, vsi->idx, &keydata); if (status) { device_printf(sc->dev, - "ice_aq_set_rss_key status %s, error %s\n", - ice_status_str(status), ice_aq_str(hw->adminq.sq_last_status)); + "ice_aq_set_rss_key status %s, error %s\n", + ice_status_str(status), ice_aq_str(hw->adminq.sq_last_status)); return (EIO); }