From nobody Fri Dec 19 15:32:40 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 4dXs3r4wSnz6LtWp for ; Fri, 19 Dec 2025 15:32:40 +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 4dXs3r2fRkz3ZpP for ; Fri, 19 Dec 2025 15:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766158360; 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=WlfSU3TmTVRhM/4nzr2BquqhCnCATr6j45v2Xgvswko=; b=TnYNSk02OcQIlp63aOU0egWPWG6E0mURw63Ua0tC5x3RUVWGFSwKa7l1YgL3PfFLw7PLml OrjiXZueI/Bn7g9RfZjDCimrL8bzCxSFLfXgH3m9oK7u73BWYbwMVqu10L7Qq79+PAK8ux YTO6TGYEKLynDZBHb51Xbnc4UU4iHnVA64u7uz3NPTdpN+6h2NelKbibDCacfHUG2C1e6h poTd0ntSEeNfdzANboDszRYK4RNOKxTtyLVDRXb1S6aWLPZ7ZDnHIosYF/y7gAVELuDIIK NgUPk87bhKRyhoNSX6qoVVRsYQ4OZav0hJIwT0Qo+TKlGKd9Nc4CrF/UA22/mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766158360; 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=WlfSU3TmTVRhM/4nzr2BquqhCnCATr6j45v2Xgvswko=; b=nth7oC9G3bQbUhwut/ke8c4WwXCPGtX7gsekLqdPWTEunO8vtoJy9hvrZSA3oJlEpfQxsy 1ztL70HIwjyCQaVfoEM/+fzdeOyP0YGGqp2Hjprwv9XO5+00OawBknSCxFH7ijRe2/+b4a ebZ7/75f4XtuCBBmWZVsIMaTvCcHGbkpJh9r6bUVexJzzWiQi4YYomx9gZ9M7QG+IHSl45 OsHJyQkeH4Yu8iCzYuooV3fpbLPJgDJP7XnT+lcS8k6n9pvubHGnWIJR8mdOJfUWOjiPR1 bRqMxa8T3JPsFAJrTTLEDh3esB9Aj5PG/M6gYh3cb9OWfv1MY5raG5PqXPob+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766158360; a=rsa-sha256; cv=none; b=q6JlHzi5RiC4WX6sZBWF6hXx8Qzsu32hB6OURroH7A00c8LRoYfB6hIETgjAlbI4xJ+/ip Am4+5UU1MNSnnlDLSbhMDF8m1jS1cZ0AXUpEe12VG5Vout4t1SoUnlDrGiJauz8bTTH8IH pp9Hew1oXWAHGgZX6uQqWWgk2mMteDfLRC1k0aSJm3kUGOwzIQ6L4DfxlwXiTyZvsdljdV J6hmu513a16dybrv3ozbuidfA8IT0f090l+1kjcZ8BtAjs5iqXDawijep4zcq7XmOhroJB rzQX3CJuWQn218E8HMfHRJ6CIifhOkpKqXeBgNOBE1P4isO0Qd6MToIN+tVsBA== 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 4dXs3r1xCXz92 for ; Fri, 19 Dec 2025 15:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 436fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Dec 2025 15:32:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 5685988838e4 - stable/14 - ruxreset: Add an inline function to reset all the stats in rusage_ext 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/14 X-Git-Reftype: branch X-Git-Commit: 5685988838e403843422b5a727ff385a37b4909e Auto-Submitted: auto-generated Date: Fri, 19 Dec 2025 15:32:40 +0000 Message-Id: <69457018.436fc.171bd863@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5685988838e403843422b5a727ff385a37b4909e commit 5685988838e403843422b5a727ff385a37b4909e Author: John Baldwin AuthorDate: 2025-12-08 16:15:20 +0000 Commit: John Baldwin CommitDate: 2025-12-19 15:19:41 +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 aa541c527a19..47707b4068ad 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -662,10 +662,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 06506f7d03ed..53da0baa02e2 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1338,6 +1338,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