From nobody Thu Sep 22 10:16:49 2022 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 4MYB5s35Bqz4d06c; Thu, 22 Sep 2022 10:16:49 +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 4MYB5s2f72z3pSh; Thu, 22 Sep 2022 10:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663841809; 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=fA+LXj6ObtxH/OSd94dl0/ht8ctYVG5oWRaqo0BJhT0=; b=ZsjJhDeGJ7RSqqyhOF6U0ZU8JRH0mMT2j6nJSky3cicr6D6WHYk2vlZcUsZ8FEfTdakK9a 3xQq/K9m0o7aEdfBGV39i4mGqH7+Idryfx+VQgMabDlAuqaMiw0kbFuC02F6dRpKcmY4LK Dy+wdGqRTdTj62cvggFl3UVH7Qt3g1GJYX51G2O8o+4VZEesvW8EP9TJYpQp8JwH5xg6hl E/MEZWGNOc6YBEQY9T0m/3j8WkRtRZRA//ShR1sWCu1tZLW+DSPv1nrk8PDZVJ9mBEZZvC S3F45/GSSXCKjcaQlPyZuI9DjmctP13J2HOr3TWgIVhiUqKgpPGOWCwBokIGCA== 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 4MYB5s1jXvzN3S; Thu, 22 Sep 2022 10:16:49 +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 28MAGnci003196; Thu, 22 Sep 2022 10:16:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28MAGnrZ003195; Thu, 22 Sep 2022 10:16:49 GMT (envelope-from git) Date: Thu, 22 Sep 2022 10:16:49 GMT Message-Id: <202209221016.28MAGnrZ003195@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: 5ae83e0d871b - main - tcp: send ACKs when requested 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 5ae83e0d871bc7cbe4dcc9a33d37eb689e631efe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663841809; 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=fA+LXj6ObtxH/OSd94dl0/ht8ctYVG5oWRaqo0BJhT0=; b=Mnmu9wKk3EjA1EJI2JW37l69DBRxzS+ePSZVfGmUN10FK3njdOSWfWmCCBHtkFjQ9Dp38P TL0QEm1je/MQt3fDq1QkH27EDWMGagpCzG7TEJw2YAMOrtHRMb0TeXsDKGsdpV0Dg6Mjit c1X6fo9wwc6ChZoTv0U40xCvrUOc9Riu96HHbstnk6d2dqusgeyR7XReUXF2oxNacPpQ4y NcyrAQiQr+TDXhfXteROr5guj5qvvQj5WbErpsUG2rBHj5DaIRHkC/mSK9aC6ISS75sOcH G3OECJRtBhz4Di0wT2WzJuxzp3tb5/gvU+Jj5357AClMTjEwcyCIts3Hmpbcew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663841809; a=rsa-sha256; cv=none; b=xVKo1U1rsiIDQUCpfhCvsNKCSHg5YmP+HTl0YF9Wj9BRoA1oevbU+w/M9x4qfNR9BvQxHi ncmaWlc9Q0/jbwHnfn4QMFpdGxhAzxbsBOng6fMNRMj/nWGUEWCVULvKsgtqBIOzPXDH92 UOxfZXZyaoXqymDouHfaptgg+EHg6J2sRu+FFkG/mFRzKv/tBN3qM49Nj3tljIp3cBJWVZ B6rflNvVP+pVZcEk5uPpqq1XN9YvfJzGKLSiR9yvr6PnNk5NhcwU13TjL+KbiOdzGEfIfF y7x7zzgAIiGAia7hJgimyr1J97lrlBOndxlYDFYmW3wRbZElKaBl0b3glI9tIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5ae83e0d871bc7cbe4dcc9a33d37eb689e631efe commit 5ae83e0d871bc7cbe4dcc9a33d37eb689e631efe Author: Michael Tuexen AuthorDate: 2022-09-22 10:12:11 +0000 Commit: Michael Tuexen CommitDate: 2022-09-22 10:12:11 +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 --- 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 e79cf48b9e55..ac2944a94e36 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -2739,14 +2739,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) tcp_output(tp); sent = tp->snd_max - oldsndmax; if (sent > maxseg) {