From nobody Wed Feb 09 21:19:54 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 C4EF519B4840; Wed, 9 Feb 2022 21:19:54 +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 4JvCSp5DhBz4kf5; Wed, 9 Feb 2022 21:19:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644441594; 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=3qsV1KHZPD0HJm/+ei8lvMfuyl4gVf0Ho3GkBc0bBx8=; b=QH6g0VlqlvXqdXzFBESJhQ4Gsy2t2p/xVqwmI8nAl34vS4Jocli+oFRwkiWXis8hTZ1oqW 4vpQ9snFX5eWoEFVvzTcUOxDjtLSnPq5z/YR0xB9V/PumxTJsghYG3sLhIiTpwT5ulEFdr 8kTAsdAFFUh9R89mh5/oS1ZBhGWSAR+n2dxFulq8ahW6yNL1wv6jHzBy5jmKwt7OD3KIn5 MK0UqThmTx/MIObLjtxAq5lSPvPIyAx4dAwvt5DnijkvBt0SbbBhBjzCfgLsgQeYpkMw4D BH3qfQpWInllqkYLUUf9KU3zA4KlqUZ0EO1eOJMge5BZNKu0Ybj1IRjaVRpVfA== 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 93E1614710; Wed, 9 Feb 2022 21:19:54 +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 219LJsT0028791; Wed, 9 Feb 2022 21:19:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 219LJsJv028790; Wed, 9 Feb 2022 21:19:54 GMT (envelope-from git) Date: Wed, 9 Feb 2022 21:19:54 GMT Message-Id: <202202092119.219LJsJv028790@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: cc41c17433a4 - main - opps my patch lost the removal of the tlp_threshold counter increments 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: cc41c17433a4d3fb8218030b145515c6560875dc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644441594; 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=3qsV1KHZPD0HJm/+ei8lvMfuyl4gVf0Ho3GkBc0bBx8=; b=olhJfq5DqCvm+zAcssqVJErm0vJp+XIsbot59S50dCAi6r4QD0hJTPmG+0aAX8a9xARUAY OX894ErjRfadb9c8wk8xVozqYVAltaSApnTBwWuN8XxLEm6dYTLh7oexDSKJqg8wTRiOV8 sbXELecPm+xK7wdjPgsLZhACnLH4BIko48M8Ts73gOVwXVJGwa8+JLyuf8z6XvAmU6lETv 3OHrdLUXzB0IZjdWutWfRObJ5HEhJSWMCYDDowh24BFLmojLXY5q+00sBupE9aIOpYe19L IU7zlhOUlnZ6CKIC4ID4Y7BPbUAmkVVpm78Zj8Ylks/57PA5EaB05ZrRwYIeNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644441594; a=rsa-sha256; cv=none; b=SyFYXtGXiFoaNPRQV4H0i09z3iax0BlIEw6x/5Db/c7kphMkMnAajDoux28WDpuyzAdUsd FrmVv+xRqDVutCMBg1GI84iURL2TTW5LCd63mYAaqCV6xGtcKTSyp+KYur7x3rH013V/QB Rpu61qQ88Fj7jp/F54+3kXw89CBPrmb6dVzGT1HCVCpSHslHTjjNNqr8P3UdjvYOe1xjA9 E1w3YjfhrUe99NeSZaqbB+xQ07ptxyW0Mn6f9LqdB+a48RqeSpFBHSnnA9Dgshir/VHxrM mNFDlcqtLUbKly0namWQYtpgCCPMEU1nSq8YbgQxt0Dj/c9QB6U5nYBqorQFBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=cc41c17433a4d3fb8218030b145515c6560875dc commit cc41c17433a4d3fb8218030b145515c6560875dc Author: Randall Stewart AuthorDate: 2022-02-09 21:19:22 +0000 Commit: Randall Stewart CommitDate: 2022-02-09 21:19:22 +0000 opps my patch lost the removal of the tlp_threshold counter increments --- sys/netinet/tcp_stacks/rack.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 2abaa92dc43a..63a36c716531 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -5007,7 +5007,6 @@ rack_calc_thresh_tlp(struct tcpcb *tp, struct tcp_rack *rack, /* * Compensate for delayed-ack with the d-ack time. */ - counter_u64_add(rack_used_tlpmethod, 1); alt_thresh = srtt + (srtt / 2) + rack_delayed_ack_time; if (alt_thresh > thresh) thresh = alt_thresh; @@ -5023,7 +5022,6 @@ rack_calc_thresh_tlp(struct tcpcb *tp, struct tcp_rack *rack, uint32_t inter_gap = 0; int idx, nidx; - counter_u64_add(rack_used_tlpmethod, 1); idx = rsm->r_rtr_cnt - 1; nidx = prsm->r_rtr_cnt - 1; if (rsm->r_tim_lastsent[nidx] >= prsm->r_tim_lastsent[idx]) { @@ -5037,7 +5035,6 @@ rack_calc_thresh_tlp(struct tcpcb *tp, struct tcp_rack *rack, */ uint32_t alt_thresh; - counter_u64_add(rack_used_tlpmethod2, 1); alt_thresh = srtt + (srtt / 2) + rack_delayed_ack_time; if (alt_thresh > thresh) thresh = alt_thresh;