From nobody Tue Jun 17 15:50:46 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 4bMBD773J7z5yTdX; Tue, 17 Jun 2025 15:50:47 +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 4bMBD717WFz3px5; Tue, 17 Jun 2025 15:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175447; 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=lu9WPOZeOGThhLKKQBJFSPx+Bn6jQMs/TtHX4hjLsCM=; b=S1G6JuXYQXXYi/cOtJEiu+3rN0iYXfRUjT51hi/PIo7JrsV9dS98GfmpH8uN86eTdzv0N9 lrGRis/ZIc3cV35nlVlg9URuzx5/M+zNnuSaJtitaYXd9ltkyogp4cQctA2YArhU8e89qs yCOh4cedoOd4d6QowUT1K9I/a1j8oGNOO7ZCUprU6AXQMbya089qJIDPy18KbhPfozAiga OXOvNRLIwO2jVE+XhkMKc99VRfPxcKMeFWCjC+CZHj6CQdnbjFaB43DzF1gLbouxcQKxwk IMRT7sGQPikVQfehHKUqL8qOyGTnvYbniyhWtrYIrMr9uzF8pmX1QNUqLNGVOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750175447; 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=lu9WPOZeOGThhLKKQBJFSPx+Bn6jQMs/TtHX4hjLsCM=; b=qQ6qkzhHe+wrEHoQu5Yv1u0vTbIIzATKq5917MPRVx3CeB4el7ykKjc/FzXS9oXS8fchV+ qhLUxPJVbUuR5zrfQ1e4t4YYezOhnHjYVoHF+Nw49hPVcBfd0YcPTw6xOsavvba+e1aJk5 8ow3mpSVPlrHIBhghAEI2FXxdVVEtrJxPtahYtXjUfaGKZdzOd/av9qx1pbX3cuDt5JrS3 uBYvuclxd/gNwlws7s6log91c6+gcioF1+bvFqX2Eo12cgiQs9F7oWxLmCVd4y4y44XNka 06rRZI/hmOk7IFmSs9z5FuXtoZNw7rOpMKcttgFB0rMIHb/SRIWWcbsRQ5O9Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750175447; a=rsa-sha256; cv=none; b=rR9+nvap6xvX+SBQypHPPGa9OIpb2GRfceFVMMayHbB0JqO5Fnn+r3q4QTobHNFEgklKrR iiDAwrUrKHbvnnbb2Fu0Z/ffWbnFgQWyB/dTdDJMAhosvj+eEia8UG/7Ve+iS3AB0ocDGv afihx93Hlfx9ShKa37gyTeAtfQ1dZDuhTRjPLsFMoeDqciJzDKB2cRDnUGuRGd2/+MXelH aH5fMcuNXjuM9PL/z0jnIIeN5kCCzLc1Dk2J2kvDYMeXOjysCxFFOKTkq1RjtogLYmUPSn U/7Bd3nb4swVHEuuGYciRIsPv58n2CPuhlO1oAGNd1zoKaEkMKzPEg1hDobozQ== 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 4bMBD70WfKzqW6; Tue, 17 Jun 2025 15:50:47 +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 55HFokMH029593; Tue, 17 Jun 2025 15:50:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HFokc9029590; Tue, 17 Jun 2025 15:50:46 GMT (envelope-from git) Date: Tue, 17 Jun 2025 15:50:46 GMT Message-Id: <202506171550.55HFokc9029590@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: 1396e87a37b6 - main - tcp: count two previously ignored kinds of syncookie failures 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: 1396e87a37b6d4545d2c7579c31d81d96ba8b816 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=1396e87a37b6d4545d2c7579c31d81d96ba8b816 commit 1396e87a37b6d4545d2c7579c31d81d96ba8b816 Author: Gleb Smirnoff AuthorDate: 2025-06-17 15:50:29 +0000 Commit: Gleb Smirnoff CommitDate: 2025-06-17 15:50:29 +0000 tcp: count two previously ignored kinds of syncookie failures Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D50899 --- sys/netinet/tcp_syncache.c | 3 +++ sys/netinet/tcp_var.h | 2 ++ usr.bin/netstat/inet.c | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 24ef871c953a..69217ca39ee4 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1097,6 +1097,7 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, */ if (locked && !V_tcp_syncookies) { SCH_UNLOCK(sch); + TCPSTAT_INC(tcps_sc_spurcookie); if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: Spurious ACK, " "segment rejected (syncookies disabled)\n", @@ -1106,6 +1107,7 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, if (locked && !V_tcp_syncookiesonly && sch->sch_last_overflow < time_uptime - SYNCOOKIE_LIFETIME) { SCH_UNLOCK(sch); + TCPSTAT_INC(tcps_sc_spurcookie); if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: Spurious ACK, " "segment rejected (no syncache entry)\n", @@ -1119,6 +1121,7 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, sc = &scs; TCPSTAT_INC(tcps_sc_recvcookie); } else { + TCPSTAT_INC(tcps_sc_failcookie); if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: Segment failed " "SYNCOOKIE authentication, segment rejected " diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 4d49f5d2a954..d8822c40b17e 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -1015,6 +1015,8 @@ struct tcpstat { uint64_t tcps_sc_zonefail; /* zalloc() failed */ uint64_t tcps_sc_sendcookie; /* SYN cookie sent */ uint64_t tcps_sc_recvcookie; /* SYN cookie received */ + uint64_t tcps_sc_spurcookie; /* SYN cookie spurious, rejected */ + uint64_t tcps_sc_failcookie; /* SYN cookie failed, rejected */ uint64_t tcps_hc_added; /* entry added to hostcache */ uint64_t tcps_hc_bucketoverflow;/* hostcache per bucket limit hit */ diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index 269afa42e079..139ff9294fde 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -768,8 +768,12 @@ tcp_stats(u_long off, const char *name, int af1 __unused, int proto __unused) p1a(tcps_sc_unreach, "\t\t{:unreachable/%ju} {N:/unreach}\n"); p(tcps_sc_zonefail, "\t\t{:zone-failures/%ju} {N:/zone failure%s}\n"); p(tcps_sc_sendcookie, "\t{:sent-cookies/%ju} {N:/cookie%s sent}\n"); - p(tcps_sc_recvcookie, "\t{:receivd-cookies/%ju} " + p(tcps_sc_recvcookie, "\t{:received-cookies/%ju} " "{N:/cookie%s received}\n"); + p(tcps_sc_spurcookie, "\t{:spurious-cookies/%ju} " + "{N:/spurious cookie%s rejected}\n"); + p(tcps_sc_failcookie, "\t{:failed-cookies/%ju} " + "{N:/failed cookie%s rejected}\n"); xo_close_container("syncache");