From nobody Sun Oct 5 13:30:58 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 4cfjw25tKZz69vDr; Sun, 05 Oct 2025 13:30:58 +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 4cfjw25PLWz3tyq; Sun, 05 Oct 2025 13:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759671058; 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=lODXA491Z4aHsXHqcvA9K6iASQN3E+hrokaJA1pap58=; b=F1Hb4OMLO8vcwhNQlPwvpIR6zqlg31IOBcLm1vGZ6cMaKsyKLN7s/YsIJyuvwHfna/AIyq tp6Pb8KA7n1CKzXOsc8J6r5OtUufOdOa3/2mGKNILW1t4gPtrLEX7lBqjYuXmJ0fVk/TQP u6yjAE3MB1P1Mqw24eDUHyr202H4F8MYrYYVbBFeFXXDmQCFRktnLgAe2aqCcmdPcfdGCZ nIX7abvU4gZHi2j88ocSwDbvUZBkblcBozssUKw5L/jl/CcakzzpLSkzYr4hy48M4P+Qmy b/tSN0/gUrPZEZ/4rZuXw1gEdkd9UbWMGE+9tLRe7chkPoxGTcrkE84APqq9fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759671058; 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=lODXA491Z4aHsXHqcvA9K6iASQN3E+hrokaJA1pap58=; b=NuAPc8iWbay7jTI51SqZZW0aq4wNrebrGmYresaqIhk+nH7Ha0tfaOViI+rFEwjy707u7w cJOuLfypywMGR+tV3mPhpBdJVLmbupMQDG82DGMI8YPhe7BDaT7CE/UxMBHhSugIBG7rKh kCP7DAatE/XI9Oh5P7k1jQnpMTUb+ha+orqE5TjXZB5CFfl0/GmM/TBMb98bLCcB1vAy3D tRyDdif6P66Dplf1IjmKNFfYl7dMqvhsprL8+haThfx97jRiYRHbtBZawyKOv2Bm2iq+ID sSdNXWRrtjYeDeiahUFY7VzN9Tyt1H9P9mXonTMqRlGIGqLydYGSmAOqqd6nwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759671058; a=rsa-sha256; cv=none; b=xASIPYB2GX0b2tj7G2Lp3aYyfZEI+DPTcUXj4wHdsxDwbhNAdTxSCp0BMcg7M0ePfFumER xRIn2MbVfVqzMVusifgDxCVS3kTgoAFGR2wXEmRshaOURq6pBdmhBBfsqpDOVtxqN2Vf9p 7iZGIEGWmWiZZWtyLOgRSlqSZ4QqxjuuPQ2soJ1FhOCb0Q9mBYaIfQXn0EtBWcz7bDuJJb CFiLzex3i07GeRAq4IyneNz0afPXZiLNsq8TEz7Km6GUtJTbPopkNCTai9JeVTEpfcT9DY TdmedrrQBekcq2pECDb4EnOhRimhZIDTt5/PADMaRW631VuJtRSNz57vh/qWFw== 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 4cfjw24VN5z1SG3; Sun, 05 Oct 2025 13:30:58 +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 595DUwN6004843; Sun, 5 Oct 2025 13:30:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 595DUwn1004840; Sun, 5 Oct 2025 13:30:58 GMT (envelope-from git) Date: Sun, 5 Oct 2025 13:30:58 GMT Message-Id: <202510051330.595DUwn1004840@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: 81ea2bdab13b - stable/15 - tcp: keep SYN-cache entry when sending of challenge ACK fails 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/15 X-Git-Reftype: branch X-Git-Commit: 81ea2bdab13b04966d23bd6263e5ca9385544976 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=81ea2bdab13b04966d23bd6263e5ca9385544976 commit 81ea2bdab13b04966d23bd6263e5ca9385544976 Author: Michael Tuexen AuthorDate: 2025-10-02 06:57:14 +0000 Commit: Michael Tuexen CommitDate: 2025-10-05 13:30:34 +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 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); } /*