From nobody Sun Oct 04 12:02:46 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 4hyLkG5wKcz6Mnbd for ; Sun, 04 Oct 2026 12:02:46 +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 4hyLkG4z6fz4PYb for ; Sun, 04 Oct 2026 12:02:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791115366; 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=Jfy38xQbSW2x4ko1ysQSetuJwm1eDr5YYexYpnhCLf4=; b=NVF3GSrhwdNSx1ByuU2SW/bpUdjFd4SWQlL9uuSmUMLFVGMfv94MSZacH9+AZeW1kG5fTe llJWD+cYOJ80VbX2FZVWNNPsMOBesCzZbBtaDXbktiFcunoxv022lwVsliq58aR6t4mp6I V3gi/4UXzBiG++CusTApyjcIHEfYuveIPbwc9/9GuYAc7B9LK3PsiMIn295A1ZZY5UKM0K 5IExestuGDab/k6EfteVNw37Nnbd/YIsN65tgv9EErotZjYIQEECnmzddDRagcy3YGiQGC NwOIHIGOVpvNXs22EMJK5klehnuht4l4iRdL39Ch7i3/lsGZzIUnc7aG0syBTg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791115366; b=rxGqCJhaZ08LHn9qoz25EvhlqWB0ZzCr87v1rMVWR/vV8S4/LHKNI4y3JN1FOfzPCszSEs UA5ZxZfp1+mdG1RLMY8ojlq6zt6xCCeECQafik2CVYss1Of7vBd/AKYfqj+EhSU37OVD6j vWOdNMXUa/DPmf5tQb6cJ4MXUYOmptvziqXktZUVnnTEmfRNN+AYCgjj+3k9zIAF05CSzI PCti2fVHz/Od/LmS+QQvoBZjPiQG8MI+1/rm8efpXNT4wLsdAx2URJ5Fdx16EDHCM4L5df gRKymvvd5GLjUP7pp7hHu/YcUxXcIKnUTr+HPQ6LnfIgWH0YTR5uB7AKhfO1WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791115366; 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=Jfy38xQbSW2x4ko1ysQSetuJwm1eDr5YYexYpnhCLf4=; b=bkk2jtFYiDxs8dPKs3AQe5VJEQWCstxy58LSw0KbXYOZVMnSEQ6/nFVW1kRy5Vtq5h8Zgp ZmITk9CDVN5fHXuai6g9qwgEMREtAcG/m6jFnT3VTFcrTaLHtzd1tGdRZBxg4CCd+lZFbH NynUZjTKBwGi5gg7Qngfce1yx6JiIE6j4N+VGMUqr9hMhNmL3ShqFfciMBIu1hSqFHsev0 h1zwWbeUG1YyJNgAaDpmeo0nWigEvE/LNozjma0NW6zCLF9RHBOTS4hazlQkEpGH8utHo8 506hSpMam06egonPFWSFskibqEZ+CqsnVTr0HQfaWGwC7o+Exj1gKy6Mm/sB8A== 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 4hyLkG42QVzYSr for ; Sun, 04 Oct 2026 12:02:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26c84 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Oct 2026 12:02:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: R. Christian McDonald Subject: git: 66ff9289b041 - main - igc: make the hardware RSS hash agree with the stack's configuration List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66ff9289b041720f29205f179337f81b5dd0c365 Auto-Submitted: auto-generated Date: Sun, 04 Oct 2026 12:02:46 +0000 Message-Id: <6ac24066.26c84.5c7d78fe@gitrepo.freebsd.org> The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=66ff9289b041720f29205f179337f81b5dd0c365 commit 66ff9289b041720f29205f179337f81b5dd0c365 Author: R. Christian McDonald AuthorDate: 2026-10-04 12:00:51 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-04 12:00:51 +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 --- 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 ed90021573ab..bc24849693e1 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -2243,6 +2243,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 @@ -2308,16 +2309,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; }