From nobody Mon Jan 5 20:57:37 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 4dlRSx4Vcrz6N2yn for ; Mon, 05 Jan 2026 20:57:37 +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 4dlRSx3m9yz3dh1 for ; Mon, 05 Jan 2026 20:57:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767646657; 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=OrzIgpqK4H8H6N+MJ7sn+gr1vreZ8XvkGkavj22qQag=; b=ZtKAz7p5+n4PpLUwUGnW5a2ukfSEvyLTO7fuDiEW/RvJ1khwNcrlRW5fVP97X+OAoBF8nN YZP2oNKcBc0fPgx7FIh4UzGwzuTtopX8ukRVkwhIKlG+KHGxTk+eBpbFnY5jfeJ0kFutTQ IK3U16eYUYBCh1wwOJU5vEarHvN/OJa96V21Y8/biQDEsZVtDDAPfs5NCtdaRshBK6O53N nQAqFoO1j+IGQaTw//VC/xb1P05tPWiP2jqvhB2iZALHLag/EHiZKg9eR7XLBQktbsjoeI Wu+8IN5zNOkWL3i43ogUJXvPXw6b9yDSBbu9/GpcpxfWkBGSPHgbYEPoyo9lYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767646657; 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=OrzIgpqK4H8H6N+MJ7sn+gr1vreZ8XvkGkavj22qQag=; b=UzMKNN8ZjzKM1G1lxZm7tqYdWzpJlVZIaNP7VWmX5lPf7l671juwltD8Ejg1Nr7sboeKow vAIVOZEjWM7RGx3MxXb7GsW11Nh2vWoYMu2TAhaNEDnin9qkBEE2JdINzIxGYJcsIo10M+ 1QiiFV1+5g6ez5FPtnXUHeZVY1iIRWrAMGBqPtLwnruumyV+GdmZRPNQ6F9n/fMB4HCz9a 2HxShXCIo/+tegz4C6My1j5RbTz5k25kk1dXdXwXhJ91n3H85hnt1R9Is0F2+NbGmmcEAp UIwFLIA9H6Gv6ZT2WbP1VJCywZq1PVERzylLwxHPQBiTTCpII2todlGhX2LjvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767646657; a=rsa-sha256; cv=none; b=V1445mIwqh5a2+1pR7c8qY76mmy9P84xEAb0xGPLBud84yDt+sFI9sfN4Wq3uVp1xpk9jl 7WE+NpnJKccf7DOFakkw8p6rzbCBlKP+yDbWahD2oyzlqr1iGuEgQVpDAD6QJ1a0eh1Ome aNBYhxAgxJkWF2k6T+Tm1I3FPP/IAe8e+uBxK1GkmCsI5XbMbkkg1Lqp7rQevFILtvtmUT igir3zEWvL90x2KVnGXNqEca8vkRSs6r7vrnHvHoLwgRdt+czt4E/5tv+T82QD6yIu4bb+ u9y1zK5XufJ0zyuj5F/5WJLtocdAICaOaEw8dAiFEl+1j8om4nqTHS7CP+VDFA== 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 4dlRSx37x1zctW for ; Mon, 05 Jan 2026 20:57:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ce8b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 05 Jan 2026 20:57:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 21865c970888 - main - tcp: Unifidef use of rss software hash in syncache 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21865c970888ad0e2cde06db843ae2a05af550e7 Auto-Submitted: auto-generated Date: Mon, 05 Jan 2026 20:57:37 +0000 Message-Id: <695c25c1.ce8b.9faf4a2@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=21865c970888ad0e2cde06db843ae2a05af550e7 commit 21865c970888ad0e2cde06db843ae2a05af550e7 Author: Andrew Gallatin AuthorDate: 2026-01-05 19:54:35 +0000 Commit: Andrew Gallatin CommitDate: 2026-01-05 20:57:11 +0000 tcp: Unifidef use of rss software hash in syncache Ever since "d9c55b2e8cd6 rss: Enable portions of RSS globally.." exposed the RSS software hashing functions, it has been possible to use them without "ifdef RSS". Do so now in the syncache so as to get flowids recorded. Note that the use of the rss hash functions is conditional on IP versions, so we must ifdef INET to ensure rss_proto_software_hash_v4() is available. Fixes 73fe85e486d2 Sponsored by: Netflix Reviewed by: glebius, p.mousavizadeh_protonmail.com, nickbanks_netflix.com, tuexen Differential Revision: https://reviews.freebsd.org/D54534 --- sys/netinet/tcp_syncache.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 6a3c5a5c9310..8c58be63cd5a 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -35,7 +35,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_rss.h" #include #include @@ -882,7 +881,6 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) if (sc->sc_flowtype != M_HASHTYPE_NONE) { inp->inp_flowid = sc->sc_flowid; inp->inp_flowtype = sc->sc_flowtype; -#ifdef RSS } else { /* assign flowid by software RSS hash */ #ifdef INET6 @@ -897,6 +895,7 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) } else #endif /* INET6 */ { +#ifdef INET rss_proto_software_hash_v4(inp->inp_faddr, inp->inp_laddr, inp->inp_fport, @@ -904,8 +903,8 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) IPPROTO_TCP, &inp->inp_flowid, &inp->inp_flowtype); +#endif /* INET */ } -#endif /* RSS */ } #ifdef NUMA inp->inp_numa_domain = sc->sc_numa_domain;