From nobody Thu Dec 18 19:51:01 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 4dXLrQ15Tgz6LdTw for ; Thu, 18 Dec 2025 19:51:02 +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 4dXLrP4G6Mz3Hms for ; Thu, 18 Dec 2025 19:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766087461; 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=ZG0ODgKyWgMmI86PF0Wcp+wstEIcGCf9XFh4MkTXhBc=; b=srbMIsBzW4HWuzjNSo9V2PfJ+AQma03+MIkrhHVQtqTwDDK23xKs7nSerU4KmKeo8bVC58 Ou3iVD3i0pj9xvsJlwrRS9QC1Zi9X1sN46nNgLHtGIHZLdIi+LasAxNyGxJQSVZyYVF0ZA knIC/5mAZ2Yshgl3BsswoaBdsopqkSUvdN9iSC956aSXRcDygS75/6yKVMhVpjzbKWne1k bF8/vVYsGbaHLfE9VVbZcX0gu4VtJ1nJ+55AM0N/WHHKGsF30mwNuOeJwg53qv0Q+Kq6ok hpVJEhv3m52Iab6+9EgqQXoGYzfzE+BVFJk4Ud3ILrRONoiIBE/KpfVqZU4a3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766087461; 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=ZG0ODgKyWgMmI86PF0Wcp+wstEIcGCf9XFh4MkTXhBc=; b=hqZAZLS6jU0whvRs9AQAQTH6aZaMLmGLPlh7hlUiHKuCLUcQhfydMcTwto15z4wsI6wePc U254ImhHRZfCHnJFqQieR2UXY6SNn7t2zwF5xNohqA4iieJRkPCbnJUmkNVbPplMJG9K6W uYIo7HjLvbS8Yl7pFiV5nyMsj4aUdYrv70JDd/2MftycIMv7SNaPW+GjZeR6cElgJjIL7D TH2q/CFmlz8eXJo49kG2MZ8a7U/rwztHs2bR79BXyk1DuGUntJ1MiBOVbz6Bnh45/cjL57 NPRZJBtLIIFLZqocXI6DeSJHjPvSra5VMgFNOGHGnxTyoPc1ARiKozgKqq8v0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766087461; a=rsa-sha256; cv=none; b=Urs+l3YBXt5DhU5ltMTel4NoFX8Ab7MHwiV+MBh4kER89drQC3fcNIEMsO8z/x4VI8is3n kpsIrfut23aE/ycaaPJYm1sMETpFcF59X1h2TeRj+CUr2+9Lge44i8CgFzNr1rjLiepSO6 Ju50eT8Pb466Yj81lUBpD3eiJFnWcUfC6rJQvHaSsA2xVK2WW2iq5O+imIg26oZ0D7nBQd dIChRDDZVz7LQ8+88icseULzR4Al69UbmBtNTtjJ645sUHugh5U4IQR5kG/vmx22zBG2vl 2gvxOWjeJnMKOpL5yyPwNPLDvJX+OBuVoLt8zO4EYvwbaRuN8HRWZEPWOsoA+Q== 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 4dXLrP2pHgzs88 for ; Thu, 18 Dec 2025 19:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3667e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Dec 2025 19:51:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Krzysztof Galazka Subject: git: ca10598b10bc - main - ice(4): Remove unused function 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: kgalazka X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca10598b10bc906938195af2268256ae08647039 Auto-Submitted: auto-generated Date: Thu, 18 Dec 2025 19:51:01 +0000 Message-Id: <69445b25.3667e.497fadbf@gitrepo.freebsd.org> The branch main has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=ca10598b10bc906938195af2268256ae08647039 commit ca10598b10bc906938195af2268256ae08647039 Author: Krzysztof Galazka AuthorDate: 2025-12-18 19:47:50 +0000 Commit: Krzysztof Galazka CommitDate: 2025-12-18 19:50:45 +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 --- 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 393726eb1f59..baf5c6889aa8 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); @@ -7341,38 +7340,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) @@ -7383,16 +7355,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); }