From nobody Tue Feb 10 15:09:27 2026 X-Original-To: dev-commits-src-main@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 4f9Q2c2KLpz6RS65 for ; Tue, 10 Feb 2026 15:09:28 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9Q2c08Snz42tZ for ; Tue, 10 Feb 2026 15:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770736168; 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=IsUz8+X+M9BSRdvJlrEBFX+/VvpFp13s9HNWNEj2L1c=; b=Gf/3IreWZwN5vwAyOcMc9h0p1hfFUb73b8McTr+zMggc4LRi9BSBynMgnp477xfos4jLL4 fDCp0wDQ+fV5EmvskYRF3TKfH/GxL7ZYfDGLENEl1/yYOymity4i/glT/Z4REYL+bL75Nl taf4jeH0IiOnTvueQwTR+zNJD2eXeuG22lnhxp4eKl61joNMVmeRq1OYtiW1Jx9tzIBwPH Qxtc0052Y3Pwv8H5OW+kVOWHuBq4cfARcsyZNARF38dmTrHncSUwcwP3LXfqPlhPfbV6eN x3DfIiardDP4p2PYpwN5nDx/RjLvsFdplCKK9oF1zJo1gd0G825It9VC9q4mIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770736168; a=rsa-sha256; cv=none; b=S2HsWDRj+NjvSf2w8cKarKTCenbrg+1apd9p+WbXBlsc+UvZUXqy65p5VzMLSof4m0g+ak B1XogX/I476McmKOPYEuNLp/C4kP/XUx88CLxMfqeURaEAj98giobZVhLw4D8JmLApP4Kl +vn/ND8A1L7cVsAFexym4HHUizVIm1H2CoUYWqHLBVDIstUpU0sZPqMaJ604TQkrk5HKoW lFV30fM9um3xX/tXSO697h9elnjPRkMXIsPdtmWu/2xQ78c4JI1RtP9riJMe7BXv28vHtm B1EZN4ohfoQXYur+oNS0L69Vt/jpmmuJzdDjOF/cVO3HQUzJL4nhqfeYap9ilA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770736168; 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=IsUz8+X+M9BSRdvJlrEBFX+/VvpFp13s9HNWNEj2L1c=; b=k+KHG74xAmnywx273xyAQWDD6RVwSGjwYYqh9zbpXYbpIJA8IKEJMp+GwUc9408uLixg4J 6WC+dLaVCxGkoXIWBVx8cOcva77EJZeQWN1A1CkWHl+So6sLNxfwa9nkfsFwc5T2Ykc6DV I9m/RmTCEnWt6V2FjQjSAfazu0S322FtqgFagjBLCMwdJ1CJwN+NGWMNgKRoQZRSWQjUrr CxMnwUrsO3OnbDpuHcv3uwgPkXLOB06qO7bxZwnb+wK6TjxmcM8d0MiypgDMxWa5sLt3yW lve0n4uO5VJqaWFQldwkuZjFDmnqXk5c2IAEJTjv0mMZrwRFq/X6ieDSGgE1rA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9Q2b5qkzz1MVH for ; Tue, 10 Feb 2026 15:09:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43b9f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 15:09:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: a485399f8834 - main - tcp: restrict flowtype copying to specific RSS TCP types List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a485399f88348efbe52aad2fa9b14af8b9ae55c7 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 15:09:27 +0000 Message-Id: <698b4a27.43b9f.2290244f@gitrepo.freebsd.org> The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=a485399f88348efbe52aad2fa9b14af8b9ae55c7 commit a485399f88348efbe52aad2fa9b14af8b9ae55c7 Author: Cheng Cui AuthorDate: 2026-02-09 22:39:50 +0000 Commit: Cheng Cui CommitDate: 2026-02-10 15:08:57 +0000 tcp: restrict flowtype copying to specific RSS TCP types Reviewed by: gallatin, tuexen Differential Revision: https://reviews.freebsd.org/D55196 --- 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 4b501b221bcb..1d628bce0d80 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1173,7 +1173,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); } @@ -1771,7 +1771,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 1f1b05857ebf..1e09891d259f 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)