From nobody Sun Sep 25 10:05:20 2022 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 4Mb1jD3bMyz4ct5Z; Sun, 25 Sep 2022 10:05:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mb1jD2v12z3VLb; Sun, 25 Sep 2022 10:05:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664100320; 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=uJYKCqpucSjk8WzjbsGPDR5v/htzGzae9enw46z3kNg=; b=HIXg7g6qAmECZ193KxWBG0jx0WKvESwpwS9Bxzeo/XFMVN25NG2OOsJPh5eQox4QPMuvmg EDWShhC+738v4DV6s8xurWTMVT+r+2q/83VsYXzDw0LRw6lEcu9qiqyPEmOz3H4wmHk0DY eGBiF07WtO1lSWw3sQCV3/rxR5XEKF1U6mK/Asb4P7Wo/3rqbXgKZFlZS6uZG4Na8goZ1d t8WK4cDRIuX4iMcKyGDAQWbDlSKnZhTCLKStF72ROkgJitPLImbUzKoybOQAZTb/FPd7A6 AkoHtHmhJBsxbM1YJtfV9xXxs6iZZj+y5/T5stIKGQGy8b1jwuyr4Lf03viWgg== 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 4Mb1jD1zwTzNm9; Sun, 25 Sep 2022 10:05:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28PA5K2Z047504; Sun, 25 Sep 2022 10:05:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28PA5K8q047503; Sun, 25 Sep 2022 10:05:20 GMT (envelope-from git) Date: Sun, 25 Sep 2022 10:05:20 GMT Message-Id: <202209251005.28PA5K8q047503@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: f9edad005465 - stable/13 - tcp: send ACKs when requested 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f9edad0054652e020b8214f61c0e454fd48101a6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664100320; 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=uJYKCqpucSjk8WzjbsGPDR5v/htzGzae9enw46z3kNg=; b=rtqJ2PxlngwcTdy0IW7LoISmwMancqZCkABVs6gZwTfj3iz3ZH8WsGD8zYN1766zDUcpQ/ Ir/wEFZKWSOq48wgVDNkVlPO8U2ykXeKO9DGjhQyrnlT1H/d9nK5C34X3aYypZHNDii20c lUf3FyFprqVx/YwDG5Q2MKvh8m0hqvdeVB9YwMEBxk0XROpUv7cE9Vy9jop6vrmnesGaNp Vp+IpyuLekffCwWyC/LgkjFCiNwlu8jtb8JlyHYsIXykIAswzBbIMNGq03+QaTy346D/SN JyYrf8qooGpTnO6rmoeK+MDLsXj3zONEZMpxRNlSsNPutLkacxMtRDWIrjsqmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664100320; a=rsa-sha256; cv=none; b=mOxWsD2IrmZo2DKoQ/bKfudhke+jg5J3JLgDFWD4vk1Vn9iX0bcrraIWdWaDq2qfmtv9t0 PKeB+7dAe1YoDN5LNdR9mgHiT8TQQarTYI7GhuEvUbuSwcw/xYw44KNv20yjI5o+v2a/0K pGyA3gFy9fsaCkFvocj30vfIlgpnF9Xpo5rfxL4eQaAPKWb8ILWVffqQf6i6vVXTKtTDda BWiayyZWESAho+zYVJ/NSOCVN0yseqy/sDtuquokay93vVB4XdJ4XnTpYGo8wqqk2Zw0Mo AmZzsHAZwuJHDOlk5nSXXB3VU6puLFH31ErfoKXwjCCRdBvnc7AweDT0qo+6DA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=f9edad0054652e020b8214f61c0e454fd48101a6 commit f9edad0054652e020b8214f61c0e454fd48101a6 Author: Michael Tuexen AuthorDate: 2022-09-22 10:12:11 +0000 Commit: Richard Scheffenegger CommitDate: 2022-09-25 08:55:41 +0000 tcp: send ACKs when requested When doing Limited Transmit send an ACK when needed by the protocol processing (like sending ACKs with a DSACK block). PR: 264257 PR: 263445 PR: 260393 Reviewed by: rscheff@ MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D36631 (cherry picked from commit 5ae83e0d871bc7cbe4dcc9a33d37eb689e631efe) --- sys/netinet/tcp_input.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index b2a2fc878b8a..94e9d0b71cb8 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -2758,14 +2758,14 @@ enter_recovery: maxseg; /* * Only call tcp_output when there - * is new data available to be sent. - * Otherwise we would send pure ACKs. + * is new data available to be sent + * or we need to send an ACK. */ SOCKBUF_LOCK(&so->so_snd); avail = sbavail(&so->so_snd) - (tp->snd_nxt - tp->snd_una); SOCKBUF_UNLOCK(&so->so_snd); - if (avail > 0) + if (avail > 0 || tp->t_flags & TF_ACKNOW) (void) tp->t_fb->tfb_tcp_output(tp); sent = tp->snd_max - oldsndmax; if (sent > maxseg) {