From nobody Sun Oct 5 13:20:14 2025 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 4cfjgf62gjz69sVX; Sun, 05 Oct 2025 13:20:14 +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 4cfjgf5XBFz3sGg; Sun, 05 Oct 2025 13:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759670414; 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=JElOZjRmym73hlrZh2FSG1urpXWU+UaHkIVxNv02G34=; b=lPWGbBzhngHvS+jjWDUiYDXZY6P5v1p1HATo1DL50kA6QvOhrfBmU1Fq+Evt8h3PHSqs23 EJIfo5ai6tnXIlYROEAwEgcuGHoJSz/XyTVga3xKyme4YsDHHiR4J8hDGfNrhUF22CwHyu 6+ZyHOYLyLRTsxvVNyxeXw3gizpUYGh8slFXZPoUZf39hQ5zG7iqYac2c19OR7LGw2m9/D cLlvCMXbjEuMmi+Vr394vWezqEbzsfZudIgCyaEmPxVQjbmCZCnZQufhoLTDJ9z/c4kEM4 n+Z5N/TD0GyPwNRR63KDqJO/irs3d9ku3NOsIZR33ntG/IdKnu2aJQ0468qUig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759670414; 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=JElOZjRmym73hlrZh2FSG1urpXWU+UaHkIVxNv02G34=; b=sjW6UyvdWi5siS/HZtfbzPT1gWFNE2sUleYD4JUbHcQssViI7Yx6NeKqR311kYy7bSMQrb fpud3BmgS1hMN8VUKnaKTlO70LxXCq0g0I6LMEd9byrCebhvGhm3+TQfIk2nLv5QTK0rkQ 3V/08umfsoqyBZBwkpAAnQjorDrHkSn78qA5e8iCXWsJRY69Now7IpJ3/1B8jLRVEVvx6S FS2IaGExp6jj+/vT7YpLh6y5x9vqptr/fLGNSyjAcJDCwUdWzB+6htKkkEIATJjOTGfeKz XgoZETwjYIpvjqvhu8X1ZwgbYLzX+ok9uN3Sm7QonOmgHn8SpznlmITfbMJSgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759670414; a=rsa-sha256; cv=none; b=cNaUiuw9s0PePq+Rg0qXW7NbuAivGwOiWGPNPxWc+mHOznsTJiO3FZeuxGjbXbsWiUj6wR s4EqinSXBbQHFpAhZYWhzVpgFTutVKW4agWgZ3SUnLn+Lha3xPfaQfEbTMz0YQ0VAF/iyy h+oPE1KK6j6O0CACnHQ7gwwAweb0Fpqc/lMOo4SG6xfiO/LLOiap+Lq5FsWOQc/jZb/jvu 2/aN9kvf5YYRLnJj5O380NlGNMkONTtW9DSzNW1A/W/nN2JBmeq4kushu6GJ4auKRO2g70 eJpHuRzfaqL09Sma5aNfoVFFYX7Xv2n7AeT8QCqqc4z/oRBdnRcnJGuFhY97Ng== 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 4cfjgf4PmWz3s; Sun, 05 Oct 2025 13:20:14 +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 595DKEm9083932; Sun, 5 Oct 2025 13:20:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 595DKEWM083923; Sun, 5 Oct 2025 13:20:14 GMT (envelope-from git) Date: Sun, 5 Oct 2025 13:20:14 GMT Message-Id: <202510051320.595DKEWM083923@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: b7b48ba8420f - stable/14 - tcp: keep SYN-cache entry when sending of challenge ACK fails List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: b7b48ba8420f6203ac7165b6b07c62929bb759e8 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b7b48ba8420f6203ac7165b6b07c62929bb759e8 commit b7b48ba8420f6203ac7165b6b07c62929bb759e8 Author: Michael Tuexen AuthorDate: 2025-10-02 06:57:14 +0000 Commit: Michael Tuexen CommitDate: 2025-10-05 13:19:37 +0000 tcp: keep SYN-cache entry when sending of challenge ACK fails Don't drop a SYN-cache entry just because a challenge ACK couldn't be sent. This might only be a temporary failure. Reviewed by: Nick Banks, glebius, jtl Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52840 (cherry picked from commit 7841b44f8491d69c75207d0f3a1eb34501d99edd) --- sys/netinet/tcp_syncache.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 012240f46ffb..ce2ab29f4008 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -130,7 +130,7 @@ static void syncache_drop(struct syncache *, struct syncache_head *); static void syncache_free(struct syncache *); static void syncache_insert(struct syncache *, struct syncache_head *); static int syncache_respond(struct syncache *, const struct mbuf *, int); -static int syncache_send_challenge_ack(struct syncache *, struct mbuf *); +static void syncache_send_challenge_ack(struct syncache *, struct mbuf *); static struct socket *syncache_socket(struct syncache *, struct socket *, struct mbuf *m); static void syncache_timeout(struct syncache *sc, struct syncache_head *sch, @@ -703,10 +703,7 @@ syncache_chkrst(struct in_conninfo *inc, struct tcphdr *th, struct mbuf *m, "sending challenge ACK\n", s, __func__, th->th_seq, sc->sc_irs + 1, sc->sc_wnd); - if (syncache_send_challenge_ack(sc, m) != 0) { - syncache_drop(sc, sch); - TCPSTAT_INC(tcps_sc_dropped); - } + syncache_send_challenge_ack(sc, m); } } else { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) @@ -2062,22 +2059,16 @@ syncache_respond(struct syncache *sc, const struct mbuf *m0, int flags) return (error); } -static int +static void syncache_send_challenge_ack(struct syncache *sc, struct mbuf *m) { - int error; - if (tcp_challenge_ack_check(&sc->sc_challenge_ack_end, &sc->sc_challenge_ack_cnt)) { - error = syncache_respond(sc, m, TH_ACK); - if (error == 0) { + if (syncache_respond(sc, m, TH_ACK) == 0) { TCPSTAT_INC(tcps_sndacks); TCPSTAT_INC(tcps_sndtotal); } - } else { - error = 0; } - return (error); } /*