From nobody Tue Aug 4 09:51:36 2026 X-Original-To: dev-commits-src-branches@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 4hDpj45qr7z6mvLG for ; Tue, 04 Aug 2026 09:51:36 +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 4hDpj442kHz3WdT for ; Tue, 04 Aug 2026 09:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785837096; 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=6gyml2B7RfZK2foCEbT6O7dlE6/cqi8KHtrcDbE/2yY=; b=STS962g/9GorEhIzRiA5qNOP0KeFuQ0+jq1QenaXoqd6oDomCNV7Gnzh8nv7tLNY+++XLK tX4imV3JGfO5b9FDd7UR470WD+SIx9vCBKE7ZcWsiKMBwA9j5kk0m16YvA8VwVZgYGyjDf sOOhpoRvgltxqJzsWOEbKKS0D9Ozo/hB3pvE+fN6Ty7yRPWejINb9PIvpK8hGvMS9Fxkdr eF0yCPb1GCmSZ85EcS27zxQhgeJ1q3OHF2tG/xYeA9a0EF1CzE3wq80a74ZfFXwfbW+80R 2ESxJbqbUjTNP7tk0YSKyYqJwJHWAbH+VI+XAX9kgaSM3nNxQSRpelSXYitOOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785837096; a=rsa-sha256; cv=none; b=sZLfRZ+FQmw37TEi/ucgp1g9i+zbKZ+aBU8BYDwwojuhv2/Guutagu49sf1AahI5AsuLoB d7Xi8L8utuemUW+lgBcz1kRCKvmxR4ty9r5hR2ENqbA/LH/dKfll04uuocSOamqbPU27Ic o14iENtMPVT2vyMm3Modm/XEE9Ym3V8B8I+w43rLbzd5ZFlwSkFE7YJpl5MGK5QUfjC0I8 tKokfTg1xBdlBpjAwLVWUJXkEbf9RTksrc20olAGSP/yudSuHWBINCkcsmv0Ssm4kgI+Fg GvhTkiCxfXmjKyklNEmS6YrBrqHBpgFd0zOY1qFCVIbfI3o44QmLno9Ti6kwOg== 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=1785837096; 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=6gyml2B7RfZK2foCEbT6O7dlE6/cqi8KHtrcDbE/2yY=; b=peSuUjRVIG5UEHqXIkSy59TP6IB86HrTvS/IntIqmkvj6U9TSz/gAjljw+Aj5XCbPFwW5W D8QjUaJedYGjRyRwY2TQQWD7dZcpIk4gU4fCr2WcQ2aQ7Cwunau7jxZ6rCbL4m5imDW9KF 8ZMig601xaq+/bEn3vXOlg8Y3e1msdnQ543gxgOEYB+k0pWMx7gV+kDvR1G7hfJiICBbvS Zqp0S/0wassEJ+mEMgZkxeLDTbINB6Z7o5j83WUERJXlXATDit2jl7T2r5BTtRvSPIcUne zHfjuYXvtRQ/aaQbiyA8/PMyb/4dgp6Xp8Ud78EAOB67owf6ckBZGuMY8MR80Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDpj42YX1zjNV for ; Tue, 04 Aug 2026 09:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42184 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 04 Aug 2026 09:51:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Cochard Subject: git: db2dc24da9d6 - stable/14 - hwpmc: fix event allocation on pre-Zen AMD CPUs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: db2dc24da9d6fadd8cae0f36d8458f7ee5ab336b Auto-Submitted: auto-generated Date: Tue, 04 Aug 2026 09:51:36 +0000 Message-Id: <6a71b628.42184.fbe3620@gitrepo.freebsd.org> The branch stable/14 has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=db2dc24da9d6fadd8cae0f36d8458f7ee5ab336b commit db2dc24da9d6fadd8cae0f36d8458f7ee5ab336b Author: Olivier Cochard AuthorDate: 2026-07-28 19:06:27 +0000 Commit: Olivier Cochard CommitDate: 2026-08-04 09:49:32 +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 fbbaf92a1547..8e1a6ad25be7 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -582,9 +582,6 @@ amd_allocate_pmc(int cpu, 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); @@ -596,7 +593,8 @@ amd_allocate_pmc(int cpu, int ri, struct pmc *pm, if((ri >= 12 && ri < 16) && !(a->pm_md.pm_amd.pm_amd_sub_class == PMC_AMD_SUB_CLASS_DATA_FABRIC)) 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);