From nobody Thu Oct 29 06:57:15 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 4jFZmD48vnz6xvwm for ; Thu, 29 Oct 2026 06:57:16 +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 4jFZmD1GkJz4Hbh for ; Thu, 29 Oct 2026 06:57:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793257036; 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=+WghioW+5Edz2jOGk1+vzQfn2w4tFd7akYZhvf4O7s8=; b=S5bAebZaed/sPX9ksvSqmNmK1lbIBXkpQ+tzZ0wHMWmc7geCmoCSF8voiladon3D/tz70a mg+ibVctGh5R62YgedtBA9DysXbaZQ/KnWyHpdx21givyha2JyI+XqgghcqpAjG41UtF3i MPJkKk5wD/jvByER53rINIFCW4D+cuqAg9LVyiQXEXsy5R8sHdNJr+n6HvuQd1kV3MeQ6F k8IrvcWbH00ApsqW/s4GcruMO86qB4S8RIGPOv7cjLJ3cFzUTzPGW/zjSbqvW/OjqxH6xz QxhpALY6H1ClT2DLIX6zXLVfypd/71iuFxezrn92DNileIVqemoChKQxRDRBvg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793257036; b=s0wDJFr10pkZ/QMbeQ+bmqz4DeMYj77rJtvCu88R0SIUhSlVR8qjeiKUV8w9IV0UAPENVy 7cIOEHtnRQqfnOQAMJvBplIID2VA9HLkkzwv1uHV9YH/xDnDI/ciOFBdWss4SjesfUSMMW vzyl0YVZbF/R2528AN/hYsOTQ4mmxBF1q5rsROZaPVSkCGUwAIwj+osceXEYtsWcv3V1G3 5J2l5zB3P7jLyMru8fLApEezqm8IjnRFUNbuQ7dWBmGT98XMypAwCVE5RIzg9ftwP/IutA Ono/ZkSB/cdOKGpKRscY4pw6sypZ5UvPyZCyxH45+BwJ5B/rIdmq8OWpk3jy5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793257036; 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=+WghioW+5Edz2jOGk1+vzQfn2w4tFd7akYZhvf4O7s8=; b=ug1istfaGpnM1Gmyt9CKTwVHHKQuDIJUsNWfJvugCr19vQ93ARRAY/+BKTorkuXIVpZAOF vsj06/2uW0WcPVvrqIY2wecaR+57IufEw6/uaAthCWuQp/ouYHk8xZgctscPpAqaX/qAYs um2WhVIihmrSsyxsQLI9ogGYl5t3ic/lh8PUg+3UljaMVNcttz7MGfs8ZE+7z5CGv4wcmI OnCOdQUY3LStjBnGDyycqxqTmrv/3xavKpnI1mvyrasVepTJm9edF+qCD33WhA90hn2uGF LDsey7wCaMoaXsXKDSGoQRy9vsPovFozOYOqPZ3E7KZme9PTkkWCD5vFVKMXEw== 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 4jFZmC6V2czSRh for ; Thu, 29 Oct 2026 06:57:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40565 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:57:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: R. Christian McDonald From: Kevin Bowling Subject: git: 6ede1a5a70b6 - stable/15 - igc: make the hardware RSS hash agree with the stack's configuration 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: 6ede1a5a70b6cc50bb614583c7e68817bb12136e Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:57:15 +0000 Message-Id: <6ae2ee4b.40565.35995aa6@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=6ede1a5a70b6cc50bb614583c7e68817bb12136e commit 6ede1a5a70b6cc50bb614583c7e68817bb12136e Author: R. Christian McDonald AuthorDate: 2026-10-04 12:00:51 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 06:54:44 +0000 igc: make the hardware RSS hash agree with the stack's configuration rss_gethashconfig() is available without options RSS since d9c55b2e8cd6. Use it to program MRQC, as ixl(4), ice(4) and iavf(4) do, instead of a fixed field set that included UDP 4-tuple, which the configuration excludes unless net.inet.rss.udp_4tuple is set. UDP is now hashed on addresses only by default. Also report the UDP hash types on receive; they were passed up as M_HASHTYPE_NONE. Reviewed by: kbowling Fixes: 517904de5cca ("igc(4): Introduce new driver for the Intel I225 Ethernet controller.") Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D60284 (cherry picked from commit 66ff9289b041720f29205f179337f81b5dd0c365) --- sys/dev/igc/if_igc.c | 30 +++++++++++++++++++++--------- sys/dev/igc/igc_txrx.c | 6 ++++++ 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index 08d15ae14141..7bfbf1c9d1a7 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -2242,6 +2242,7 @@ igc_initialize_rss_mapping(struct igc_softc *sc) int queue_id; u32 reta; u32 rss_key[RSSKEYLEN], mrqc, shift = 0; + u32 rss_hash_config; /* * The redirection table controls which destination @@ -2307,16 +2308,27 @@ igc_initialize_rss_mapping(struct igc_softc *sc) IGC_WRITE_REG_ARRAY(hw, IGC_RSSRK(0), i, rss_key[i]); /* - * Configure the RSS fields to hash upon. + * Configure the RSS fields to hash upon. Hash exactly what the + * stack hashes, so that hardware and software agree on the hash + * of a flow. */ - mrqc |= (IGC_MRQC_RSS_FIELD_IPV4 | - IGC_MRQC_RSS_FIELD_IPV4_TCP); - mrqc |= (IGC_MRQC_RSS_FIELD_IPV6 | - IGC_MRQC_RSS_FIELD_IPV6_TCP); - mrqc |=( IGC_MRQC_RSS_FIELD_IPV4_UDP | - IGC_MRQC_RSS_FIELD_IPV6_UDP); - mrqc |=( IGC_MRQC_RSS_FIELD_IPV6_UDP_EX | - IGC_MRQC_RSS_FIELD_IPV6_TCP_EX); + rss_hash_config = rss_gethashconfig(); + if (rss_hash_config & RSS_HASHTYPE_RSS_IPV4) + mrqc |= IGC_MRQC_RSS_FIELD_IPV4; + if (rss_hash_config & RSS_HASHTYPE_RSS_TCP_IPV4) + mrqc |= IGC_MRQC_RSS_FIELD_IPV4_TCP; + if (rss_hash_config & RSS_HASHTYPE_RSS_IPV6) + mrqc |= IGC_MRQC_RSS_FIELD_IPV6; + if (rss_hash_config & RSS_HASHTYPE_RSS_TCP_IPV6) + mrqc |= IGC_MRQC_RSS_FIELD_IPV6_TCP; + if (rss_hash_config & RSS_HASHTYPE_RSS_TCP_IPV6_EX) + mrqc |= IGC_MRQC_RSS_FIELD_IPV6_TCP_EX; + if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV4) + mrqc |= IGC_MRQC_RSS_FIELD_IPV4_UDP; + if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6) + mrqc |= IGC_MRQC_RSS_FIELD_IPV6_UDP; + if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6_EX) + mrqc |= IGC_MRQC_RSS_FIELD_IPV6_UDP_EX; IGC_WRITE_REG(hw, IGC_MRQC, mrqc); } diff --git a/sys/dev/igc/igc_txrx.c b/sys/dev/igc/igc_txrx.c index 0f88a0a5acd5..ef17978244ef 100644 --- a/sys/dev/igc/igc_txrx.c +++ b/sys/dev/igc/igc_txrx.c @@ -611,6 +611,12 @@ igc_determine_rsstype(uint16_t pkt_info) return M_HASHTYPE_RSS_IPV6; case IGC_RXDADV_RSSTYPE_IPV6_TCP_EX: return M_HASHTYPE_RSS_TCP_IPV6_EX; + case IGC_RXDADV_RSSTYPE_IPV4_UDP: + return M_HASHTYPE_RSS_UDP_IPV4; + case IGC_RXDADV_RSSTYPE_IPV6_UDP: + return M_HASHTYPE_RSS_UDP_IPV6; + case IGC_RXDADV_RSSTYPE_IPV6_UDP_EX: + return M_HASHTYPE_RSS_UDP_IPV6_EX; default: return M_HASHTYPE_NONE; }