From nobody Sun Sep 25 10:04:42 2022 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 4Mb1hV4bhqz4cstN; Sun, 25 Sep 2022 10:04:42 +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 4Mb1hV42Gwz3TWr; Sun, 25 Sep 2022 10:04:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664100282; 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=fibgcrMV7zJ5XCVJUZS7PivQA64oNKfRPV36w8ElLIo=; b=XmSpoMAvAYqo2oRH48qgu0nZabkGrRUsdbqxi2Osb+2GZ65jezHhvneSa25fQDwAeK8oIH p/wazylUPt85v3rgp+Hj4PRk86oLMu8ybqiQKKFRxyrNiZnhoBGGxM/597x4PaR1JEmmJw 5WkqkhSDKe3eDq4Jo32YXt4WvEl1g67hMG5vj1pCMkJbKr0+YnR5QaVeXlNufPc2mTlqir mGCgXcp2rC61QRn4EEzVi64hCMUGLcFC0XbHsI3gHzeNFHBMbidHFIWLh8kxC9C2FAFT98 07PdkAgnMb4dCbbXVxJfwhGvlSugyah511O6oLlAKYyF9So4AhQmdlgDw4riBA== 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 4Mb1hV2xPlzNrn; Sun, 25 Sep 2022 10:04:42 +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 28PA4g7f047199; Sun, 25 Sep 2022 10:04:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28PA4gT1047198; Sun, 25 Sep 2022 10:04:42 GMT (envelope-from git) Date: Sun, 25 Sep 2022 10:04:42 GMT Message-Id: <202209251004.28PA4gT1047198@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: 9e69e009c86f - stable/12 - tcp: send ACKs when requested 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/12 X-Git-Reftype: branch X-Git-Commit: 9e69e009c86f259653610f3c337253b79381c7a7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664100282; 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=fibgcrMV7zJ5XCVJUZS7PivQA64oNKfRPV36w8ElLIo=; b=DGbIjBGVKzt2L4SKVWNUF2z4C5D0IH0m8f14em/2Ya658ZC9nq9RJMlRjaa5F66kPqvGJC /kFbpKu7Gzal90A25fQ0kvCQ6GZN5HD3iyfaQ2YZjYrSxSdnxTfjjxMqGPoJqScfOysuhA mljoiLxuZAAmQHCo0PBd1c9YFEVPg4/Brdba5E+9xL/3YX7ucJBJPOWi5JyT7QitZDBooz BQz2obMnqV77n2h5EAtZ+Uq3VVC46Fv8ZisBmyw3EM0kqJPLrWxW0giewpvOsVjc9jy1Lc 5tbuVTmtw+0hg0mD7kNI6C2wdfpmW7txaUwvuqhVwRqQTWt+UPKzT4jRUKUBSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664100282; a=rsa-sha256; cv=none; b=FqRz6mTiwBFM3blijl53RxE3ed5HdiawfEas6f6Fli4kjs4V/9T7IuH05xug7C4/+aBNxx 9B0kXso1yEhQl4OC0cW3sxuQAsJUzP7J/o70XobaDwBwM9iFPGIsLak/CnHLugZWG9yzzu O5mMOeqZmheo/hb/vPpbYl69OYVto8SaZeJI8gopnC3VIJtgdjmMeVwtX/ZCKzyl+2tgE4 vEkX8FP9jld2Kw1fSBbYAvRU/yGxjQHVmkukBsOkFCvuXCh/9u/OQAZb3krgjUF50X954/ HkPbM6d6A7qTBzmHlPwkguNPiYGNsw+IPWGYH0JTNXGvBxplyWgLj2MfyLTOlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=9e69e009c86f259653610f3c337253b79381c7a7 commit 9e69e009c86f259653610f3c337253b79381c7a7 Author: Michael Tuexen AuthorDate: 2022-09-22 10:12:11 +0000 Commit: Richard Scheffenegger CommitDate: 2022-09-25 08:46:54 +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 755d645d338c..fd55a5a09369 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -2695,14 +2695,14 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, 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) {