From nobody Thu Oct 29 22:30:06 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 4jFzSb0bfzz6xlnF for ; Thu, 29 Oct 2026 22:30:07 +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 4jFzSZ6mtqz4f1y for ; Thu, 29 Oct 2026 22:30:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793313006; 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=5SZE/WKKfnSCPZKoQRa/toLqRnu7IPITbajgsT5Hi0Q=; b=OO08MxVz4XgZnKcALvSF71WJROSkDbZxKUdCWTI/TQyYygLWhJKtT6czpdF4Y5zUsIg9zX TAd+NClcqpTzDmG3sHTc5+9vDNN9bnslH8gGR7f81ykNAg87VpjzBQzE/C0im2XK4U/Tyx HlRKB+HEiK5SCSE0HstB7cKxHfzSnes38GhcYYgH58+UKWx447v2X06BGVXuD8MjXjHReE l6Usz6ZhAWqW+7onmuSuxKdyPW6pe+CPsW2r+Or5wBFjDQEcf0+MzsB2MH4klYWTB7spaB 98l+TnqadpKGJSu+oMdcQwdvLH/LvOKBc/bTINSaUmx9nilJYjvWYolm3AFkIQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793313006; b=kVKQQBuTYJMRo425b4CBAhdQ/18beBMx2wfoLByZHU+q3hSEUDsp6WzxnHSbgJqLGhB7XW swMQH4cSP+GntLxm4kQOsV0EMiOONBFrBd++olyYTn/09WQz11d0VYiWOJusCOYYNgjPm6 dilWA4VQdYExJgBk/rWvIkZ/8ml0fPM2c7xzfR+7txBPGkHfv8XAe+dpcr7gn4VGO/SyRH MN2tgNsH4cj0Oko1pSU7hN9ieZos+eH3uf2dIwftGlOyqL027D5XTOCjtuzZyuWYPdpjPX UsHOdvXFtAm7fk6XaC/SjwAkizfXw7F56p3IgErUp+5qtjlomFdPGvHlAhcAVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793313006; 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=5SZE/WKKfnSCPZKoQRa/toLqRnu7IPITbajgsT5Hi0Q=; b=CZusSFDik8prUEhQgtlAfPI7TgIMKLCuTzztdYzgZNZyyvm3zgPE3l9v29PBKp/riwNw87 eY6IjUtJpe1bKVJNNJHCQOno9BuLsPL9J9BNv2vXJAPgEmh1yzlqmGI4bJDb6hZKEumeiP f74opDzVHjHeqjirZktbOt5+Qi+D9AH9ki2NlgI3rCgRVHN7bRCFf+XW/I1NNnSOlun20u nyqMWVpnl23Qc9wCYL972hLrdwcA3XamAYKF1UcINfwIYIW9+McnTiiHyUlUvMohco2wfi yurHiyvrumP0amW3N2Te+9OcLhs93rcLt7rUl3eYOXdnY77a0EOQSesEFKzOHA== 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 4jFzSZ6R7Czyt9 for ; Thu, 29 Oct 2026 22:30:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34353 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 22:30:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 938fa80e4b48 - stable/15 - mbuf: Match TCP RSS hash types exactly 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: 938fa80e4b48987c6497534de7a1b8fe0e13ab66 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 22:30:06 +0000 Message-Id: <6ae3c8ee.34353.1854704e@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=938fa80e4b48987c6497534de7a1b8fe0e13ab66 commit 938fa80e4b48987c6497534de7a1b8fe0e13ab66 Author: Kevin Bowling AuthorDate: 2026-10-29 07:15:14 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 22:29:45 +0000 mbuf: Match TCP RSS hash types exactly RSS hash types are encoded values, not independent flags. The bitmask check in M_HASHTYPE_ISHASH_TCP() also accepts UDP, address-only and opaque hash types, causing the syncache to retain them instead of falling back to a software TCP hash. Compare against the three TCP four-tuple hash types after masking the inner-header flag. Keep the existing macro interface and use an inline helper to preserve single evaluation of its argument. Add ATF coverage for all 256 hash-type byte values, including inner-header hashes, and verify single evaluation of the mbuf argument. Reviewed by: cc, gallatin Fixes: a485399f8834 ("tcp: restrict flowtype copying to specific RSS TCP types") Sponsored by: BBOX.io (cherry picked from commit b06db8c9dafb1734923e0483323920b4b0a05cc9) --- sys/sys/mbuf.h | 21 +++++++++++++++---- tests/sys/sys/Makefile | 1 + tests/sys/sys/mbuf_test.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 4 deletions(-) diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index ac63a2b45e10..3f1c48b41b2a 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -579,10 +579,23 @@ m_epg_pagelen(const struct mbuf *m, int pidx, int pgoff) #define M_HASHTYPE_TEST(m, v) (M_HASHTYPE_GET(m) == (v)) #define M_HASHTYPE_ISHASH(m) \ (((m)->m_pkthdr.rsstype & M_HASHTYPE_HASHPROP) != 0) -#define M_HASHTYPE_ISHASH_TCP(m) \ - (((m)->m_pkthdr.rsstype & (M_HASHTYPE_RSS_TCP_IPV4 | \ - M_HASHTYPE_RSS_TCP_IPV6 | \ - M_HASHTYPE_RSS_TCP_IPV6_EX)) != 0) + +static inline int +m_hashtype_ishash_tcp(const struct mbuf *m) +{ + + /* Hash types are encoded values, not independent bits. */ + switch (M_HASHTYPE_GET(m)) { + case M_HASHTYPE_RSS_TCP_IPV4: + case M_HASHTYPE_RSS_TCP_IPV6: + case M_HASHTYPE_RSS_TCP_IPV6_EX: + return (1); + default: + return (0); + } +} + +#define M_HASHTYPE_ISHASH_TCP(m) m_hashtype_ishash_tcp(m) #define M_HASHTYPE_SETINNER(m) do { \ (m)->m_pkthdr.rsstype |= M_HASHTYPE_INNER; \ } while (0) diff --git a/tests/sys/sys/Makefile b/tests/sys/sys/Makefile index a1b4e3234e1c..9993fdf64ed9 100644 --- a/tests/sys/sys/Makefile +++ b/tests/sys/sys/Makefile @@ -6,6 +6,7 @@ ATF_TESTS_C= arb_test \ bitset_test \ bitstring_test \ buf_ring_test \ + mbuf_test \ qmath_test \ queue_test \ rb_test \ diff --git a/tests/sys/sys/mbuf_test.c b/tests/sys/sys/mbuf_test.c new file mode 100644 index 000000000000..3d77d4f04d4c --- /dev/null +++ b/tests/sys/sys/mbuf_test.c @@ -0,0 +1,53 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 Kevin Bowling + */ + +#include +#include + +#include +#include + +#include + +ATF_TC_WITHOUT_HEAD(hashtype_ishash_tcp); +ATF_TC_BODY(hashtype_ishash_tcp, tc) +{ + static const bool expected[UINT8_MAX + 1] = { + [M_HASHTYPE_RSS_TCP_IPV4] = true, + [M_HASHTYPE_RSS_TCP_IPV6] = true, + [M_HASHTYPE_RSS_TCP_IPV6_EX] = true, + [M_HASHTYPE_RSS_TCP_IPV4 | M_HASHTYPE_INNER] = true, + [M_HASHTYPE_RSS_TCP_IPV6 | M_HASHTYPE_INNER] = true, + [M_HASHTYPE_RSS_TCP_IPV6_EX | M_HASHTYPE_INNER] = true, + }; + struct mbuf m = { 0 }; + + /* Only TCP four-tuple hashes qualify, including inner-header hashes. */ + for (u_int type = 0; type < nitems(expected); type++) { + M_HASHTYPE_SET(&m, type); + ATF_CHECK_MSG(!!M_HASHTYPE_ISHASH_TCP(&m) == expected[type], + "hash type %#x: expected %d", type, expected[type]); + } +} + +ATF_TC_WITHOUT_HEAD(hashtype_ishash_tcp_evaluate_once); +ATF_TC_BODY(hashtype_ishash_tcp_evaluate_once, tc) +{ + struct mbuf mbufs[3] = { 0 }; + const struct mbuf *m; + + m = mbufs; + ATF_CHECK(!M_HASHTYPE_ISHASH_TCP(m++)); + ATF_CHECK(m == &mbufs[1]); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, hashtype_ishash_tcp); + ATF_TP_ADD_TC(tp, hashtype_ishash_tcp_evaluate_once); + + return (atf_no_error()); +}