From nobody Tue Nov 11 20:45:24 2025 X-Original-To: dev-commits-src-main@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 4d5dpD38W7z6H1bD; Tue, 11 Nov 2025 20:45:24 +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 4d5dpD2SL6z4Kgf; Tue, 11 Nov 2025 20:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762893924; 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=sh4NWwvnD8OcsJTrQ0ihXFXf7R8shQTwcRfa9f4PRuM=; b=VVPUlnHrOmcycgvAFUQv6yA1xEX3ZrWpVKmpK6Kq7vZGzXRYm2S7YaBnK4DUZeCuaky9QX js8Oq1Q8vBjawMzqVs1oW/q76dIu3f8aYpX8b/HLpQHFljmq9jTbjQ0Q2ZCYZvpMFXKBDZ auxO+jYGAlVJazmwvnzoIjWn2fOu4pvFdF251l+UKzDnvTseTBewE+obFVob/YwLs61X62 p0Y1uCW4omvJ2TP3q0Iha9nFg184TOdHDzyEVTRbXD3sNHjsBvL6bLAnbt6BX3NcfvfdX7 B6clvBDjsYY2EgdPbdUYnqUZNJodFNXaxHqKC/3IEnbpI6Mmu+7e1vTJz8yqrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762893924; 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=sh4NWwvnD8OcsJTrQ0ihXFXf7R8shQTwcRfa9f4PRuM=; b=EH0KY32eIietSnmIJURqqh8gMl8PshIywyLjPE4SbvQgo0gMHnrd//cz5FPTbqJAVpUPYt tjFMUdUhVw4wUNuWf8u9TD/j3bizl68jEGkJVkbxSE+Kn4TT4kratJoJVUBNTJLRzAu3Za waLs0cJ3dp9Ei2UU8X+TF4AXiPHjrWgP1l2+RRg2lUTf4r5FtrAHs5lNMg7Ec6e+ypWJeh 4EbXe6N6W+qb9RRb4sxFHBtiWMRX5qJvYZDM7v/zIFJ69zc95I9U19L/YtQ3YZUqs0DcnD SOdA3IEP1rHiVTyKqBv2pkGD9oMIK+NBJyB4R79CJ3sJ4nigjWlUxzeYstF8nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762893924; a=rsa-sha256; cv=none; b=PK/yzeyhF1UrjZ3mUMIcNacUVanDnL/6Op3o+0zSsWqvvBq8p+X94/MneA1rMz0vOwKYGV YBQJDTSP27uoL9EU1/R8zapUABpjhLDyM5W08NaaweaEqrfBVqNcBJ0pZyYWjE51HLPEdT 5aI0I5oZgf6pChQNQYJ/YoXPiUSwH/8c1ZyI/CeQhhpDlqw0Z57NkSwMWyvBVVwDZ/rHgX vy8txkokjgcaVca2FYJbi8WWvpk+V+/eIipwVsL5mg/LYvw3lSUEbimEyZRdfusrOJonNH yW7Z5g8x1yzQCrbGoCbfrZyvS/3SWAeIhR3qsn0VllIy8vqHwtWuj4PSmY7/iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d5dpD1RG1z1K0s; Tue, 11 Nov 2025 20:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5ABKjOep014166; Tue, 11 Nov 2025 20:45:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ABKjOpp014163; Tue, 11 Nov 2025 20:45:24 GMT (envelope-from git) Date: Tue, 11 Nov 2025 20:45:24 GMT Message-Id: <202511112045.5ABKjOpp014163@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 53880f09fb1b - main - acpi: add counters for cumulative time spent in each sleep state. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53880f09fb1b485cf5c4af2b81081112e0c7cea3 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=53880f09fb1b485cf5c4af2b81081112e0c7cea3 commit 53880f09fb1b485cf5c4af2b81081112e0c7cea3 Author: Adrian Chadd AuthorDate: 2025-11-07 03:45:24 +0000 Commit: Adrian Chadd CommitDate: 2025-11-11 20:45:09 +0000 acpi: add counters for cumulative time spent in each sleep state. Add this so it can be consumed/graphed. Differential Revision: https://reviews.freebsd.org/D53633 Reviewed by: gallatin, imp --- sys/dev/acpica/acpi_cpu.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c index f9b9a386c0c5..2cd6c8bd4758 100644 --- a/sys/dev/acpica/acpi_cpu.c +++ b/sys/dev/acpica/acpi_cpu.c @@ -92,6 +92,7 @@ struct acpi_cpu_softc { int cpu_non_c2; /* Index of lowest non-C2 state. */ int cpu_non_c3; /* Index of lowest non-C3 state. */ u_int cpu_cx_stats[MAX_CX_STATES];/* Cx usage history. */ + uint64_t cpu_cx_duration[MAX_CX_STATES];/* Cx cumulative sleep */ /* Values for sysctl. */ struct sysctl_ctx_list cpu_sysctl_ctx; struct sysctl_oid *cpu_sysctl_tree; @@ -185,6 +186,7 @@ static void acpi_cpu_quirks(void); static void acpi_cpu_quirks_piix4(void); static int acpi_cpu_usage_sysctl(SYSCTL_HANDLER_ARGS); static int acpi_cpu_usage_counters_sysctl(SYSCTL_HANDLER_ARGS); +static int acpi_cpu_duration_counters_sysctl(SYSCTL_HANDLER_ARGS); static int acpi_cpu_set_cx_lowest(struct acpi_cpu_softc *sc); static int acpi_cpu_cx_lowest_sysctl(SYSCTL_HANDLER_ARGS); static int acpi_cpu_global_cx_lowest_sysctl(SYSCTL_HANDLER_ARGS); @@ -1055,6 +1057,12 @@ acpi_cpu_startup_cx(struct acpi_cpu_softc *sc) "cx_usage_counters", CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, (void *)sc, 0, acpi_cpu_usage_counters_sysctl, "A", "Cx sleep state counters"); + SYSCTL_ADD_PROC(&sc->cpu_sysctl_ctx, + SYSCTL_CHILDREN(device_get_sysctl_tree(sc->cpu_dev)), OID_AUTO, + "cx_duration_counters", CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, + (void *)sc, 0, acpi_cpu_duration_counters_sysctl, "A", + "Cx sleep duration cumulative time"); + #if defined(__i386__) || defined(__amd64__) SYSCTL_ADD_PROC(&sc->cpu_sysctl_ctx, SYSCTL_CHILDREN(device_get_sysctl_tree(sc->cpu_dev)), OID_AUTO, @@ -1168,6 +1176,7 @@ acpi_cpu_idle(sbintime_t sbt) if (!cx_next->do_mwait && curthread->td_critnest == 0) end_time = min(end_time, 500000 / hz); sc->cpu_prev_sleep = (sc->cpu_prev_sleep * 3 + end_time) / 4; + sc->cpu_cx_duration[cx_next_idx] += end_time; return; } @@ -1224,6 +1233,7 @@ acpi_cpu_idle(sbintime_t sbt) else end_time = ((end_ticks - start_ticks) << 20) / cpu_tickrate(); sc->cpu_prev_sleep = (sc->cpu_prev_sleep * 3 + end_time) / 4; + sc->cpu_cx_duration[cx_next_idx] += end_time; } #endif @@ -1408,6 +1418,26 @@ acpi_cpu_usage_counters_sysctl(SYSCTL_HANDLER_ARGS) return (error); } +static int +acpi_cpu_duration_counters_sysctl(SYSCTL_HANDLER_ARGS) +{ + struct acpi_cpu_softc *sc = (struct acpi_cpu_softc *)arg1; + struct sbuf sb; + char buf[128]; + int error, i; + + sbuf_new_for_sysctl(&sb, buf, sizeof(buf), req); + for (i = 0; i < sc->cpu_cx_count; i++) { + if (i > 0) + sbuf_putc(&sb, ' '); + sbuf_printf(&sb, "%ju", (uintmax_t) sc->cpu_cx_duration[i]); + } + error = sbuf_finish(&sb); + sbuf_delete(&sb); + return (error); +} + + #if defined(__i386__) || defined(__amd64__) static int acpi_cpu_method_sysctl(SYSCTL_HANDLER_ARGS)