From nobody Thu Oct 29 07:41:30 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 4jFblH5CMqz6wGSM for ; Thu, 29 Oct 2026 07:41:31 +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 4jFblH1JB6z4SQj for ; Thu, 29 Oct 2026 07:41:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793259691; 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=6E4oh91Owm8v2EATe+PoQg9T9xe76cgu77pQB4xBti0=; b=wQNUcFscI48GEzCmiX33x+QC/hDLeNkKE4PpNT+5LOJPbSGsHbutaiD3m+xupwKBpCAeV7 fdfTJHkErHcKKlNaoHuNL2QJIeikWobn1L3gMSGH7iT0q0JuNnxkHNXCQlPMeP1HsfXW/0 VQAdqRn66jWXbb9Jhl4dPk6qPv6o+0kV+YV1ZPr1Si/cBLaotqyq6JPQhF3XykL02lbrLR I5CTjTH82kpO83w2xGUFp+hvn+jPGSjClozONPCBGYuIDzmYo+jjAb9q9DCGzcpVoYmYH7 6vH/AeZCgiR0+C5RjGx+vk7dQ1ggMwgxTpzudnEvTdXBoZh3QCSO/TArQ16fNQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793259691; b=aNl5MEcSycTzBFj90xuSe8KLjwz3HdJjc/0s7SSsjA0+MHfnWjHgnDu5XIsI/WOyXnC9QM XYOKjebm/23rDb3GNKOLZkLZzPLTNe83MnwNG+gszV/TAc+vhlczX8h2MVm8TUGppzkFyU VNU2qUVRngheoDt7S4iIhNedWZ/VY7gPwq8G3GOlgU6CEW5R0UJGRZG+tk+BV5zr2K4vDa kktlLZ8UK2t4L67+P+tb7J4Hmlk4uftcmXgjH0yk9IcB7pt9J1Gy8RLgjIMWdvUbNrFa5N yOOnRdbioE+FKlqK1c9Q6x4qOySbMqqg9fS5de1fBZA1lAeB9+LgcqgLepinpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793259691; 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=6E4oh91Owm8v2EATe+PoQg9T9xe76cgu77pQB4xBti0=; b=aJMGZAM2YNvwssgI3aSKyZp3JMk3kP4BIhefIS14u+iDNhW/lNURgMVTII2UhrvCHS72az yAZW1yXQHh1o1/BGQLtzLZOnhFHeO4SXLGRqMr2bgcCUspB7cQRpT0GRdchozGyzADID95 AzS0kEbbnVGHU/bvx2jmQBGAUPqoAadJe8tFjgqrhSl6vQMkCbmX9gjGeLly83BF91d4yb 7SS59X2Md69I8AHjVuCNeLXcACXwhJH5rYn9ETqn2tIX7hYH8STVmJIEdev7/j99vS0SiJ sGTQogXjseAmF+eS5xXNamnyYc/i9DzICEy3UnzFqirm03HmbAoj/CUwK1jE0A== 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 4jFblH0LT6zTr3 for ; Thu, 29 Oct 2026 07:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44f0e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 07:41:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Cheng Cui From: Kevin Bowling Subject: git: d81f1200785a - stable/15 - tcp: restrict flowtype copying to specific RSS TCP types List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: d81f1200785ac3c9901c0ecfde36fdb577ffc3cc Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 07:41:30 +0000 Message-Id: <6ae2f8aa.44f0e.43f4f0ce@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=d81f1200785ac3c9901c0ecfde36fdb577ffc3cc commit d81f1200785ac3c9901c0ecfde36fdb577ffc3cc Author: Cheng Cui AuthorDate: 2026-02-09 22:39:50 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 07:37:58 +0000 tcp: restrict flowtype copying to specific RSS TCP types Reviewed by: gallatin, tuexen Differential Revision: https://reviews.freebsd.org/D55196 (cherry picked from commit a485399f88348efbe52aad2fa9b14af8b9ae55c7) --- sys/netinet/tcp_syncache.c | 4 ++-- sys/sys/mbuf.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 84f19a3ee35d..7e72e5c798da 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1168,7 +1168,7 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, return (-1); /* Do not send RST */ } #endif /* TCP_SIGNATURE */ - if (m != NULL && M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) { + if (m != NULL && M_HASHTYPE_ISHASH_TCP(m)) { sc->sc_flowid = m->m_pkthdr.flowid; sc->sc_flowtype = M_HASHTYPE_GET(m); } @@ -1750,7 +1750,7 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, sc->sc_flowlabel = htonl(sc->sc_flowlabel) & IPV6_FLOWLABEL_MASK; } #endif - if (m != NULL && M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) { + if (m != NULL && M_HASHTYPE_ISHASH_TCP(m)) { sc->sc_flowid = m->m_pkthdr.flowid; sc->sc_flowtype = M_HASHTYPE_GET(m); } diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 3a584c3389ed..ac63a2b45e10 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -579,6 +579,10 @@ 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) #define M_HASHTYPE_SETINNER(m) do { \ (m)->m_pkthdr.rsstype |= M_HASHTYPE_INNER; \ } while (0)