From nobody Fri Apr 14 13:33:44 2023 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 4Pycpx0gCnz45FgR; Fri, 14 Apr 2023 13:33:45 +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 4Pycpx0FDPz40FY; Fri, 14 Apr 2023 13:33:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681479225; 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=XIS1VpguLU1V6BMUnnU2A4pXwDLApgrnvukzMq/3pjY=; b=M/PwS8zN59fG7prKDDOfJ6jJ/RHQeJnFNEgWAaeOv6gPqWBfQ/mRnPu6SfxQUM9R7NPP0S qarz4qZjO7Gwy95Nuyk9oSrAwKUMRKIAl9Us7EODknkdNXlJZ6O0hgwriibGaeQDjEblMu SgCtlptDHjo23+ZxoabDEUjiHtxdMMCzJBHnHChUy39y3xUjYLRuRF7KF3Az2iokos30dq ON3kcNSHGnA/5blcxhuhVViWmKxDkTbGoKpejZVR3HGNwh2VOOqtZE0BTD38XQn687Sw8a P2LoRbtoxDr9EOZc/u8cnet2n/LSoXWPiwLSJe1aFQXI3EK90uqg986AfPHXMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681479225; 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=XIS1VpguLU1V6BMUnnU2A4pXwDLApgrnvukzMq/3pjY=; b=c9tJPxxPymva8NKhYihbRRsuQXlaEldW9fcohxWuMXnco/rII522CgTHwlZ7wXgRpkhEx/ wq4kPhXLsvPYA9WzdXexGiwL6ON3tCEy61vEPSQb2yA7149sw8NoEPqwwEeQQgsvOScaIE q1XaHovjbAgmaTS/6Z3m+tiJy/xVft/g156Ds1hnZEgpNCkHb8CBdLTLeFbzfw3mwERjUM QGFxWII/61Vr66WRVu8kZwNxA5JAjuMC9dX2cPw0HTcWz35iXsn5M+QfK34KmB+Q7rXENl VB6hrTQPOHoJlzkUZogzUTNerd+mBUY+AsGBGZK185TyFPNUU2zftRzZQA/hMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681479225; a=rsa-sha256; cv=none; b=mNYFNa3q4trd3CF6TO++pKYU+fbPpIbY6lLH2oWnaTdFPxxFGcXKLBQCwHMV8J4j2uRSmX I5ihAAD8nTwRctQ/dQH7ZaTbXbHChWWT0j/dlT1jrvT1J9moTpwCa1Fvq/MyG8OzUsGXGb cWfr5WbCIdTtZsJf0gk3vGHdr86uumx9deTfBVUsQ7eanrp+Xck8pcw8+NAwTUw/VMB9fU 1K4cjT86LxWahTdMVuJVArqUXQqDg6DwULazlVdUDiOIytjXLB+SwuXLIYJ4mdARZh+47q Ac6EonP9mogd9GlInxpcfYDPtNELmhLDKMcUePtRzPIT665sElmPiqDky0pKsA== 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 4Pycpw675pzRCm; Fri, 14 Apr 2023 13:33:44 +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 33EDXicj040922; Fri, 14 Apr 2023 13:33:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EDXigo040921; Fri, 14 Apr 2023 13:33:44 GMT (envelope-from git) Date: Fri, 14 Apr 2023 13:33:44 GMT Message-Id: <202304141333.33EDXigo040921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: 9903bf34f01f - main - tcp: rack pacing has some caveats that need to be obeyed when LRO is missing 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: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9903bf34f01f3972b1c19ac6e6263faddbc2cd3c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=9903bf34f01f3972b1c19ac6e6263faddbc2cd3c commit 9903bf34f01f3972b1c19ac6e6263faddbc2cd3c Author: Randall Stewart AuthorDate: 2023-04-14 13:33:36 +0000 Commit: Randall Stewart CommitDate: 2023-04-14 13:33:36 +0000 tcp: rack pacing has some caveats that need to be obeyed when LRO is missing n further non-LRO testing I found a case where rack is supposed to be waking up but it is not now. In this special case it sets the flag rc_ack_can_sendout_data. When that is set we should not prohibit output. Reviewed by: tuexen Sponsored by: Netflix Inc Differential Revision:https://reviews.freebsd.org/D39565 --- sys/netinet/tcp_stacks/rack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 1bab253818b5..a6a15514ff53 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -11578,7 +11578,7 @@ rack_log_hybrid(struct tcp_rack *rack, uint32_t seq, log.u_bbr.lt_epoch = (uint32_t)((cur->deadline >> 32) & 0x00000000ffffffff) ; log.u_bbr.bbr_state = 1; off = (uint64_t)(cur) - (uint64_t)(&rack->rc_tp->t_http_info[0]); - log.u_bbr.bbr_substate = (uint8_t)(off / sizeof(struct http_sendfile_track)); + log.u_bbr.use_lt_bw = (uint8_t)(off / sizeof(struct http_sendfile_track)); } else { log.u_bbr.flex2 = err; } @@ -16493,6 +16493,7 @@ rack_do_segment_nounlock(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, */ us_cts = tcp_tv_to_usectick(tv); if ((rack->rc_always_pace == 1) && + (rack->rc_ack_can_sendout_data == 0) && (rack->r_ctl.rc_hpts_flags & PACE_PKT_OUTPUT) && (TSTMP_LT(us_cts, rack->r_ctl.rc_last_output_to))) { /*