From nobody Tue Sep 9 18:06:41 2025 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 4cLsG96sYbz67FZ3; Tue, 09 Sep 2025 18:06:41 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cLsG96M4nz3gLF; Tue, 09 Sep 2025 18:06:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757441201; 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=KEp8gnqOX5Ye6goKchX41VadJ1p0nUAnQeUrzdkwnc8=; b=KmEWa6sVC8J9qaibH+vXhdiBwsD2QD8Qiv5PqZOnxnUTfzWbumd0ZORhTRSxpH7OaEextj EuS25ocf8ew8nXqtYXMb2tVOD6hJKYXkF0E8S7bOWI34dy3d7oL6VKiLcppSmdbxprkSlD L8/tfEBUjr34xW2zZpnDH4QKcr4RpuyFF7bHFV/0UwVgQvhuxupUXn76SH/QSTpse2vGU/ ZiRYKdyUDqeG20y/2pj5oQ/NhIOG0aANyFwOhA0Eq4kRRk3pNKBIRWlVlofCrTqni2GJvh k7z9tc/DqtaxA7I869IgXYge+t5jsK9QJ/YgIUeFOAwo2i8etNQ4TzooJm0yEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757441201; 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=KEp8gnqOX5Ye6goKchX41VadJ1p0nUAnQeUrzdkwnc8=; b=Eav7pTwkwq9FZtWHaVWhIkx1UwHPJ7gyof2eyyrxk3gWAP0vVekkZRMHfchYJyZtrNDDM2 RtTxrgMSIKiC8AoIYgWTtmOpvwAolslc7xSdMNMwehl/qJ33YP6pXlMDlRWHc1V6yYZ3Hm JCuvC3ee9DQU2lE+9ZMHeJQ+9tRyrC9qa0krsyk8HTmJeTHr/aMNideQyRGT0jevLZuJCQ 7dQ95M/VmP5V1pDjRJe08HENXYp/h3QlHKs1YtxCgrlbLRftPtmMwCqnko/KaBGUU1mWeJ DkgppXM3/NFB750rgXBT/bg3rtHLpQNWP24AUprKJdZN1DavXw8t13vuAWK1aQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757441201; a=rsa-sha256; cv=none; b=MyijU7077ZN9psD6SaMgEAs+XPNHL1rX44UTonHFcTZe8cHQy9sxrdgWWwukVK8wCwqPIk PDz7vMdO8jWEQusw/TP2z5bmeGoxUVdMBTdLp3UUN3MQ97NCMrHqpbKHPOknvrkIvoQyXi KNe3ulKg+WYr0AtYN1N4/rLsrUkr1xQJ05fNOzKSkbtEck8aVrurW/rNkJ08EaY4xzK+3L lSrwe9MMpBhpWhbvlGkhhGZXdmQPoHn4MKh5GFJ2Ap6YR7Oighl/wL7816SId11LZJdnyn vy9sb6Ybk8rVY1JnriaKfct7cC8cjxz0O+/VEQGoGbnKaQh4VUn733X1EzcZmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cLsG95t5lznKR; Tue, 09 Sep 2025 18:06:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 589I6ffu085513; Tue, 9 Sep 2025 18:06:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 589I6fsL085510; Tue, 9 Sep 2025 18:06:41 GMT (envelope-from git) Date: Tue, 9 Sep 2025 18:06:41 GMT Message-Id: <202509091806.589I6fsL085510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: ea5560f2293b - stable/14 - tcp: increase tcps_sc_recvcookie only in the syncache_expand() 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ea5560f2293b9f2c69f62cba6b122c91b0b8eb3b Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ea5560f2293b9f2c69f62cba6b122c91b0b8eb3b commit ea5560f2293b9f2c69f62cba6b122c91b0b8eb3b Author: Gleb Smirnoff AuthorDate: 2025-06-17 15:50:17 +0000 Commit: Michael Tuexen CommitDate: 2025-09-09 18:06:19 +0000 tcp: increase tcps_sc_recvcookie only in the syncache_expand() The syncookie_expand() is called from syncookie_cmp() in INVARIANTS mode to confirm that values calculated via syncookies mechanism match those stored in the syncache entry. This creates a counting bug, that with INVARIANTS every successful use of syncache also counts as use of a syncookie. Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D50897 (cherry picked from commit 3ed8d5645dd42a7c080ba800cf6d25cb7e147d7e) --- sys/netinet/tcp_syncache.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index c7da8a41242e..b50d6e9ea84e 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1123,8 +1123,10 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, goto failed; } bzero(&scs, sizeof(scs)); - if (syncookie_expand(inc, sch, &scs, th, to, *lsop, port)) + if (syncookie_expand(inc, sch, &scs, th, to, *lsop, port)) { sc = &scs; + TCPSTAT_INC(tcps_sc_recvcookie); + } if (locked) SCH_UNLOCK(sch); if (sc == NULL) { @@ -2355,7 +2357,6 @@ syncookie_expand(struct in_conninfo *inc, const struct syncache_head *sch, sc->sc_port = port; - TCPSTAT_INC(tcps_sc_recvcookie); return (true); }