From nobody Wed Apr 17 14:15:30 2024 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 4VKNGq1QpSz5H02G; Wed, 17 Apr 2024 14:15:31 +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 4VKNGq0rN5z4w3h; Wed, 17 Apr 2024 14:15:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713363331; 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=XXP/TUOwDQuYJFYoNCZ38h9/agCqnQAVQxDzYALL4RM=; b=b86ySwhPpnJQulpgKR6Y0HhjCkipmUF83SyNgaHT25ukOIE/4zrk2qos2RhKRhJhoNfcd6 9uJWUA3TIGSud1J58jnJZzlxo2BVMbpVzkS+hlilguv2EbRNB7LEfwVredQ9MnDuh61R1E MMmriBKVIrWu5v+bslsUhgtV0nhI0o9bdSdMDsLSsd/jaRpL5dwTT/PQ0UF8s6E4eC4naS ZfsNR1/w9cpqOJRDd+7BYnbb1fKqiJdpZhzRXHm9DWuKUMwOXSZv6J6r0KLqoEBfNCHGiy Ahr7Q9gmzwUi6W1AsXXb+SKLRrlXs2CRIz9FM10aaoffZYkxEIQH8MDIbRpKIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713363331; a=rsa-sha256; cv=none; b=OtHy0RgiJpn62CRra9ZpPUXSgOADqcaZ2U2XLkIQwB86sYzukOxtWNyrA4mNItVLcQfbzx pnLImg4W/Mt0VbJ646V7URhZ4U8csW+Qs5hte+kkkdozAeTjdowxj+GUpQNjzn0YoNSsH5 wGOG9tKitLXQrDtK3AhZMn0UcMtfgRFKwHjScgXENGcV/2GgqaMxYQNbCTjgQv0aLICAPm eMDRRblSn/9LiXC+8nvI2uK7PtVltpOnNd5SYah8u7JgTNGak8F5k3mWHkNOFV5ODVYmGS i0q4x4PMvJEjM5WYuwt7Nmj/BxV7VrgPNgtZeKwXavNRcNx6lVRs/e19hV7fug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713363331; 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=XXP/TUOwDQuYJFYoNCZ38h9/agCqnQAVQxDzYALL4RM=; b=xHrfhQLpxXZhzRsYdCXY45i8Pf7hpwab6LXwFuLTfdOBx9nJJkxcP8r61sygWhtwaX3GyS Eap7gtKST7cTuedO6WpH6bE8JROkQWF7GdxexuvUbDhsHhp2TACz0E/OQrTTnv0zwdpJF5 6OygGuXXyhJk9G0BhIUQHnMWXoqyttcoih87N0MFqDpuNiK17gnz2VpsTIRBFl/5KT7p3U ZbFHDgCDwOYNFeEdmyRuXQCbAHGG79rXtvvbie0UcedWc5KrDU+XQ6Tsboj6r0SwshpWut dTZ8n1LSEgV7RaoweRW12Ml+oW3Yi26sG/gtrI8z2T8A6O7IUOCEkb7awJwF3A== 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 4VKNGq0RW1zVn3; Wed, 17 Apr 2024 14:15:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43HEFUTh072323; Wed, 17 Apr 2024 14:15:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43HEFU7F072320; Wed, 17 Apr 2024 14:15:30 GMT (envelope-from git) Date: Wed, 17 Apr 2024 14:15:30 GMT Message-Id: <202404171415.43HEFU7F072320@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: b5ee7411bfab - stable/14 - tcp rack: fix sending 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/14 X-Git-Reftype: branch X-Git-Commit: b5ee7411bfabaf85f226fdfc4f2d8e0515d66691 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b5ee7411bfabaf85f226fdfc4f2d8e0515d66691 commit b5ee7411bfabaf85f226fdfc4f2d8e0515d66691 Author: Michael Tuexen AuthorDate: 2024-04-05 15:47:03 +0000 Commit: Michael Tuexen CommitDate: 2024-04-17 14:15:03 +0000 tcp rack: fix sending In rack_output(), idle is used as a boolean variable. So don't use it as an int and don't clear it afterwards. This avoids setting idle to false, when it is not intended. Reported by: olivier Reviewed by: rrs, rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44610 (cherry picked from commit 7df0ef5f48e1c67b3f1df7c7964bfa59bc56f4e4) --- sys/netinet/tcp_stacks/rack.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index fa3cd2f4f698..b05d19f5cbc2 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -19927,6 +19927,10 @@ rack_output(struct tcpcb *tp) #endif int32_t idle, sendalot; +<<<<<<< HEAD +======= + uint32_t tot_idle; +>>>>>>> 7df0ef5f48e1 (tcp rack: fix sending) int32_t sub_from_prr = 0; volatile int32_t sack_rxmit; struct rack_sendmap *rsm = NULL; @@ -20164,8 +20168,8 @@ rack_output(struct tcpcb *tp) if ((tp->snd_una == tp->snd_max) && rack->r_ctl.rc_went_idle_time && TSTMP_GT(cts, rack->r_ctl.rc_went_idle_time)) { - idle = cts - rack->r_ctl.rc_went_idle_time; - if (idle > rack_min_probertt_hold) { + tot_idle = (cts - rack->r_ctl.rc_went_idle_time); + if (tot_idle > rack_min_probertt_hold) { /* Count as a probe rtt */ if (rack->in_probe_rtt == 0) { rack->r_ctl.rc_lower_rtt_us_cts = cts; @@ -20176,7 +20180,6 @@ rack_output(struct tcpcb *tp) rack_exit_probertt(rack, cts); } } - idle = 0; } if (rack_use_fsb && (rack->r_ctl.fsb.tcp_ip_hdr) &&