From nobody Tue Aug 4 09:33:52 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 4hDpJc6VScz6mt0v for ; Tue, 04 Aug 2026 09:33:52 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hDpJc5sj6z3V6g for ; Tue, 04 Aug 2026 09:33:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785836032; 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=f52Z7NcAC53xIrtBd0gal2/ojPGKk1E8LYEl6xh2PcU=; b=FyhKwfDXG7Id90SZVpcfiZj4mwaTYpYvF0KBLVZ8txBca3z8lk8M8qqYeIhefn1DAqCJHy Lokq/UtKOnrCXrTt5pydoDigiYkYoKiWiATx9TGMpDWpx5T7fqxbGeKVb/Qt0pBAS23184 m/KFJx/dq70x3Tasmmy58HiAzfMBR0sSQGFI39f4sPrbcaX/MEyX4cb5g/VRO4QKU8eT6n QoZhRFj1gnlV57EnQgDTDBMnyrKviLdUiQdQJSQLBm28HI/K576prHz0k2x4DoDlxlC4sd ORX+ty7z/V/9+rlB/pLc++o29nKog5dmn1OJWwlL9OgpFo1km09VOxeoWOANSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785836032; a=rsa-sha256; cv=none; b=J0hA/rCX0UtTOJsODLuNEj8hS9j6keA2Ue8cG66vdXOZa+Tw7Vx5v7tnUhNDq/m9iwqOFE eh5LMKA3A9KZzumNUyDiO+VQUhnQS5mN9m0melwTC0+4Sn+8uUzaUQVnQA4pfpjO45f7N9 ZsizS78NQVy6bNYMu7HcxIWC58q2sLrFMS0Tv2PzT5WycndeqNoW7QkeUk+UF99/v+OEaj U0mc6NN+6UlzcSFUCTIaRZnBHM0QUebLoza37IPea0uN3BC5qEU9DlY/8uRroxVJaTM8NI BWfbIH8c7ZCzzqhVAVEiyQAhDnKvSojqAUhAI6x9MOiiLg0dSUsbbW260nqW3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785836032; 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=f52Z7NcAC53xIrtBd0gal2/ojPGKk1E8LYEl6xh2PcU=; b=CpNKIJ7e2f8QO6klfyDeu2g6D0LPMFmu7lB7YTuHgwCfjpV/8uO2EF9Y+958WWzt+IF9nZ wprd5QpFsex+En89GhWC2HPyjUO7Ra3KkJzSZ3AiXLCKTYbnnGTu842okPPGCXJlxuaD8l 3bWUW8W12op9w9RiE68y7eMkfVcImcPTeL5ULWJMOf58KW+ZYDMWqHyBf0CNu3e2Ry2wDn AuNQ3IM38JT1qq1ntR524rKMffJWs1inegjX4rBw2+blru69EgH4DLTXSKb3j4fKFrTQqH nlzvE3rBT84VGsAy0qGlzRNnicmbLoJj6fwnXbfLidpsQ2mQVRSWmtKntdhLCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDpJc4wddzhym for ; Tue, 04 Aug 2026 09:33:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40f01 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 04 Aug 2026 09:33:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Cochard Subject: git: 38af24ed0811 - stable/15 - hwpmc: fix event allocation on pre-Zen AMD CPUs 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 List-Id: 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: olivier X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 38af24ed0811c5ab693096cbb9e57ef29892afa3 Auto-Submitted: auto-generated Date: Tue, 04 Aug 2026 09:33:52 +0000 Message-Id: <6a71b200.40f01.196e6188@gitrepo.freebsd.org> The branch stable/15 has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=38af24ed0811c5ab693096cbb9e57ef29892afa3 commit 38af24ed0811c5ab693096cbb9e57ef29892afa3 Author: Olivier Cochard AuthorDate: 2026-07-28 19:06:27 +0000 Commit: Olivier Cochard CommitDate: 2026-08-04 09:28:08 +0000 hwpmc: fix event allocation on pre-Zen AMD CPUs amd_allocate_pmc() chose the pmu-events code path whenever pmc_cpuid was non-empty, and rejected any allocation lacking PMC_F_EV_PMU. But pmc_cpuid is set for every AMD CPU, while the pmu-events tables only cover Zen and later. On older families (K8, Bobcat, Jaguar/16h, Bulldozer) libpmc finds no pmu-events entry and falls back to the legacy path, which never sets PMC_F_EV_PMU. Reviewed by: mhorne Approved by: mhorne MFC after: 1 week Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D58468 (cherry picked from commit 6c4d9b9af1a3b247bf82a4228c835d106f535613) --- sys/dev/hwpmc/hwpmc_amd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index 792411ec2033..82d1a4c6180c 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -342,9 +342,6 @@ amd_allocate_pmc(int cpu __unused, int ri, struct pmc *pm, if (pd->pd_class != a->pm_class) return (EINVAL); - if ((a->pm_flags & PMC_F_EV_PMU) == 0) - return (EINVAL); - caps = pm->pm_caps; if (((caps & PMC_CAP_PRECISE) != 0) && @@ -357,7 +354,8 @@ amd_allocate_pmc(int cpu __unused, int ri, struct pmc *pm, if (amd_pmcdesc[ri].pm_subclass != a->pm_md.pm_amd.pm_amd_sub_class) return (EINVAL); - if (strlen(pmc_cpuid) != 0) { + /* PMC_F_EV_PMU: config comes from pmu-events tables. */ + if ((a->pm_flags & PMC_F_EV_PMU) != 0) { pm->pm_md.pm_amd.pm_amd_evsel = a->pm_md.pm_amd.pm_amd_config; PMCDBG2(MDP, ALL, 2,"amd-allocate ri=%d -> config=0x%x", ri, a->pm_md.pm_amd.pm_amd_config);