From nobody Tue Nov 03 14:19:21 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 4jJrL170XQz6yHg8 for ; Tue, 03 Nov 2026 14:19:21 +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 4jJrL15wkYz3NjC for ; Tue, 03 Nov 2026 14:19:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793715561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DVZ2MP+N21en2PzrtYC3lwXpcIvzZbL97vERfqCW+tY=; b=a4TpQjRxdXHRe+Pwq7PrSJZBuWY+WAUcCpVIkk07ubSZ7Fv1BzgUfCxB5m3vw4YllBgf3A wJPwK8zO2iRcGkIygQ64X8G2XslGMHCV1A8r1mfksYnnxy69uOhNI0hrNJxpRKjasWEx04 lHssD8oPI9C4RGq6Qi/KOD+6PfDFlDeLMSXmdFB/Fbxq+HHrmgrEZi/gD0ymavCf7EkO4a U0DtQyARTliwrvnKwZsImHMwCWjWy9FR2g7QkGPNK7vi+d/OgG5Fxnp9ulotEbFwQjE+kN DE6kNJC808keujg/ZChl/0XAPYMO1C3t7WhdfssEPO4DD2XJIr42d/yeYnFceQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793715561; b=HwL+mRSmEtPkCLz5PCYOsfiSD6+6R42iTwSAywZPW2RVFN8g9rsp1v8MgawOeyykTasAbm purr/Lr7UQSTEF/yp14zdVUZJWUTOtoSxn5zFe2nX9lWt1q+/gr7+1/I5gpgqHgkbLz6XR xTrBnC2zoUA06d5LEVKpvzdAk9nmUfxo8YPKJbPj061B6TgweO4rcR2rJG6w7U7mW7Ds2C ahlevadaRb/JrI5Zx26yFhOpnLpvWYLikJCyjM2c6oH8Vs/+akCFAPJSR5G63YKLofM4aw jrYOMD+JJveYO/8yWnSKJbIJOD3Cv2IBTsxjvYu1yY1ntWygZ1RRCqb5dNkErQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793715561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DVZ2MP+N21en2PzrtYC3lwXpcIvzZbL97vERfqCW+tY=; b=o6h/tAp56wfxpTfG3BJ/AZ+bzQWptFznjAN8ANnk9AYWIHP5gamZtamFxrwFzW5tx8wUW2 OWX79S7fi3bMmDc1FAfZSX2QGiXvQGlC94o3XQXcQ+62At0OxAGRNLJVe5e5RyB7pwMcJz YZBmR2r67zeh6/eBHmC4qoH7N98F/DIVRDsns55MUrSf8w9Qegn+ur1v6skrT+mcR68jCw KJbosvgX7ACgMpHDP8sx8LGzvh4hqnnz0xh2BFeKT+gsuVwhCCdIK5y+08RN3NlJrhjlt/ jKpe4s7e+rK3aiufemF54TmSRnROLOsUfujYAURFw4mi4DGvMVYh8W0QS/4nBQ== 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 4jJrL15ZvWzJtP for ; Tue, 03 Nov 2026 14:19:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d3dd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Nov 2026 14:19:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ali Mashtizadeh From: Mitchell Horne Subject: git: 3dba72dfef75 - stable/15 - libpmc: Fix AMD L3 counter parameter parsing List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 3dba72dfef7577c054cbe9ee551321b811106d8b Auto-Submitted: auto-generated Date: Tue, 03 Nov 2026 14:19:21 +0000 Message-Id: <6ae9ed69.3d3dd.3d4a5788@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3dba72dfef7577c054cbe9ee551321b811106d8b commit 3dba72dfef7577c054cbe9ee551321b811106d8b Author: Ali Mashtizadeh AuthorDate: 2026-07-31 02:11:17 +0000 Commit: Mitchell Horne CommitDate: 2026-11-03 14:18:51 +0000 libpmc: Fix AMD L3 counter parameter parsing Fix two small bugs affecting the event parsing of AMD L3 counters. AMD's manual and JSON disagree about the naming scheme on recent processors. I use the naming scheme present in the recent PPRs to be consistent, so in the JSON parser we rename 'allslices' to 'allsources' just as we already do with sliceid and sourceid. Also ensure that we parse the 0x prefix present in the newer JSON files. Reviewed by: mhorne Sponsored by: Netflix MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/2180 (cherry picked from commit d38b3a5ead0d3507080da5321144219b13d43aa9) --- lib/libpmc/libpmc_pmu_util.c | 8 ++++---- lib/libpmc/pmu-events/jevents.c | 9 ++++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c index f0083258650d..6bac92b312ef 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -371,13 +371,13 @@ pmu_parse_event(struct pmu_event_desc *ped, const char *eventin) else if (strcmp(key, "l3_slice_mask") == 0) ped->ped_l3_slice = strtol(value, NULL, 16); else if (strcmp(key, "sourceid") == 0) - ped->ped_sourceid = strtol(value, NULL, 16); + ped->ped_sourceid = strtol(value, NULL, 0); else if (strcmp(key, "coreid") == 0) - ped->ped_coreid = strtol(value, NULL, 16); + ped->ped_coreid = strtol(value, NULL, 0); else if (strcmp(key, "allcores") == 0) - ped->ped_allcores = strtol(value, NULL, 10); + ped->ped_allcores = strtol(value, NULL, 0); else if (strcmp(key, "allsources") == 0) - ped->ped_allsources = strtol(value, NULL, 10); + ped->ped_allsources = strtol(value, NULL, 0); else if (strcmp(key, "pebs") == 0) ped->ped_pebs = strtol(value, NULL, 10); else { diff --git a/lib/libpmc/pmu-events/jevents.c b/lib/libpmc/pmu-events/jevents.c index facec3361c70..b4d073f13708 100644 --- a/lib/libpmc/pmu-events/jevents.c +++ b/lib/libpmc/pmu-events/jevents.c @@ -623,7 +623,14 @@ static int json_events(const char *fn, } else if (json_streq(map, field, "EnAllCores")) { addfield(map, &allcores, "", "allcores=", val); } else if (json_streq(map, field, "EnAllSlices")) { - addfield(map, &allslices, "", "allslices=", val); + /* + * We use the AMD PPR Family 1Ah Model 70h + * naming scheme of allsources rather than + * slices. The symbol EnAllSlices is not used + * anywhere except in Zen 4+ for the L3 + * counters. + */ + addfield(map, &allslices, "", "allsources=", val); } else if (json_streq(map, field, "SliceId")) { /* * We use sourceid because there's a