From nobody Tue Jan 16 19:05:17 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 4TDz3d6snbz57qcm; Tue, 16 Jan 2024 19:05:17 +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 4TDz3d48Zhz54c0; Tue, 16 Jan 2024 19:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705431917; 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=02dXF+WZIeik4rZ24MfDz4r3cnTkelPHz4I8MZMLNr8=; b=aiZZ8k6sc4JjlohQID7zedpyuImt6H+BvWMLd2hA4hSkWXbsOuF0toTemnUfPyNpMVMzHT JDFjUpaopInuM1ZpFQOHUulxGv0Nyvzz/GB4QPDjel6nSCKPdL9i1UXbIFa0yRiaTJGkww 78UwgD4S2JSjrGNYiG5de5q0YOj2YGiRMP0gvTfkRUMLgI7SubWy9IuwRdm3SaS4iZvC2B sY2X4ZE/cEBxCZ+eatodWtamSA4lG3egYFv0dCpZKOfPZRXDsdyfTxTdFZh+cdX79fdeAw UjCKt1N05kLj45y9lVY3pamaEYKpyK8LM+0QObuDjdHjSTJMsN3fXAlQK23zyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705431917; 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=02dXF+WZIeik4rZ24MfDz4r3cnTkelPHz4I8MZMLNr8=; b=imRYZVPLIREtROKMMHEef/35juupQgPOwrggwURTGFom+j3+Z77hjr3IeAS0pFB5Eaxb0D SXMHaHPUC+i0uk7BMbGnGqJc5kP3QJq5xGD1QRQEfG28l2zNAqGr453bB8aF/MTWU9UoMQ uTAUA58+W3JQQSebXVpRZGPSQ5ZzSSKfhmmMCvFZtpi5goIbK9NCE5Nt/IJtPkDLhzUjeU MSwtoTVy92anDmDmSifZinJHBpbK9bhBTAbPQRjPmsC8LuDelvnIgxD91lqUpTiWXfImEc pYLfCsZbfcUfMX6bOKD7qYVn0VFSzF7wOaCHrZYQ2gJd9u/lyqpR7CrarQnUHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705431917; a=rsa-sha256; cv=none; b=YKhuXYdjlHZgEJRlbS9u9ZbfXLCbY1nSec7pYP5xrYAHlIvWbiMovZgx/IEZK+FZjZa2vA MaiGVKPXG1ckIHo5vAES5t1EldGrREKZaqU5huqQmjkEJFPOMO7A6JzIfjvcLZRJjWEWHG HctoFDjjkJcvkZmre09E2iBCAKuvJ5ll4TJldHB5IyIiJQ3/sQ5iD+QLH0OsgG24WVvGwU EkMIiFTYRwFXZscv30wQdRJeaw8kJb9qW47SObG3wL+5lZF995H/u7tmXtS5KL08vtzWJ/ tCGoIBDAlXid2+2C1aZP7nQszITSlSzWuxW1KrnsaD5FuT/eC6WpOF2SUtCwVQ== 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 4TDz3d3GdLzsMk; Tue, 16 Jan 2024 19:05:17 +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 40GJ5HUL010329; Tue, 16 Jan 2024 19:05:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40GJ5HOk010326; Tue, 16 Jan 2024 19:05:17 GMT (envelope-from git) Date: Tue, 16 Jan 2024 19:05:17 GMT Message-Id: <202401161905.40GJ5HOk010326@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: daa0dc908882 - stable/14 - Fix two latent bugs in hpts. One where a static is put on a local variable, the other an initialization bug where we should be setting tv.tv_sec to 0. 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: daa0dc908882f1a724dbe61af2ee86115bd86461 Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=daa0dc908882f1a724dbe61af2ee86115bd86461 commit daa0dc908882f1a724dbe61af2ee86115bd86461 Author: Randall Stewart AuthorDate: 2023-11-27 19:38:06 +0000 Commit: Gleb Smirnoff CommitDate: 2024-01-16 18:47:49 +0000 Fix two latent bugs in hpts. One where a static is put on a local variable, the other an initialization bug where we should be setting tv.tv_sec to 0. PR: 275482 (cherry picked from commit 6a79e48076bcce3e902323e62689eacb98faa180) --- sys/netinet/tcp_hpts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index e39c2b69ea7e..a85eca08b815 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -1527,6 +1527,7 @@ __tcp_run_hpts(struct tcp_hpts_entry *hpts) hpts->p_mysleep.tv_usec = dynamic_min_sleep; /* Reschedule with new to value */ tcp_hpts_set_max_sleep(hpts, 0); + tv.tv_sec = 0; tv.tv_usec = hpts->p_hpts_sleep_time * HPTS_TICKS_PER_SLOT; /* Validate its in the right ranges */ if (tv.tv_usec < hpts->p_mysleep.tv_usec) { @@ -1608,7 +1609,7 @@ tcp_choose_hpts_to_run(void) void tcp_run_hpts(void) { - static struct tcp_hpts_entry *hpts; + struct tcp_hpts_entry *hpts; struct epoch_tracker et; NET_EPOCH_ENTER(et);