From nobody Fri Dec 19 15:32:12 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 4dXs3K1293z6LtFZ for ; Fri, 19 Dec 2025 15:32:13 +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 4dXs3J626sz3YxZ for ; Fri, 19 Dec 2025 15:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766158332; 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=RNXgqb9So5xJjJ9gFcotrW1stasZVQbN3O16WtWfKQw=; b=nBxfWuAS9r5TWKiFHgG8hhunJR5yd51thWhPEOdA53+xj3L7DEUt7FY47v77C2cFzdkU/9 nnClHrb4+LFNdaC+TZGkM5wsipuv40IrDDMdJ6hqEfkb9ZRMid7GnAJ2eXsdfnXEidKBRc UVyyQBJZp6YIE/h2vMnU09vSEy8wQkOxBD6QIAtCgTgiI9w8gaL5keJE/jT19pbvflU/aI 89n3Kv0roFaVQ4EaOTKPIpweBSCn0OIiSLOpUQ4HWlK2K6x5mfvYIuk0s25FVcgGYM0df8 wYpkbDs9Ox6mfZhSabl65mJTzDNTLohHkEElGzPkB0053MJZ8o1rETxyrpx5NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766158332; 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=RNXgqb9So5xJjJ9gFcotrW1stasZVQbN3O16WtWfKQw=; b=temINZf0G9+pzhM+s4gCG976PSVTmmdi03zKb6fmoqNET3gzXPLS2cVVQl1Utg+eXLFOD2 hopC92rkYlS8HWJBOn9sdr8mHUUvTIJupRFf/7jn4VitB0bFtaunV0VhvCQYE7ug2N8ia2 rQytUdA0Ly8n/ysy4PxrTfLdI7s6CdkxCWLYlbejdLN6dmG6bA+vdSGAZo4WruYFmpaKiN f7s6l9fXgV+mpz3/vU0QhRhpEmHxZ/skV+NFXaP83eC4iMYQjJTri2KZmBCc4hUkEwXX+F 9a0T3xKQCCy0VKe5FEMMk8wOsCkaWGUzolaXuMV2agJGotwq7g6r4kkOCifFWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766158332; a=rsa-sha256; cv=none; b=yatjqBg0FHfNPHs/jApGBj2u7CE+nJFE4TGX6PnRxAfCY1z7mL4VTUOIB0aQMSqbpwDzQp hr7XKJH7GhqcOV0SE6m2u7pnVnpEd7VzzqGHHz0Gxyh/dfCroht+cu8MNEzAIsZrfspy/f SwY3d74BhYn18G/pWcf7lgBnHudyD0ccOm55Y1D7KNPFP3ZbaXGeipJcsu2e5jO8H1kD0l 8dgkxN7Sc78DP844utypQA1tBp3zCRaPkYsYzXyRVMbH6nQdH79U+PCd6BZQsQhkjD2EsR NPeCmwkN/oYv6oscD/xBpMGf/oTwh9IW+BzqFSsF7Ow2jBhIObdTSMiO+UdL5Q== 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 4dXs3J5WHgz1S6V for ; Fri, 19 Dec 2025 15:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44a83 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Dec 2025 15:32:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b35c6373910a - stable/15 - ruxreset: Add an inline function to reset all the stats in rusage_ext 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/15 X-Git-Reftype: branch X-Git-Commit: b35c6373910aef21bd01f7b52b4b58bd85ed306d Auto-Submitted: auto-generated Date: Fri, 19 Dec 2025 15:32:12 +0000 Message-Id: <69456ffc.44a83.67a449b3@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b35c6373910aef21bd01f7b52b4b58bd85ed306d commit b35c6373910aef21bd01f7b52b4b58bd85ed306d Author: John Baldwin AuthorDate: 2025-12-08 16:15:20 +0000 Commit: John Baldwin CommitDate: 2025-12-19 15:19:44 +0000 ruxreset: Add an inline function to reset all the stats in rusage_ext Use it in proc0_post to reset per-process CPU usage. Suggested by: olce Reviewed by: olce, kib Differential Revision: https://reviews.freebsd.org/D54049 (cherry picked from commit 3f8ed605dbd0ee211ce8fe59c0c072b916d6311c) --- sys/kern/init_main.c | 5 +---- sys/sys/proc.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index a2898f75a795..3f3ebd386150 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -660,10 +660,7 @@ proc0_post(void *dummy __unused) microuptime(&p->p_stats->p_start); PROC_STATLOCK(p); rufetch(p, &ru); /* Clears thread stats */ - p->p_rux.rux_runtime = 0; - p->p_rux.rux_uticks = 0; - p->p_rux.rux_sticks = 0; - p->p_rux.rux_iticks = 0; + ruxreset(&p->p_rux); PROC_STATUNLOCK(p); FOREACH_THREAD_IN_PROC(p, td) { td->td_runtime = 0; diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 81f0d41d6a6f..5142f67d0a42 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1326,6 +1326,18 @@ td_get_sched(struct thread *td) return ((struct td_sched *)&td[1]); } +static __inline void +ruxreset(struct rusage_ext *rux) +{ + rux->rux_runtime = 0; + rux->rux_uticks = 0; + rux->rux_sticks = 0; + rux->rux_iticks = 0; + rux->rux_uu = 0; + rux->rux_su = 0; + rux->rux_tu = 0; +} + #define PROC_ID_PID 0 #define PROC_ID_GROUP 1 #define PROC_ID_SESSION 2