From nobody Fri Dec 19 15:32:41 2025 X-Original-To: dev-commits-src-branches@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 4dXs3s5cMdz6LtQS for ; Fri, 19 Dec 2025 15:32:41 +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 4dXs3s3BD7z3ZtS for ; Fri, 19 Dec 2025 15:32:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766158361; 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=kDGLevQ7psJiou+g1mUcmRRhpuVmNmwFsk8uH+c3fS4=; b=T3JG/uMP7U+PEAoHjRFfxVIwK9pBlqVvKaQY7xPV/IcqCI2nOWCYtAU/ARk0u8azue6yzX hSoUKqmbBafQ3RGPjR2nzBgD+ejPdWcyvkdYcdUA4bMyP/MNj56bP/tvlRG+jJESTzkRiH nko0wsffVmZiO0TdzPlJ88qotNLUPuSmAaa0QNJlp3dmac6yiuXlSsytpynMU2rt5KCmOF 7NgmNKdM7btYFT7EpXwATwFxHkR7o0YOTt7+5baL+CmKhFUUf9K7OnxxTWeLgyMb9fMKNk jYOcWC3BgPmwgx3pO4cHHBEoTV6oQu8+f7Us4e6OZD5l1TC2dROAVkJlr+dGTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766158361; 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=kDGLevQ7psJiou+g1mUcmRRhpuVmNmwFsk8uH+c3fS4=; b=fBEFdrYJlYlN+WNP5OZ4xcdv3Je725axncacKd63Al/XU7xooS4KgSzwIACbSXaY4wfYjo Qzoqw3+OjBjS9aqXlVhSoMz/X38Y+vU3fGyqIJbAl83b9gqyfXV6p+GFIBnrz6tVjLnrBW /FW1vxmKyoy35nUNVeNyi9EQu9B7L2Sg5z4hJbEuAqZxo+eUs8xd6yxPZVsHGMSo6tDgnr sO3BxYnb0wEkQnemBF0CPsJgDh32SKi3fXrKBfDs8QrvH8yOliweADvoA+1KCxUJTmJV6j oYjl36k9Rwovvs/ztZveEweifLyOp380sRg2iqo3k7piYfcCpZiJbTIXrqrLPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766158361; a=rsa-sha256; cv=none; b=WfVdNknScp33Gg6TLoaFsypIZ76hMA4mPqEd0Qhg+Jv9cp4+pVPapJ3Mbl67sjOSFT1b8f zplQY+hlVZogchvEfexrxBdC6Vaq0koL5FWlo3ICROtMpjIwIVu0nhg2SMIXIvNX8YfN3L gxqoAbm3uZJ3ulPcHDLWktVemcWrh1VF9ekRrEG8tWdbf46t5ifX0mp0uHcgWDJuK3+7un GQ7iSxBHdq9HxGTyAL26QC36BmeheSQtYX4mNzWqyWlhADJVG1nXQhgE7pNsiO7p7y2qoN 1BBpsyz47JlyKwmK0+KLeGJOVJlljrIxiXVQRZ/PpIo3IlBZuTEo70ddVGBUAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dXs3s2hQwz3K for ; Fri, 19 Dec 2025 15:32:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45401 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Dec 2025 15:32:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: cdad10ea780f - stable/14 - thread0: Clear td_rux stats in proc0_post List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cdad10ea780f9b2f4d49a073a07709b2ceb9d59a Auto-Submitted: auto-generated Date: Fri, 19 Dec 2025 15:32:41 +0000 Message-Id: <69457019.45401.2994adf1@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cdad10ea780f9b2f4d49a073a07709b2ceb9d59a commit cdad10ea780f9b2f4d49a073a07709b2ceb9d59a Author: John Baldwin AuthorDate: 2025-12-08 16:15:36 +0000 Commit: John Baldwin CommitDate: 2025-12-19 15:19:41 +0000 thread0: Clear td_rux stats in proc0_post proc0_post aims to reset the CPU usage accounting for all threads and processes in the system to zero once the time of day is verified. However, not all of the per-thread stats were not being cleared, resulting in over-reported time for thread0 post-boot. Reviewed by: olce, kib, markj Fixes: bed4c5241663 ("Implement RUSAGE_THREAD. Add td_rux...") Differential Revision: https://reviews.freebsd.org/D54040 (cherry picked from commit dafe50ebd874ca3ccd5908c441cee9f478c501f0) --- sys/kern/init_main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 47707b4068ad..51a6e7e7d909 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -650,7 +650,8 @@ proc0_post(void *dummy __unused) /* * Now we can look at the time, having had a chance to verify the - * time from the filesystem. Pretend that proc0 started now. + * time from the filesystem. Pretend that all current threads + * started now. */ sx_slock(&allproc_lock); FOREACH_PROC_IN_SYSTEM(p) { @@ -663,10 +664,13 @@ proc0_post(void *dummy __unused) PROC_STATLOCK(p); rufetch(p, &ru); /* Clears thread stats */ ruxreset(&p->p_rux); - PROC_STATUNLOCK(p); FOREACH_THREAD_IN_PROC(p, td) { td->td_runtime = 0; + thread_lock(td); + ruxreset(&td->td_rux); + thread_unlock(td); } + PROC_STATUNLOCK(p); PROC_UNLOCK(p); } sx_sunlock(&allproc_lock);