From nobody Fri Dec 19 15:32:13 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 4dXs3L2Jqsz6LtcN for ; Fri, 19 Dec 2025 15:32:14 +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 4dXs3K6c4Vz3YVV for ; Fri, 19 Dec 2025 15:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766158333; 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=0tKZ/VZo9jCH8QZkotCAaNZ4pwzKL+Jl4xrMnG2VZ70=; b=iAqvcVZrVFq4znKGm82J6R0vMPQhxEmZ5ZcFz3NVHviX4OQHdBykHKKXlmVXDYfN5RwPya dIYsZlED1qE02NmSeZBWOAKOqaZWkrLjUa1CeGnTMeZWMPXUnHIUoxbZxCQRZpg6q/M9t+ 9ZUNfrSqbFJg0Of8sbLETKPDr0mzaTeiKaFqxGgzglJR1HQ273jIOwCQfIXGHpbhWtkaNI Jj8QDwuFhymfAtl0lQLm7Yavt8SevAx20rF33WfrKcCBGbAn7/WstWz8CQcSXXOSuBdmKD dd5eXRVC8YQmmcXxkBR4a5HXIZ5EM+zMC1N2bn3jQ6YSR//tMP5Cikq3d+HeaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766158333; 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=0tKZ/VZo9jCH8QZkotCAaNZ4pwzKL+Jl4xrMnG2VZ70=; b=HZvVrMCgfUqYPkGhEjN/7nOQFvmR22Z68iBcbkyNHYYEjs2VgBGK7UMeVVgcADVXfZUfRh 97M/e33YBc6Ljp3Y4qgTbvQXZBLEr8vjjtyrCfj3xr1xm9bIFt4mU4UNzwmw03jsUHn781 ETda+/kgQlvkm8Ycesn95DcJaAKZsmHSK2pSMIS3MK8iXD3l308A0VsxThCkiP1haB6xrd JQSAxrWi4Ky1XJNDj4F8VzOEE2KcXHkmdBKsw7309GJ7ATlsrNYtZwOhrktCXb29W64wd6 bSKkPt2VqzeYmGjCSxLU49FtKujAM+H2DG9DCnEXNPdi7/WqYJGt3n5RwG1Sgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766158333; a=rsa-sha256; cv=none; b=uSiRF82OdGAR3hL0c4pIOQtqiP6YxWT41QchTfdv1j/PBaxtrLsuz88pW9jORWySGG/5kz U0NCfVg4Q5WLcsoskwP1OuiVL+1x8lxVpzWJX2EEAQ6NmVR4Ldq83qg0kTqEDcOfJNU/S/ uISboMpGHE7jdefcChbtn5orlFURG1CNEdBG9zokoBAF4Lmuo1IB53yjCN1sKOG+Ij5sZM 3wIyFGwDBTSItonsPHRo+e43mEkuTaiqoDno73ItvppAst74m84yhIdiN++11FxgkQuyEb zdcfFSR2CZAzwbVZsaAT528l77hL8VRbdL9qg7KN0ZFJIUavSuZc1UFlZu7NFA== 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 4dXs3K69C6z38 for ; Fri, 19 Dec 2025 15:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 434d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Dec 2025 15:32:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: ebb0e512d97e - stable/15 - thread0: Clear td_rux stats in proc0_post 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ebb0e512d97e4355832fdc162a7a036842acf817 Auto-Submitted: auto-generated Date: Fri, 19 Dec 2025 15:32:13 +0000 Message-Id: <69456ffd.434d2.40ea224b@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ebb0e512d97e4355832fdc162a7a036842acf817 commit ebb0e512d97e4355832fdc162a7a036842acf817 Author: John Baldwin AuthorDate: 2025-12-08 16:15:36 +0000 Commit: John Baldwin CommitDate: 2025-12-19 15:19:44 +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 3f3ebd386150..2f28a0cc800d 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -648,7 +648,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) { @@ -661,10 +662,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);