From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 21 Feb 2025 13:52:19 +0000 (+0100)
Subject: Merge branch 'perf/urgent' into perf/core, to pick up fixes before merging new patches
X-Git-Tag: v6.15-rc1~217^2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6e21a9a39c072a6b1123e5d9982edced10006de;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'perf/urgent' into perf/core, to pick up fixes before merging new patches

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

e6e21a9a39c072a6b1123e5d9982edced10006de
diff --cc arch/x86/events/intel/ds.c
index 13a78a8a2780d,c2e2eae7309c3..46aaaeae0c8db
--- a/arch/x86/events/intel/ds.c
+++ b/arch/x86/events/intel/ds.c
@@@ -2740,9 -2576,17 +2740,17 @@@ void __init intel_ds_init(void
  					  PERF_SAMPLE_REGS_USER |
  					  PERF_SAMPLE_REGS_INTR);
  			}
 -			pr_cont("PEBS fmt4%c%s, ", pebs_type, pebs_qual);
 +			pr_cont("PEBS fmt%d%c%s, ", format, pebs_type, pebs_qual);
  
- 			if (!is_hybrid() && x86_pmu.intel_cap.pebs_output_pt_available) {
+ 			/*
+ 			 * The PEBS-via-PT is not supported on hybrid platforms,
+ 			 * because not all CPUs of a hybrid machine support it.
+ 			 * The global x86_pmu.intel_cap, which only contains the
+ 			 * common capabilities, is used to check the availability
+ 			 * of the feature. The per-PMU pebs_output_pt_available
+ 			 * in a hybrid machine should be ignored.
+ 			 */
+ 			if (x86_pmu.intel_cap.pebs_output_pt_available) {
  				pr_cont("PEBS-via-PT, ");
  				x86_get_pmu(smp_processor_id())->capabilities |= PERF_PMU_CAP_AUX_OUTPUT;
  			}