From nobody Fri Nov 13 00:39:35 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 4jQdgW1nbjz6xvYw for ; Fri, 13 Nov 2026 00:39:35 +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 4jQdgW18S4z4fRm for ; Fri, 13 Nov 2026 00:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794530375; 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=gpKq+Xn36QqAK0y1XfkKp+uKVOx+sOea0DnHsZKADBE=; b=wFbcVoWU3z4q+8AjsboIHLOnjdEXWgva3u7ySr2Za5ZVwdCo1Xzs/NCrWTvHuFSPrxClE2 6lQu7zEPB+6cwKgWmEdCM1UYOCDApTeUlNsRCyKweBG8ztaD07NFe/ktkTYmi+48erzyCR YRCRoAQUUKO4rOKgeWErob5sb4KBsGmhMknxKRAWAD3MN8AMYut31iQ6tDe1mFLsIh7eCx EL8SJ6ChuplUa+kIM6zWQ6fU2a3Y842Xbn37Rbi82qEW8V+cTNFWUSJ5v/+CcVSlTtgGSx a4KEBSA4u/mmcWhM3nOuHEq3YW4cF1oXk93FePBpd4CA9f3R14jdmZt5LWp04w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794530375; b=VuxkKwibpvQftm3reSRCkGdsE7o53RiSj0nA/BcLr5VrHLaUnMfQnzt+czkcuJwOu3rsfL MHIUJSldG8sQsknTsIK0C9i5MPrRs//Au9j9dwX6h0/Dn8SRkZinNBFWI2zt1Vmuisz4V6 jJzQ0ybpWGx0JOeUztZVn55I7aJJdvzHonqGtNpxdaS3dBSPr8dnwZFC7uyIqueNpoURIF hglxe/7YPaxgmMvry2rSTXkGiunI2K/G0C50c7Q3FGsE3zGz6tY3PhJE6g7KlQYrwRBDkk 3de35TLQumm1KCRREKVu7LdRnMasOo0Oh2G8F1kdorjQaw3VitaZhTzwknlB2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794530375; 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=gpKq+Xn36QqAK0y1XfkKp+uKVOx+sOea0DnHsZKADBE=; b=cXFNCGttk/YLjta6+A2iUm6C0lUcwmTFW2JBDkJUoBJBzmuEPvoszJxh7k/af9IV/KDnB8 wz9L3bbjF4AqkMh1NXt2JmA1Mwuee/bQCt9oBvOovzrgnCH5wT5+hk8be8JkAkVSEvrb5u N0IqkUK4ju9HRKFe9wWxRTaQUT/zFIJgWjCHD0HQLgizk8sdv4Mjs5TKrUt32ki2ZEinyE 5Zd8Qsffdcf98uFTI+S7VLW0w15BOdiA7Oj+uZbH37g79khIv/zGwhN60S/fTaay68gWpC 5ipX1GMrOHAQnxZoZ4dy6jbZ0XId9GWhSav/cQ4XLDUo8TYQfYgdIRLUPVjihA== 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 4jQdgW0qGHz1QCl for ; Fri, 13 Nov 2026 00:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 15311 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 00:39:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: e71bd1775af0 - stable/15 - mlx5en: Report the configured RSS tuple selections List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: 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: e71bd1775af01f884489d18acaf38b44f7f5f97e Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 00:39:35 +0000 Message-Id: <6af65c47.15311.63e7448c@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=e71bd1775af01f884489d18acaf38b44f7f5f97e commit e71bd1775af01f884489d18acaf38b44f7f5f97e Author: Kevin Bowling AuthorDate: 2026-09-18 10:23:19 +0000 Commit: Kevin Bowling CommitDate: 2026-11-13 00:39:26 +0000 mlx5en: Report the configured RSS tuple selections Derive SIOCGIFRSSHASH's TCP and UDP selections from the same boot-time hash configuration used by mlx5e_build_tir_ctx(). The query previously advertised all six IPv4/IPv6 hash types even when the transport-specific TIRs selected only the IP addresses. In particular, the default RSS configuration disables UDP four-tuple hashing. Continue reporting IPv4 and IPv6 two-tuple hashing unconditionally, matching the driver's IP-only TIRs. Do not report IPv6 extension-header variants which the query did not previously claim. Leave key selection, TIR programming, and the receive datapath unchanged. This lets consumers such as hn(4) match the VF's hash inputs instead of enabling incompatible UDP four-tuple hashes on their own receive path. Fixes: a00718e1dfcd ("Implement SIOCGIFRSSKEY and SIOCGIFRSSHASH and mlx5en(4).") Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D59807 (cherry picked from commit 0f111a802f6beb88f3edad9fa48d3721f8b3ec7b) --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index c12cecb1064d..64fb3d7f94f2 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -2974,6 +2974,25 @@ mlx5e_get_rss_key(void *key_ptr) rss_getkey(key_ptr); } +static u_int +mlx5e_get_rss_hash_types(void) +{ + u_int hashconfig, types; + + hashconfig = rss_gethashconfig(); + /* The IP-only TIRs are always enabled, independently of hashconfig. */ + types = RSS_TYPE_IPV4 | RSS_TYPE_IPV6; + if (hashconfig & RSS_HASHTYPE_RSS_TCP_IPV4) + types |= RSS_TYPE_TCP_IPV4; + if (hashconfig & RSS_HASHTYPE_RSS_UDP_IPV4) + types |= RSS_TYPE_UDP_IPV4; + if (hashconfig & RSS_HASHTYPE_RSS_TCP_IPV6) + types |= RSS_TYPE_TCP_IPV6; + if (hashconfig & RSS_HASHTYPE_RSS_UDP_IPV6) + types |= RSS_TYPE_UDP_IPV6; + return (types); +} + static void mlx5e_hw_lro_set_tir_ctx_lro_max_msg_sz(struct mlx5e_priv *priv, u32 *tirc) { @@ -4015,13 +4034,7 @@ err_i2c: case SIOCGIFRSSHASH: ifrh = (struct ifrsshash *)data; ifrh->ifrh_func = RSS_FUNC_TOEPLITZ; - ifrh->ifrh_types = - RSS_TYPE_IPV4 | - RSS_TYPE_TCP_IPV4 | - RSS_TYPE_UDP_IPV4 | - RSS_TYPE_IPV6 | - RSS_TYPE_TCP_IPV6 | - RSS_TYPE_UDP_IPV6; + ifrh->ifrh_types = mlx5e_get_rss_hash_types(); break; default: