From nobody Fri Oct 3 08:38:25 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 4cdMWP2NSJz69BRB; Fri, 03 Oct 2025 08:38:25 +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 4cdMWP1jhyz44nN; Fri, 03 Oct 2025 08:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759480705; 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=mBiTexwjWCgyRlusIsx2Ix/kgYJx+dAwN67ZCjsJtBI=; b=QSvkBuJEI8okXW+kcwAgutEWw92o1RSfuzi/vcHml2UUpziStdtq72cfmZQderZkD8XP8u r3W9B/+0SY4v6ORCcVgM39rYZnVeovqzMAOLELZLcaOyqopsrMA7o05P+r7/jX6CpI6CbS y6h+SvEREn/4YqKTubAgjpNWepMrO1vFzoy5Z1ti8iVBbSOIAQAqyqW/awKqCo9uE28T93 PEDYDG3Mlk8gnmKF5/kTazPhzKcrsNP98+OPrydtOdzRkqpJ4o2RREB2Y14yxBa5J30WGm ng+2pGAwViGB+IITJuVvP2JH0r4IQXs7B069hAKKeIwhgkteniuoZ31AbvAAMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759480705; 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=mBiTexwjWCgyRlusIsx2Ix/kgYJx+dAwN67ZCjsJtBI=; b=vlnClUOd25HGtcV2aYBzcaRWYSlr0mq5eVIaxjNJsQqfwr6c9xTlABpKwV7MbGSQ/h6uxd OGcOFLorPOFlGS8ZX6I5rGVhhrmY99VLeW7TOL8ZIpIcg8Ubj9RHvBsCPysSGZ+RfFqF1O DGCH9G0vqpQVglDLEIQHKAW5NepAG39pLDjBAmb+Fm8kDAdNDgUP7KDcYkeuezmMreaWRX LTuN2E8LJ2fGk1aVJHpDp5g62jhUnQ/dpKwuhJLB/W7Ibnpj3/HS2yWbDZdgb2NTcTv+Fl HwLOsYwUdPHk80Qnxun/iJc3l2Tbi7v7Jg1GwtBxNC9x44ynT2u+SWOQqQhYEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759480705; a=rsa-sha256; cv=none; b=sbaqTxKhdv0MFvNfYJ72sw66o28k5MwuLnluZtau8kKItszpxOrLsLWu9ho7nIgobWyxje 6lv/wHh1CF7yHZCcrtxHzNvOiZcXx30oZ69DIyjdBV/Wpnvd9X+ZsNGPl8nyw2WJpTs0NO LEp5zdkPyuqLjJ/NOp2FIpIuH2QLqSc4cgWbk9/JJtxdEnN/EC1bwvu2HPeZK12hWb+dsi vSvZ5Txq5RnawtyR865p7Lf1OFNdC9cT9JAUZUy9Md6LziyNkWMSUetbqJxMV7s7Zj5wmA fDopcWhQY0aGz5S2s+49VFXT8Y2qmDbjjnrhEmqlbogidmntduipWvNl8WZkDQ== 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 4cdMWP1DDvznS2; Fri, 03 Oct 2025 08:38:25 +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 5938cPbZ023395; Fri, 3 Oct 2025 08:38:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5938cP7q023392; Fri, 3 Oct 2025 08:38:25 GMT (envelope-from git) Date: Fri, 3 Oct 2025 08:38:25 GMT Message-Id: <202510030838.5938cP7q023392@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: 0cd22970019e - stable/15 - tcp: apply rate limits to challenge ACKs 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: 0cd22970019e2efa5e98ad5671c454bd420a51e1 Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0cd22970019e2efa5e98ad5671c454bd420a51e1 commit 0cd22970019e2efa5e98ad5671c454bd420a51e1 Author: Michael Tuexen AuthorDate: 2025-09-30 20:06:33 +0000 Commit: Michael Tuexen CommitDate: 2025-10-03 08:38:05 +0000 tcp: apply rate limits to challenge ACKs When sending challenge ACKs from the SYN-cache, apply the same rate limiting as in other states. Reviewed by: cc, rrs Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52754 (cherry picked from commit c2900b6e8255ba4f54dbd897cf42427db577ed3d) --- sys/netinet/tcp_syncache.c | 28 ++++++++++++++++++++++++---- sys/netinet/tcp_syncache.h | 2 ++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 1ee6c6e31f33..72e9dccea9a5 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -122,6 +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 struct socket *syncache_socket(struct syncache *, struct socket *, struct mbuf *m); static void syncache_timeout(struct syncache *sc, struct syncache_head *sch, @@ -694,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_respond(sc, m, TH_ACK) == 0) { - TCPSTAT_INC(tcps_sndacks); - TCPSTAT_INC(tcps_sndtotal); - } else { + if (syncache_send_challenge_ack(sc, m) != 0) { syncache_drop(sc, sch); TCPSTAT_INC(tcps_sc_dropped); } @@ -963,6 +961,10 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) if (sc->sc_rxmits > 1) tp->snd_cwnd = 1; + /* Copy over the challenge ACK state. */ + tp->t_challenge_ack_end = sc->sc_challenge_ack_end; + tp->t_challenge_ack_cnt = sc->sc_challenge_ack_cnt; + #ifdef TCP_OFFLOAD /* * Allow a TOE driver to install its hooks. Note that we hold the @@ -2053,6 +2055,24 @@ syncache_respond(struct syncache *sc, const struct mbuf *m0, int flags) return (error); } +static int +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) { + TCPSTAT_INC(tcps_sndacks); + TCPSTAT_INC(tcps_sndtotal); + } + } else { + error = 0; + } + return (error); +} + /* * The purpose of syncookies is to handle spoofed SYN flooding DoS attacks * that exceed the capacity of the syncache by avoiding the storage of any diff --git a/sys/netinet/tcp_syncache.h b/sys/netinet/tcp_syncache.h index a336571f12c9..37f6ff3d6ca9 100644 --- a/sys/netinet/tcp_syncache.h +++ b/sys/netinet/tcp_syncache.h @@ -67,6 +67,8 @@ struct syncache { u_int8_t sc_requested_s_scale:4, sc_requested_r_scale:4; u_int16_t sc_flags; + u_int32_t sc_challenge_ack_cnt; /* chall. ACKs sent in epoch */ + sbintime_t sc_challenge_ack_end; /* End of chall. ack epoch */ #if defined(TCP_OFFLOAD) struct toedev *sc_tod; /* entry added by this TOE */ void *sc_todctx; /* TOE driver context */