From nobody Tue Jul 28 19:14:16 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 4h8lWY1nPjz6n94D for ; Tue, 28 Jul 2026 19:14:17 +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 4h8lWY0svgz424L for ; Tue, 28 Jul 2026 19:14:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785266057; 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=McxacQinl12kbv4+gvpjCmERozCv41BN1kpWrVpXe1I=; b=vyDfdkv2FdM8Nrsc0ke/kgGO/4HJlCMjGS2Ri90VG55TaB1Iq/PSk0El0O2nD7o55sxT9v OhtrlFGeqcR+2A6BdVuzrOG0kZRdlsp9337NAuuvyVxT5Y57EqRrMWulbaHJhXw+klS+nP E+C9yw0oLssxO0VmdsKLtkfR0zAOv+Ngt2tBkVvaWnp6ZHf5HvGtejnPZXftgkinSTLHdg xPT3thiwGFg8kKDqPS3KNlNdd6fNltQrrCu282LOy5y6ati6EPHzH/N317OhAbN0ykQV04 0HjqqhCmbuadoDPx+Io7m5NM+tNF+Uls5Y5/U4tj0wiwMIrQFSGcLb/G316Uow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785266057; a=rsa-sha256; cv=none; b=t44uVE3W8Ghs8fymiXxTkYaOLiztJL9ehWwUu8X+DPQLCSpF4mpmNjPdtvXpBo6jriRql8 g6IjavX3KWWPAgb+Fr0xYahn5VQ1bIcI4didvG6SNzkAH2/BzdzsrqAHzc6RsWgKvXC9Mz 4YRyJ4UbZ0AnXb8gm8gOXSr7Z7xR/CiJzj4h7JF2jxuIRudmrP6oQfJLa1vjHifQqLTuYV j2xijzUSFnqeD1FlHRXqq77wAU9vrxABvKshwkiz0JrZfXcuBJ6LW/jJ/Tf+uXdec1ZjDV wf94hlGHGmlL4ffmtVrW7Eu+KUUBn/pze2bk6BNR4L2kd2d/ighGMahbzIkzHw== 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=1785266057; 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=McxacQinl12kbv4+gvpjCmERozCv41BN1kpWrVpXe1I=; b=bqfx6ptSEju92mW6H/UunSeQsa7lEun1cOWYcRARKyCQ+n3/iqePYjyZmHt1WKpxgV9MlS 7tpM/l7PME+hq8I16zAxRwi1tM60zQVGeijHSsg6b8NUwH3b8upYuidEA0Rbx60yQ2t77U weuhLEjZ0rP4dcqUTE+cd+X9tKKvXznU+pj1BVtDbi/6fQPTDykpCmuyZaX9Z7hmCH0dOO OZuRvrVkkLWYNL/PghBiKVQ8ACl7KOOMMKzN9GGOHXdAF3eQd6iAsmh7RDrKNHaTDVd9tX o+q4TKDsCoaBN9yChOMl8yBiZ7lelOYcxOo+G+m7BkMp2zHVFMjJMJQQFK1SMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h8lWX6gXpztFL for ; Tue, 28 Jul 2026 19:14:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42c64 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Jul 2026 19:14:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: 6c4d9b9af1a3 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 6c4d9b9af1a3b247bf82a4228c835d106f535613 Auto-Submitted: auto-generated Date: Tue, 28 Jul 2026 19:14:16 +0000 Message-Id: <6a68ff88.42c64.963a62e@gitrepo.freebsd.org> The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=6c4d9b9af1a3b247bf82a4228c835d106f535613 commit 6c4d9b9af1a3b247bf82a4228c835d106f535613 Author: Olivier Cochard AuthorDate: 2026-07-28 19:06:27 +0000 Commit: Olivier Cochard CommitDate: 2026-07-28 19:11:04 +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 MFC to: stable/14, stable/15 Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D58468 --- 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 41e1eaad9d67..1afdb59ed745 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -403,9 +403,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; PMCDBG2(MDP, ALL, 1,"amd-allocate ri=%d caps=0x%x", ri, caps); @@ -418,7 +415,8 @@ amd_allocate_pmc(int cpu __unused, int ri, struct pmc *pm, ((pd->pd_caps & PMC_CAP_PRECISE) == 0)) 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) { config = a->pm_md.pm_amd.pm_amd_config; if ((config & ~amd_config_mask(amd_pmcdesc[ri].pm_subclass, caps)) != 0)