From nobody Thu Oct 29 07:41:28 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 4jFblF4bJKz6wGY6 for ; Thu, 29 Oct 2026 07:41:29 +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 4jFblD5ngYz4SFm for ; Thu, 29 Oct 2026 07:41:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793259688; 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=ulmQbZu8O/cwkISKUz/oAUpIWjJ+vNmO5RMW03uxmmo=; b=EiDTGgI0NSIDlW5eFZwuwl0xARhqyky+ye1krIkq2KGtMpYm4XHiW9WnMTHkzt7kQ/W9Ow 5CSnSwu2qPbBCDfBO/Pvq3acZea4NgHzozBXX2SUmgcNPv5wDbbq+Nr+5uxDqVJJtvm3Ho G8OHxXdqlwnao6i0LVsdpd7QoazTbeDbJjD89JMiyTqTHJNo/A2Fs2Z6pdofIp+FOb0r1b bQ0sKA02y/nBn2chZPdqGscMQ+QSl+pG6KLWJOyZZ+3JOHGV+B1yfHLW3zP6b5F0efBiGj mJauL1mKF1wuyXVbBI3t0QuY+jMc/QGDsFj3dAMwve9ktIo35OFQxjoRmLhjMw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793259688; b=LPUOVyfk0orDf2C+Iav2DZsC3XjONXtB1JRsUqSN+O47TpcU4Ej+NWyBhgrFnBqvt1EtMr pht1kC6xMv26J+O5UjR3R6eZ7/U5wC7SMIYdXf6voKJfYBQO8TYU/kVPqtJzjY9HMupVek taKvfsHhdsrVD20SEAYBgNzBCW8b9UIDzPoZ+dSY7TTNkLpMEYUr7XCBxKHgKeSgl3sSY9 LJTLjwTWVlUjjzREznKF0iPbYhz7HzhuTpuevoIZYBDNdmSDvl9ZpTLhYspocLemCadT2N WETR3q2TGjBGC0oJfxm3cLD5d+cU4lGJxHzDS80RdKzpfWBUZnAf6mDBwVvAzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793259688; 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=ulmQbZu8O/cwkISKUz/oAUpIWjJ+vNmO5RMW03uxmmo=; b=oRkUb/ATFPle8QDY/NEhjnYyO7czLZpiOZcedfFmn+tIhIFemtwWnZ7nHLWx5VkvG3M9ly sineX4UEs1zw1l5VNbqAqFGIfVmZQnwmL1E0ZXm37PzIQ6n5hOdZe+ep0bXwFq8Q448FsE DgYVZVQ9dlXKLwcKZSpCPoj+TWmp6ThgSpDvrN+bNNpxc3BlLTdsvJQFk/96/K6jmtVW2D 8Qc9BtfZsh3cgqR1SLcD4cnYdS3ohiHT0c8M1ZlbVHAoxORPinpaXtRz3QXAZEzZHQL4aN 0splX2VWJvJDFXKPWs2Bi+nsmJ1W/uRClmBD6dvqVGBLCYNo/N1iE9VvvtDJqw== 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 4jFblD54VrzVJq for ; Thu, 29 Oct 2026 07:41:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 447a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 07:41:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andrew Gallatin From: Kevin Bowling Subject: git: 67661c59f887 - stable/15 - tcp: Unifidef use of rss software hash in syncache 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: 67661c59f887247ca2535c4cebfc5f902c6d84d5 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 07:41:28 +0000 Message-Id: <6ae2f8a8.447a1.7525fb98@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=67661c59f887247ca2535c4cebfc5f902c6d84d5 commit 67661c59f887247ca2535c4cebfc5f902c6d84d5 Author: Andrew Gallatin AuthorDate: 2026-01-05 19:54:35 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 07:37:58 +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 (cherry picked from commit 21865c970888ad0e2cde06db843ae2a05af550e7) --- 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 912ef6223ee1..84f19a3ee35d 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -36,7 +36,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_rss.h" #include #include @@ -887,7 +886,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 @@ -902,6 +900,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, @@ -909,8 +908,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;