From nobody Mon Oct 13 20:28:33 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 4clppB0w2lz6CJy5; Mon, 13 Oct 2025 20:28:34 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4clppB0FjVz3Sj4; Mon, 13 Oct 2025 20:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760387314; 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=yl2wkamah1uZEN5aXtm3X/bOoIHbw9D0O5BUbVA17Ho=; b=J+P7necs98Zh7xzRUUlbAUksiGnrqKLPd+EmEQKnryO7BeeGkHJ/DI/zJDvSx+cnTfFi63 4Lq+nTk1ztnQycjzvzIiqS4qOKzTK8FBCZIInt5V6KmP9AxETzzvk3WvXU2R/5Oo/mMjPY tPuiq0f+3poU098Ll5NO4XlqXmtdmz2iyam7li42dT/J7PKEwNaDMjXsWsQ4X4bEkbGT/e kvwdcsFZ2tyO0Y/OuuXkm/92Ag4Yn7JqmKr/uGG9mTL87oATM0x8ipZO9r7oFGfSB8hQhm gsE07LcMwdCClxW6ggPI+qkoh9QXVPTGMU1VnzhF/9lC1L2VAuNJIR3RQSsaRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760387314; 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=yl2wkamah1uZEN5aXtm3X/bOoIHbw9D0O5BUbVA17Ho=; b=BdmlzxIb+a86SM+Yy8vms/qGi/N8YgCa9lNqwYFlRbloapXuHlF21tJS+uQIC2IlzEZ+uf a8oLHGStJlYULjUIT3h7NBbKKbnHjZ0o9VsUWnIr9Vgf4fdlLeOz/4fkcIGiwWZXG5h9Ag yxUg4J4yq5FFjRkyrNp3AUozfCn3r0sUdiVEMURWtxUUGFYIV4ujaKxF83ny2TXolwISrd ciXrdJuwQKi/+pVxDFDqZmqtQ2mdf1OVuGqDH+txMrV7u+G2ulHulpcmEIK2/zPRdnoIcg Oem83gd21Rwr3q45EkEzpErnGjE8TRaeNGUyQIDiFksbCWlM+n2EzKBBvnQZJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760387314; a=rsa-sha256; cv=none; b=Ni0nWd6kvn0VkFmkT26WB+E7sZLgytydaRsS8ibm8yLdE91bj9gRFoXzG4JMSXhPInSSO+ vqnT0N4T+V001l1eSNS5g91gjN9Py663t5mPBeeNSSWY+t0ahPjYTKqcVOwbSoLtpQY2+u fxVQ2GoF1oAi5AGmC5oRcoTM/4gQ4Sej5oIBf/bTzVTCOuG4BNQyTbT+e7H6JDCCXzrC70 jfOuCcY+VxZJLaRhMZkLYt8gkaC8+fdbgFKDooOzr6gKxRJAEUvOK6bXUu8M6/iWUgenMG GPPEBCvadM2CvEZO/YDPXmkbgZEt04/e7ysxiJNUItutJBTDobAN8XBFNs47HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4clpp96yfmz63v; Mon, 13 Oct 2025 20:28:33 +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 59DKSXCX015039; Mon, 13 Oct 2025 20:28:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59DKSXC1015036; Mon, 13 Oct 2025 20:28:33 GMT (envelope-from git) Date: Mon, 13 Oct 2025 20:28:33 GMT Message-Id: <202510132028.59DKSXC1015036@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: 0eef2b4a002a - main - tcp: fix a bug in HPTS 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: 0eef2b4a002aace2ac9cc092bee6e10f6332f5ce Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0eef2b4a002aace2ac9cc092bee6e10f6332f5ce commit 0eef2b4a002aace2ac9cc092bee6e10f6332f5ce Author: Nick Banks AuthorDate: 2025-10-13 20:27:43 +0000 Commit: Michael Tuexen CommitDate: 2025-10-13 20:27:43 +0000 tcp: fix a bug in HPTS Reviewed by: tuexen Sponsored by: Netflix, Inc. --- sys/netinet/tcp_hpts.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index fbab912b9a1f..133703a5ede1 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -1445,6 +1445,8 @@ no_one: * more slots (if we did not hit eno-bufs). */ hpts->p_prev_slot = hpts->p_cur_slot; + cts_last_run = cts; + cts = tcp_get_usecs(&tv); if (!from_callout || (loop_cnt > max_pacer_loops)) { /* * Something is serious slow we have @@ -1465,9 +1467,6 @@ no_one: goto no_run; } - cts_last_run = tcp_pace.cts_last_ran[hpts->p_num]; - tcp_pace.cts_last_ran[hpts->p_num] = cts = tcp_get_usecs(&tv); - hpts->p_cur_slot = cts_to_wheel(cts); if (!seen_endpoint) { /* We saw no endpoint but we may be looping */ @@ -1479,6 +1478,7 @@ no_one: goto again; } no_run: + tcp_pace.cts_last_ran[hpts->p_num] = cts; /* * Set flag to tell that we are done for * any slot input that happens during @@ -1511,9 +1511,8 @@ no_run: hpts, hpts->p_prev_slot, hpts->p_cur_slot, cts_last_run, cts, loop_cnt, wrap_loop_cnt)); - if (from_callout && tcp_hpts_different_slots(cts, cts_last_run)){ - cts_last_run = tcp_pace.cts_last_ran[hpts->p_num]; - tcp_pace.cts_last_ran[hpts->p_num] = cts = tcp_get_usecs(&tv); + if (from_callout && tcp_hpts_different_slots(cts, cts_last_run)) { + cts = tcp_get_usecs(&tv); hpts->p_cur_slot = cts_to_wheel(cts); counter_u64_add(hpts_loops, 1); goto again;