From nobody Tue Jun 17 15:50:44 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 4bMBD51mTVz5yTdV; Tue, 17 Jun 2025 15:50:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bMBD46LCKz3pV1; Tue, 17 Jun 2025 15:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175444; 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=b2ZP4fo/kkcOn5t2209cF1e5KpXGmUYtQYsF28LSJxU=; b=kxzvQz8UQ9HQiIyJF2BtgWhiKFYbtLpAnhlWMFnq8n1/JPy2+YXrqZMHCF+KXPSf6rFjC/ H0t2FmIXNaS11bmj0o+6+8lQwas2YgUbaITj35vdFT5lHQW4BqvW3PomkFWkaQ85+sBOyQ DzoIXUXctq5qVs3vJOe8fySIsqlxJMedKgtP0bunGE3hbNkAZy8DD1qsfT98s6PaX86Mlb MdBlGOGNhYQ8jQPYzj5+YrDa2VwBCMrmXA/rTj3mclZfmnsWOMw4JZwMecP3ly6P9i0xws L1/5GWWm79k9z44xm5eUaxlsZ3aI8xgOTWekBIXjTUrFmkXGB+jG3+iXUPWxog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175444; 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=b2ZP4fo/kkcOn5t2209cF1e5KpXGmUYtQYsF28LSJxU=; b=iCeWvmQ0DmJqjPPRREZWVxoggLYG0p3NmlUrh2Q+tVFzDr0JHRVzR5ap9nYFft7B5xMoRp elcknZceczPXZ48uSXBPNA9+4LLvs6JGVLe/Gb09OJb/zQgkCaqvtQR+gF16MM2XUxsPXh e8GMR/8qPnsjE3StVQI0rBemUR6Np5wa4s4EpaeFz3V/kQNHw/KrYgcgdbNusw1r8GM8+T MNNajo5KJo3vmoTS3A3HhkRUn7tJHQ+1M3NnnS5p7JJfg2rCS+Sz2mUCwJyNM9osTiXYmj AoSqJcf1lesnG7OGoGGRsy6IKCsdyTusbxR7ILmfqxsb2HTlJTKLspmwY4/hzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750175444; a=rsa-sha256; cv=none; b=wpff2Aw8XG3/fIBYGfi/Fp5EAL4XaHJxCgeWbvCaUvDoUJLg0bqCZ+E/kSqGbeEconTL9K Evl6b2Sh4Ifw4UyGUCx5xlq/d6GCbQPLFqzR+5hDnXkM9SZe6b59xkhGXgeFK08UXkBp4/ 4DkIYKOxdr4cOSaSqYxwhlxg5SBalJgXQAmbVS8gdgUy8OerQWYs0g8LQDA48ILy4WH5Vy vbbNUaSnN6AEmYt1HEF8huh8Deu7I2SMSr5B/UYOdiCVKsg7t+HDYlYfvHm9j1buCxIBn5 EZYjpkqCfQeRrrQQwCQebn4US1VvwE+g2clWBxXO0YPCQR6JwnBDlLbhKDfz2g== 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 4bMBD45xvgzqTJ; Tue, 17 Jun 2025 15:50:44 +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 55HFoicw029519; Tue, 17 Jun 2025 15:50:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HFoica029516; Tue, 17 Jun 2025 15:50:44 GMT (envelope-from git) Date: Tue, 17 Jun 2025 15:50:44 GMT Message-Id: <202506171550.55HFoica029516@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 3ed8d5645dd4 - main - 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ed8d5645dd42a7c080ba800cf6d25cb7e147d7e Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=3ed8d5645dd42a7c080ba800cf6d25cb7e147d7e commit 3ed8d5645dd42a7c080ba800cf6d25cb7e147d7e Author: Gleb Smirnoff AuthorDate: 2025-06-17 15:50:17 +0000 Commit: Gleb Smirnoff CommitDate: 2025-06-17 15:50:17 +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 --- 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 2832825f0c40..f7dfed78b0eb 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1113,8 +1113,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) { @@ -2344,7 +2346,6 @@ syncookie_expand(struct in_conninfo *inc, const struct syncache_head *sch, sc->sc_port = port; - TCPSTAT_INC(tcps_sc_recvcookie); return (true); }