From nobody Tue Nov 28 13:44:12 2023 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 4SfkFx71nVz52KfK; Tue, 28 Nov 2023 13:44:21 +0000 (UTC) (envelope-from SRS0=3qmc=HJ=klop.ws=ronald-lists@realworks.nl) Received: from smtp-relay-int.realworks.nl (smtp-relay-int.realworks.nl [194.109.157.24]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4SfkFx4qMmz4ZNW; Tue, 28 Nov 2023 13:44:21 +0000 (UTC) (envelope-from SRS0=3qmc=HJ=klop.ws=ronald-lists@realworks.nl) Authentication-Results: mx1.freebsd.org; none Date: Tue, 28 Nov 2023 14:44:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=klop.ws; s=rw2; t=1701179053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=5C9tiD7o6W7OcTxSdwb/YhA4zfxFJ4vWcKYg7Uy4Qsc=; b=xGHMV8D0qZlCYQRys8sOX9L8plW52L5K3GapDcYKQl8LFfqm/0Y7mdLY3fy06rQatK4G4P Yv3X99qLOnK5b/n86QQiM80vhYk3IpskTBNLWKQxO5CZh+A51jon/cll97qBIbjwRM3M0Q dPTV71vVYygsc29f7t4kLGV18RkUa2zRRMUeIqePBh6tRSR2Yz4BnyzZnFcqC3E8ZArNdc n1IYKk3dtKJX45mklkaIPTjVibjCHSCJzBgc8oOndOVcVxuvGUuItu1sRJYQKIK7ACdByT JI6aWohh55UQWwHkW0Ftil1n1uZXM0RYogvPNDuJwc/K91KC8tXGGOvbKHL3yQ== From: Ronald Klop To: Randall Stewart Cc: dev-commits-src-all@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-main@FreeBSD.org Message-ID: <737498435.7036.1701179052815@localhost> In-Reply-To: <202311271939.3ARJdQJK020166@gitrepo.freebsd.org> References: <202311271939.3ARJdQJK020166@gitrepo.freebsd.org> Subject: Re: git: 6a79e48076bc - main - 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: multipart/alternative; boundary="----=_Part_7035_2050740070.1701179052803" X-Mailer: Realworks (681.30) Importance: Normal X-Priority: 3 (Normal) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:3265, ipnet:194.109.0.0/16, country:NL] X-Rspamd-Queue-Id: 4SfkFx4qMmz4ZNW ------=_Part_7035_2050740070.1701179052803 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit The PR you mention gives me the friendly message of " You must enter a valid bug number! " https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275482 Typo somewhere? A quick search gives me https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275382 which looks a lot like what you describe in the commit. Regards, Ronald. Van: Randall Stewart Datum: maandag, 27 november 2023 20:39 Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Onderwerp: git: 6a79e48076bc - main - 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. > > The branch main has been updated by rrs: > > URL: https://cgit.FreeBSD.org/src/commit/?id=6a79e48076bcce3e902323e62689eacb98faa180 > > commit 6a79e48076bcce3e902323e62689eacb98faa180 > Author: Randall Stewart > AuthorDate: 2023-11-27 19:38:06 +0000 > Commit: Randall Stewart > CommitDate: 2023-11-27 19:38:06 +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 > --- > 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 92b2f69c9e58..d673ccbe4a73 100644 > --- a/sys/netinet/tcp_hpts.c > +++ b/sys/netinet/tcp_hpts.c > @@ -1519,6 +1519,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) { > @@ -1600,7 +1601,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); > > > > ------=_Part_7035_2050740070.1701179052803 Content-Type: text/html; charset=us-ascii Content-Transfer-Encoding: 7bit
The PR you mention gives me the friendly message of

"
You must enter a valid bug number!

"


https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275482

Typo somewhere?

A quick search gives me https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275382 which looks a lot like what you describe in the commit.

Regards,
Ronald.

 

Van: Randall Stewart <rrs@FreeBSD.org>
Datum: maandag, 27 november 2023 20:39
Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Onderwerp: git: 6a79e48076bc - main - 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.

The branch main has been updated by rrs:

URL: https://cgit.FreeBSD.org/src/commit/?id=6a79e48076bcce3e902323e62689eacb98faa180

commit 6a79e48076bcce3e902323e62689eacb98faa180
Author:     Randall Stewart <rrs@FreeBSD.org>
AuthorDate: 2023-11-27 19:38:06 +0000
Commit:     Randall Stewart <rrs@FreeBSD.org>
CommitDate: 2023-11-27 19:38:06 +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
---
 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 92b2f69c9e58..d673ccbe4a73 100644
--- a/sys/netinet/tcp_hpts.c
+++ b/sys/netinet/tcp_hpts.c
@@ -1519,6 +1519,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) {
@@ -1600,7 +1601,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);
 

  ------=_Part_7035_2050740070.1701179052803--