From nobody Tue Feb 25 20:48:05 2025 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 4Z2V6s73f8z5ns1l; Tue, 25 Feb 2025 20:48:05 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z2V6s4ndbz3rrx; Tue, 25 Feb 2025 20:48:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740516485; 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=c5QI2ZHGeICscofNDIGXisyHaG7AJedKdQAdlCkiick=; b=XrTIxVzRtoA6BUfT+SW6zMIG+jLB8Tckj3wmfrlw7dr/atdSKZHgewEU5o+1nrbQY02tiB DgbKE74A2tr47Xpi0p99fk4xdT3SrOi8P6p0W6IC4s1aqXmG2oGfIsHLjfoIDvmKxrWFO0 OYhZJGNIb/SlYVuJm8/5Cq0e3Zf+EwLYD/+4rgOu+jjS47iurv+qcgIMzxSOw9Re2qNYgi IMesxVwYyz+5GFq0aXyPuFbiX0Y5lVINNE5LRGKYU/hxgX9+wmUPrK0ucG5AmvO7PCgE5Z y0c9+1/6BVVjyNp4Eu8Au2jNtcx49gcPnwHXV1zkAwPe6Y73ASbSmEKMtwIn+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740516485; a=rsa-sha256; cv=none; b=CfC9tmnvCFEky9q4ZDbIz8mo02HsUuOxHMZvTxjXnZyIag9dZRcnQVMlYtbj2k4ZT66cPz ovzKIWSYGI4hHdwhs3ayuxcEHtfkM+y+E73Zud0RlHk3ZieE22Im+ciUfgrruaYm+izmeK vYLlJAdSQzAIJKNj3rq8qK4XG/H/0Pvob5uICNyTeYtp5bQO12kkSl0kdoPSL1Vx7JarTN lR26Va8Yhn0+WrMlL8NNaqv27WQFx8nvYCR6OjkEZplloM66ldd4kIt1g9pwsVZnAMuIC/ A5FL9IpxPl3p/mazbNHVocHei2b5ZSTv/DI8N3dT0NYYN3BWZOJQE84pIcPTOQ== 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=1740516485; 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=c5QI2ZHGeICscofNDIGXisyHaG7AJedKdQAdlCkiick=; b=Wsg6XcoVNn8QDQyElejL9DuJVhnI84eDo+uvrLgZZfW4ICXxIuNe3FwN+htSbtjljWa9cb BUDKIfXX/eqR6D+jnmOJuV5ie/GNBjZ/Bl03fGYcBha/NYj2lv7/VUnv55xNZKGEQvWkTS 5musSwoNvydc7+87JL+o0x2udDNEK8RGizTVmntf+Dsw/tMKLw6gsSxi0wxiunuEYn5jXD 7O/UnB9FwiMCXUM5HPvB+jJoNhYkcZ5hcQgpE+g4MUQRvyyVmEFFYse5+HEVu23GUqnvgt r5u27Q5+bLh/UkZXu7XVY6iubR6vvQxYEko4tl/i5stepU6/KebHRx3+nttYRg== 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 4Z2V6s4Kd2zjkc; Tue, 25 Feb 2025 20:48:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51PKm5lx061344; Tue, 25 Feb 2025 20:48:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51PKm5DO061341; Tue, 25 Feb 2025 20:48:05 GMT (envelope-from git) Date: Tue, 25 Feb 2025 20:48:05 GMT Message-Id: <202502252048.51PKm5DO061341@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: 6f27541d948f - main - tcp rack: cleanup accounting conditional checks 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/main X-Git-Reftype: branch X-Git-Commit: 6f27541d948fa0126f9262f8cc5326b1c4befcc7 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6f27541d948fa0126f9262f8cc5326b1c4befcc7 commit 6f27541d948fa0126f9262f8cc5326b1c4befcc7 Author: Peter Lei AuthorDate: 2025-02-25 20:45:40 +0000 Commit: Michael Tuexen CommitDate: 2025-02-25 20:45:40 +0000 tcp rack: cleanup accounting conditional checks No functional change intended. Reviewed by: tuexen MFC after: 1 week Sponsored by: Netflix, Inc. --- sys/netinet/tcp_stacks/rack.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index ab80ed9f4060..5a9171abeaf5 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -18970,11 +18970,7 @@ rack_fast_rsm_output(struct tcpcb *tp, struct tcp_rack *rack, struct rack_sendma crtsc = get_cyclecount(); if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_cnt_counters[SND_OUT_DATA] += cnt_thru; - } - if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_proc_time[SND_OUT_DATA] += (crtsc - ts_val); - } - if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_cnt_counters[CNT_OF_MSS_OUT] += ((len + segsiz - 1) / segsiz); } sched_unpin(); @@ -19525,11 +19521,7 @@ again: crtsc = get_cyclecount(); if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_cnt_counters[SND_OUT_DATA] += cnt_thru; - } - if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_proc_time[SND_OUT_DATA] += (crtsc - ts_val); - } - if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_cnt_counters[CNT_OF_MSS_OUT] += ((tot_len + segsiz - 1) / segsiz); } sched_unpin(); @@ -19860,8 +19852,6 @@ rack_output(struct tcpcb *tp) crtsc = get_cyclecount(); if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_proc_time[SND_BLOCKED] += (crtsc - ts_val); - } - if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_cnt_counters[SND_BLOCKED]++; } sched_unpin(); @@ -21070,19 +21060,13 @@ just_return_nolock: crtsc = get_cyclecount(); if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_cnt_counters[SND_OUT_DATA]++; - } - if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_proc_time[SND_OUT_DATA] += (crtsc - ts_val); - } - if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_cnt_counters[CNT_OF_MSS_OUT] += ((tot_len_this_send + segsiz - 1) / segsiz); } } else { crtsc = get_cyclecount(); if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_cnt_counters[SND_LIMITED]++; - } - if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_proc_time[SND_LIMITED] += (crtsc - ts_val); } } @@ -21329,8 +21313,6 @@ send: crtsc = get_cyclecount(); if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_cnt_counters[SND_OUT_FAIL]++; - } - if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_proc_time[SND_OUT_FAIL] += (crtsc - ts_val); } sched_unpin(); @@ -22348,8 +22330,6 @@ nomore: crtsc = get_cyclecount(); if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_cnt_counters[SND_OUT_FAIL]++; - } - if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_proc_time[SND_OUT_FAIL] += (crtsc - ts_val); } sched_unpin(); @@ -22403,8 +22383,6 @@ nomore: crtsc = get_cyclecount(); if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_cnt_counters[SND_OUT_FAIL]++; - } - if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_proc_time[SND_OUT_FAIL] += (crtsc - ts_val); } sched_unpin(); @@ -22428,8 +22406,6 @@ nomore: crtsc = get_cyclecount(); if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_cnt_counters[SND_OUT_FAIL]++; - } - if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_proc_time[SND_OUT_FAIL] += (crtsc - ts_val); } sched_unpin(); @@ -22580,18 +22556,12 @@ skip_all_send: if (tot_len_this_send) { if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_cnt_counters[SND_OUT_DATA]++; - } - if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_proc_time[SND_OUT_DATA] += crtsc; - } - if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_cnt_counters[CNT_OF_MSS_OUT] += ((tot_len_this_send + segsiz - 1) /segsiz); } } else { if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_cnt_counters[SND_OUT_ACK]++; - } - if (tp->t_flags2 & TF2_TCP_ACCOUNTING) { tp->tcp_proc_time[SND_OUT_ACK] += crtsc; } }