From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, kan.liang@linux.intel.com
Cc: Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.6.y] perf/x86/intel: Fix ARCH_PERFMON_NUM_COUNTER_LEAF
Date: Thu, 20 Feb 2025 12:52:55 -0500 [thread overview]
Message-ID: <20250220125125-1b78676eee2a15b2@stable.kernel.org> (raw)
In-Reply-To: <20250220163146.3030320-1-kan.liang@linux.intel.com>
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: 47a973fd75639fe80d59f9e1860113bb2a0b112b
Note: The patch differs from the upstream commit:
---
1: 47a973fd75639 ! 1: 23cc70d16b75c perf/x86/intel: Fix ARCH_PERFMON_NUM_COUNTER_LEAF
@@ Commit message
Link: https://lkml.kernel.org/r/20250129154820.3755948-3-kan.liang@linux.intel.com
## arch/x86/events/intel/core.c ##
-@@ arch/x86/events/intel/core.c: static inline bool intel_pmu_broken_perf_cap(void)
+@@ arch/x86/events/intel/core.c: static void intel_pmu_check_num_counters(int *num_counters,
static void update_pmu_cap(struct x86_hybrid_pmu *pmu)
{
-- unsigned int sub_bitmaps, eax, ebx, ecx, edx;
+- unsigned int sub_bitmaps = cpuid_eax(ARCH_PERFMON_EXT_LEAF);
+- unsigned int eax, ebx, ecx, edx;
+ unsigned int cntr, fixed_cntr, ecx, edx;
+ union cpuid35_eax eax;
+ union cpuid35_ebx ebx;
-- cpuid(ARCH_PERFMON_EXT_LEAF, &sub_bitmaps, &ebx, &ecx, &edx);
-+ cpuid(ARCH_PERFMON_EXT_LEAF, &eax.full, &ebx.full, &ecx, &edx);
-
-- if (ebx & ARCH_PERFMON_EXT_UMASK2)
-+ if (ebx.split.umask2)
- pmu->config_mask |= ARCH_PERFMON_EVENTSEL_UMASK2;
-- if (ebx & ARCH_PERFMON_EXT_EQ)
-+ if (ebx.split.eq)
- pmu->config_mask |= ARCH_PERFMON_EVENTSEL_EQ;
-
- if (sub_bitmaps & ARCH_PERFMON_NUM_COUNTER_LEAF_BIT) {
++ cpuid(ARCH_PERFMON_EXT_LEAF, &eax.full, &ebx.full, &ecx, &edx);
++
+ if (eax.split.cntr_subleaf) {
cpuid_count(ARCH_PERFMON_EXT_LEAF, ARCH_PERFMON_NUM_COUNTER_LEAF,
- &eax, &ebx, &ecx, &edx);
-- pmu->cntr_mask64 = eax;
-- pmu->fixed_cntr_mask64 = ebx;
+- pmu->num_counters = fls(eax);
+- pmu->num_counters_fixed = fls(ebx);
+ &cntr, &fixed_cntr, &ecx, &edx);
-+ pmu->cntr_mask64 = cntr;
-+ pmu->fixed_cntr_mask64 = fixed_cntr;
++ pmu->num_counters = fls(cntr);
++ pmu->num_counters_fixed = fls(fixed_cntr);
+ intel_pmu_check_num_counters(&pmu->num_counters, &pmu->num_counters_fixed,
+- &pmu->intel_ctrl, ebx);
++ &pmu->intel_ctrl, fixed_cntr);
}
+ }
- if (!intel_pmu_broken_perf_cap()) {
## arch/x86/include/asm/perf_event.h ##
@@ arch/x86/include/asm/perf_event.h: union cpuid10_edx {
* detection/enumeration details:
*/
#define ARCH_PERFMON_EXT_LEAF 0x00000023
--#define ARCH_PERFMON_EXT_UMASK2 0x1
--#define ARCH_PERFMON_EXT_EQ 0x2
-#define ARCH_PERFMON_NUM_COUNTER_LEAF_BIT 0x1
#define ARCH_PERFMON_NUM_COUNTER_LEAF 0x1
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y | Success | Success |
next prev parent reply other threads:[~2025-02-20 17:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-18 11:28 FAILED: patch "[PATCH] perf/x86/intel: Fix ARCH_PERFMON_NUM_COUNTER_LEAF" failed to apply to 6.6-stable tree gregkh
2025-02-20 16:31 ` [PATCH 6.6.y] perf/x86/intel: Fix ARCH_PERFMON_NUM_COUNTER_LEAF Kan Liang
2025-02-20 16:37 ` Greg KH
2025-02-20 17:52 ` Sasha Levin [this message]
2025-02-20 20:17 ` Kan Liang
2025-02-22 15:53 ` Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250220125125-1b78676eee2a15b2@stable.kernel.org \
--to=sashal@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.