From nobody Fri Nov 13 18:41:10 2026 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 4jR5gV2wldz7143H for ; Fri, 13 Nov 2026 18:41:10 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jR5gV28T5z4Ngg for ; Fri, 13 Nov 2026 18:41:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794595270; 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=vF6c3m63RmpMc/7/53i8fCZ+HYf0W7Q9ofYhE4Ed3Zk=; b=mp2aKJzCC4Vk49nUrbOjx7X5YJ3C6WuDFxs+6zSKv8YZYI/AAjIngWREt93S6wGxIhWRyS /kj4wgLftMOPYMcMtyJb57iBolAOzQjeHF0KVL3KnCuHmsiwYW5ZsiUs5/mNBCJ/V6kstb kfEikoF3si8TqKgOQWJMqrAIMwB9xXOYKu8PWBViA325mFamPEKsRvf26fSuKdfjN5KMC3 +SlCRh3l6UTysdf4WAF+LKyluNs1m+s9Zy3BjS+MtZVWQ9JhQgHe0FHB1CjTP+SDqapyJ7 F14UVoLaMy3Bkjb3SWQD1ULlbt+6BiUElgqjhR34nnosix3SwagebgBvUjEavw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794595270; b=hxUXyGbU5ML7W5ytwpBjszCUqrPumxVHBPzJNQVBEAl1WRdaNAufTlOdsYI80he90jjBbg Tfyu38Kh7xvMHAaQxwRWb6JWZUKvl3QCJ3gNonDH+8eqC6dbRO4ItZ/1aWuasPtkint5T3 qLf2KBR3pEQI+JyszlsB4hZ09oTHEqb//9QoIH/oe01p6xK5jPBpeLtMoEPanTipxMaweI 4ZpPnhnWdTO0jww53BYdrwDHS0N3B1SrmACbGFQZZtBfC4mqKI3XkL3SPs6HEE/pKeud8B Ihox14ngtVPfMBsWxvAzdYljgzxwkvJhfhA8s5RvnNJS/9TRh46ISnomv+M2pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794595270; 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=vF6c3m63RmpMc/7/53i8fCZ+HYf0W7Q9ofYhE4Ed3Zk=; b=IWXwLJEeMDPJVsVzZSEQWGDputNcQhHL1a/pD26APFjI7Z4qQTvqiJrIv6r3Aaq9quIOOx 6q4UluRbzT9xSDhJ7nZTOzB14uZO6TcFaluvHz0wahN8uI4/arhoSWwWoKuodA1OnCBc+g 5/u9SIlu/sD1JJBKN+LKjnG7ECB6fM5eXvWFp2JYFGgu1xutxjErg/OqXzBsnfx3kRfSmU 6BDhnVP9vqmkmKJrPRi5tzpKzrchOXBgo2e9fgDCWUY/xwB2D+HZMRg9XEEvOF5Hx6alWj EeQ2w66uiwmmJY2Q1KvZYvAQuOHBC12fAPktVu/jObp6/G3MUuocjWzqmimk1Q== 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 4jR5gV1PGFznYn for ; Fri, 13 Nov 2026 18:41:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eb5a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 18:41:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: ad4a0d6102cd - stable/14 - hwpmc: tidy pcd_finalize methods List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ad4a0d6102cd2c021f0b4e7fc69f638efd0d0944 Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 18:41:10 +0000 Message-Id: <6af759c6.1eb5a.7431e1d6@gitrepo.freebsd.org> The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=ad4a0d6102cd2c021f0b4e7fc69f638efd0d0944 commit ad4a0d6102cd2c021f0b4e7fc69f638efd0d0944 Author: Mitchell Horne AuthorDate: 2023-10-18 17:50:49 +0000 Commit: Mitchell Horne CommitDate: 2026-11-13 18:41:02 +0000 hwpmc: tidy pcd_finalize methods Make them a little bit more consistent with one another in terms of what is done: - Add/reduce assertions to what is most useful: a loop to ensure pcpu_fini freed everything - Add PMCDBG trace entries The exception is the dmc620/cmn600 classes, which behave a little differently, so leave them untouched. Reviewed by: jkoshy MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41270 (cherry picked from commit 90a6ea5ca0b1b578e265d2479511bd04347f9510) --- sys/dev/hwpmc/hwpmc_amd.c | 32 ++++---------------------------- sys/dev/hwpmc/hwpmc_arm64.c | 4 ++++ sys/dev/hwpmc/hwpmc_armv7.c | 4 ++++ sys/dev/hwpmc/hwpmc_core.c | 4 ++++ sys/dev/hwpmc/hwpmc_powerpc.c | 5 +++++ sys/dev/hwpmc/hwpmc_soft.c | 9 ++------- sys/dev/hwpmc/hwpmc_tsc.c | 10 ++-------- sys/dev/hwpmc/hwpmc_uncore.c | 4 ++++ 8 files changed, 29 insertions(+), 43 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index 39f317f91832..695731f46cd1 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -1186,37 +1186,13 @@ pmc_amd_initialize(void) void pmc_amd_finalize(struct pmc_mdep *md) { -#if defined(INVARIANTS) - int classindex, i, ncpus, pmcclass; -#endif + PMCDBG0(MDP, INI, 1, "amd-finalize"); pmc_tsc_finalize(md); - KASSERT(amd_pcpu != NULL, ("[amd,%d] NULL per-cpu array pointer", - __LINE__)); - -#if defined(INVARIANTS) - switch (md->pmd_cputype) { -#if defined(__i386__) - case PMC_CPU_AMD_K7: - classindex = PMC_MDEP_CLASS_INDEX_K7; - pmcclass = PMC_CLASS_K7; - break; -#endif - default: - classindex = PMC_MDEP_CLASS_INDEX_K8; - pmcclass = PMC_CLASS_K8; - } - - KASSERT(md->pmd_classdep[classindex].pcd_class == pmcclass, - ("[amd,%d] pmc class mismatch", __LINE__)); - - ncpus = pmc_cpu_max(); - - for (i = 0; i < ncpus; i++) - KASSERT(amd_pcpu[i] == NULL, ("[amd,%d] non-null pcpu", - __LINE__)); -#endif + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(amd_pcpu[i] == NULL, + ("[amd,%d] non-null pcpu cpu %d", __LINE__, i)); free(amd_pcpu, M_PMC); amd_pcpu = NULL; diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index 9a5debb8016b..4c38a4ae6183 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -611,5 +611,9 @@ pmc_arm64_finalize(struct pmc_mdep *md) { PMCDBG0(MDP, INI, 1, "arm64-finalize"); + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(arm64_pcpu[i] == NULL, + ("[arm64,%d] non-null pcpu cpu %d", __LINE__, i)); + free(arm64_pcpu, M_PMC); } diff --git a/sys/dev/hwpmc/hwpmc_armv7.c b/sys/dev/hwpmc/hwpmc_armv7.c index 5bb6c6fce291..1488af2ae54e 100644 --- a/sys/dev/hwpmc/hwpmc_armv7.c +++ b/sys/dev/hwpmc/hwpmc_armv7.c @@ -535,5 +535,9 @@ pmc_armv7_finalize(struct pmc_mdep *md) { PMCDBG0(MDP, INI, 1, "armv7-finalize"); + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(armv7_pcpu[i] == NULL, + ("[armv7,%d] non-null pcpu cpu %d", __LINE__, i)); + free(armv7_pcpu, M_PMC); } diff --git a/sys/dev/hwpmc/hwpmc_core.c b/sys/dev/hwpmc/hwpmc_core.c index 3829a03eb729..ddaff0b5955e 100644 --- a/sys/dev/hwpmc/hwpmc_core.c +++ b/sys/dev/hwpmc/hwpmc_core.c @@ -1260,6 +1260,10 @@ pmc_core_finalize(struct pmc_mdep *md) { PMCDBG0(MDP,INI,1, "core-finalize"); + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(core_pcpu[i] == NULL, + ("[core,%d] non-null pcpu cpu %d", __LINE__, i)); + free(core_pcpu, M_PMC); core_pcpu = NULL; } diff --git a/sys/dev/hwpmc/hwpmc_powerpc.c b/sys/dev/hwpmc/hwpmc_powerpc.c index a4bd951fab40..0380988f909f 100644 --- a/sys/dev/hwpmc/hwpmc_powerpc.c +++ b/sys/dev/hwpmc/hwpmc_powerpc.c @@ -581,6 +581,11 @@ pmc_md_initialize(void) void pmc_md_finalize(struct pmc_mdep *md) { + PMCDBG0(MDP, INI, 1, "powerpc-finalize"); + + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(powerpc_pcpu[i] == NULL, + ("[powerpc,%d] non-null pcpu cpu %d", __LINE__, i)); free(powerpc_pcpu, M_PMC); powerpc_pcpu = NULL; diff --git a/sys/dev/hwpmc/hwpmc_soft.c b/sys/dev/hwpmc/hwpmc_soft.c index 5606164b3e0f..4679969fb45c 100644 --- a/sys/dev/hwpmc/hwpmc_soft.c +++ b/sys/dev/hwpmc/hwpmc_soft.c @@ -456,17 +456,12 @@ pmc_soft_initialize(struct pmc_mdep *md) void pmc_soft_finalize(struct pmc_mdep *md) { -#ifdef INVARIANTS - int i, ncpus; + PMCDBG0(MDP, INI, 1, "soft-finalize"); - ncpus = pmc_cpu_max(); - for (i = 0; i < ncpus; i++) + for (int i = 0; i < pmc_cpu_max(); i++) KASSERT(soft_pcpu[i] == NULL, ("[soft,%d] non-null pcpu cpu %d", __LINE__, i)); - KASSERT(md->pmd_classdep[PMC_CLASS_INDEX_SOFT].pcd_class == - PMC_CLASS_SOFT, ("[soft,%d] class mismatch", __LINE__)); -#endif ast_deregister(TDA_HWPMC); free(soft_pcpu, M_PMC); soft_pcpu = NULL; diff --git a/sys/dev/hwpmc/hwpmc_tsc.c b/sys/dev/hwpmc/hwpmc_tsc.c index f86b93d58bfb..5d31f8a9c61c 100644 --- a/sys/dev/hwpmc/hwpmc_tsc.c +++ b/sys/dev/hwpmc/hwpmc_tsc.c @@ -339,18 +339,12 @@ pmc_tsc_initialize(struct pmc_mdep *md, int maxcpu) void pmc_tsc_finalize(struct pmc_mdep *md __diagused) { -#ifdef INVARIANTS - int i, ncpus; + PMCDBG0(MDP, INI, 1, "tsc-finalize"); - ncpus = pmc_cpu_max(); - for (i = 0; i < ncpus; i++) + for (int i = 0; i < pmc_cpu_max(); i++) KASSERT(tsc_pcpu[i] == NULL, ("[tsc,%d] non-null pcpu cpu %d", __LINE__, i)); - KASSERT(md->pmd_classdep[PMC_MDEP_CLASS_INDEX_TSC].pcd_class == - PMC_CLASS_TSC, ("[tsc,%d] class mismatch", __LINE__)); -#endif - free(tsc_pcpu, M_PMC); tsc_pcpu = NULL; } diff --git a/sys/dev/hwpmc/hwpmc_uncore.c b/sys/dev/hwpmc/hwpmc_uncore.c index fd4266b605ef..0ee41db0658d 100644 --- a/sys/dev/hwpmc/hwpmc_uncore.c +++ b/sys/dev/hwpmc/hwpmc_uncore.c @@ -758,6 +758,10 @@ pmc_uncore_finalize(struct pmc_mdep *md) { PMCDBG0(MDP,INI,1, "uncore-finalize"); + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(uncore_pcpu[i] == NULL, + ("[uncore,%d] non-null pcpu cpu %d", __LINE__, i)); + free(uncore_pcpu, M_PMC); uncore_pcpu = NULL; }