From nobody Thu Oct 2 06:59:44 2025 X-Original-To: dev-commits-src-main@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 4ccjN11pVgz69BNC; Thu, 02 Oct 2025 06:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ccjN11KBWz4DhP; Thu, 02 Oct 2025 06:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759388385; 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=u/yl8iH5cDpGbhfwpEcaEUUuL3NEfairiDST/oBnsQw=; b=iu/gjss4+NnJNk09vdBL5aldrp2+3OFPm2bzUFMoc8EW0xpts/pTGtTQIC7ANPgcJenJdb K7vtRgF/cQgf59gQ7lDsr+HKZCrkDA/raQ4rdP3VS0vYQ5VFnCHDPRhr8JUVAUI8cpZPLU VNQIkV7BdjWspvcsiLGQMykgSbDWMuZ4TQHiX/VTY6USUK/ST87ijv8XgdFRIdWx+BMkUY 3tNNqIAUEiVCu1qzzN6dGX8XK7yTGTnPE13HycI85V0kDEmwdRIdoCNgwAMsuyoIosPPJx nEo+A9MYvZDpaQ2MNv3OLao5/Tq41czj3hsm7JShojkREz/7H+93dujRi5VsXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759388385; 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=u/yl8iH5cDpGbhfwpEcaEUUuL3NEfairiDST/oBnsQw=; b=BQcRs/+ti5MP180m0P+o0I8x7L0b51O65W3ne7KJcUpxBTjEHNzimavj3KAONuemaSO5Oy S9CSxAAVYfN/XshqGKQgWFw9EP81ppuA6HBgoawPhnMWPJc/zty/xWgl2w3XrEgkzPss7k ieqOa6SLGV7bSGwqeIeeAwGSkfT+1fcjs+cAlGLj6MEgG2ptb36+IG9fewYv/o/Psd9cDn VaSVUjnh/WUbk6NtsNVZZPYryMGaQWu3UlRsd1TNCtFSjnXIKggpdBYDT54f7Ccrg8GB6N B8ngy24qwIfaCtCw564VTEb3zDr6/ruWBSkU9otupyKgkD6QH0Y669Iq8qlcVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759388385; a=rsa-sha256; cv=none; b=nzeEwv03uH/vHnSuVQpzWr4Mts58TRewuIajtmfvy9G9hJK3xE8ZPaa9OxLdpqEo9lo8v0 n/h2oR8EftafJkIZ6OsZeGYhWoqOuB+FfejDENbpgDHTzsncNrvF23URndDRVOqINlsTje 92aEZ40aBcm/1VhrXtqgn5Ru+YOIwZb+e8LF+eLxQr1K2e49zle2jWawqVLPGUeHLZDvTj zu5DBHp1UzI624XJJjWT1c01nue+4LRKcIr5OK/fGsESJk0u/VxyVqrdMYLMI7UiviY332 O5qP9J/FaV4e8rs3DB1G3YSnvzr6xWxsWjLwCn9x0jDo7GPfnk6f/dg8PCUo3A== 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 4ccjN10NJJzxVX; Thu, 02 Oct 2025 06:59:45 +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 5926xisA057380; Thu, 2 Oct 2025 06:59:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5926xioJ057377; Thu, 2 Oct 2025 06:59:44 GMT (envelope-from git) Date: Thu, 2 Oct 2025 06:59:44 GMT Message-Id: <202510020659.5926xioJ057377@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 7841b44f8491 - main - tcp: keep SYN-cache entry when sending of challenge ACK fails List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 7841b44f8491d69c75207d0f3a1eb34501d99edd Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=7841b44f8491d69c75207d0f3a1eb34501d99edd commit 7841b44f8491d69c75207d0f3a1eb34501d99edd Author: Michael Tuexen AuthorDate: 2025-10-02 06:57:14 +0000 Commit: Michael Tuexen CommitDate: 2025-10-02 06:57:14 +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 MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52840 --- 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 518cef66e7fa..778ab0583735 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -122,7 +122,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, @@ -695,10 +695,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))) @@ -2061,22 +2058,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); } /*