perf/x86/intel: make anythread filter support conditional
Subsystems (3)
PATCH 1/1 perf/x86/intel: make anythread filter support conditional
Starting with Arch Perfmon v5, the anythread filter on generic counters may be deprecated. The current kernel was exporting the any filter without checking. On Icelake, it means you could do cpu/event=0x3c,any/ even though the filter does not exist. This patch corrects the problem by relying on the CPUID 0xa leaf function to determine if anythread is supported or not as described in the Intel SDM Vol3b 18.2.5.1 AnyThread Deprecation section.
--- arch/x86/events/intel/core.c | 20 ++++++++++++++++++++ arch/x86/events/perf_event.h | 1 + arch/x86/include/asm/perf_event.h | 4 +++- arch/x86/kvm/cpuid.c | 4 +++- 4 files changed, 27 insertions(+), 2 deletions(-)
arch/x86/events/intel/core.c +20 -0
@@ -4220,6 +4220,16 @@ static struct attribute *intel_arch3_formats_attr[] = { NULL, }; +static struct attribute *intel_arch5_formats_attr[] = { + &format_attr_event.attr, + &format_attr_umask.attr, + &format_attr_edge.attr, + &format_attr_pc.attr, + &format_attr_inv.attr, + &format_attr_cmask.attr, +NULL , +}; +static struct attribute *hsw_format_attr[] = { &format_attr_in_tx.attr, &format_attr_in_tx_cp.attr,
@@ -4987,6 +4997,12 @@ __init int intel_pmu_init(void)x86_add_quirk (intel_arch_events_quirk);/* Install first, so it runs last */ +if (version >=5 ) { + x86_pmu.intel_cap.anythread_deprecated = edx.split.anythread_deprecated; +if (x86_pmu.intel_cap.anythread_deprecated) +pr_cont (" AnyThread deprecated, " ); + } +/* * Install the hw-cache-events table: */
@@ -5512,6 +5528,10 @@ __init int intel_pmu_init(void) x86_pmu.intel_ctrl |= ((1LL << x86_pmu.num_counters_fixed)-1 ) <<INTEL_PMC_IDX_FIXED ; +/* AnyThread may be deprecated on arch perfmon v5 or later */ +if (x86_pmu.intel_cap.anythread_deprecated) + x86_pmu.format_attrs = intel_arch5_formats_attr; +if (x86_pmu.event_constraints) {/* * event on fixed counter2 (REF_CYCLES) only works on this
arch/x86/events/perf_event.h +1 -0
@@ -585,6 +585,7 @@ union perf_capabilities { u64 pebs_baseline:1; u64 perf_metrics:1; u64 pebs_output_pt_available:1; + u64 anythread_deprecated:1; };u64 capabilities; };
arch/x86/include/asm/perf_event.h +3 -1
@@ -137,7 +137,9 @@ union cpuid10_edx {struct {unsigned int num_counters_fixed:5 ;unsigned int bit_width_fixed:8 ; -unsigned int reserved:19 ; +unsigned int reserved1:2 ; +unsigned int anythread_deprecated:1 ; +unsigned int reserved2:16 ; } split;unsigned int full; };
arch/x86/kvm/cpuid.c +3 -1
@@ -636,7 +636,9 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) edx.split.num_counters_fixed =min (cap.num_counters_fixed,MAX_FIXED_COUNTERS ); edx.split.bit_width_fixed = cap.bit_width_fixed; - edx.split.reserved =0 ; + edx.split.anythread_deprecated =1 ; + edx.split.reserved1 =0 ; + edx.split.reserved2 =0 ; entry->eax = eax.full; entry->ebx = cap.events_mask;
Signature · 1 line
2.29.0.rc2.309.g374f81d7ae-goog
Quoted 6 lines · Stephane Eranian
Starting with Arch Perfmon v5, the anythread filter on generic counters may be deprecated. The current kernel was exporting the any filter without checking. On Icelake, it means you could do cpu/event=0x3c,any/ even though the filter does not exist. This patch corrects the problem by relying on the CPUID
0xaleaf function to determine if anythread is supported or not as described in the Intel SDM Vol3b 18.2.5.1 AnyThread Deprecation section.
-Andi
Peter Zijlstra
maintainerQuoted 22 lines · Stephane Eranian
Starting with Arch Perfmon v5, the anythread filter on generic counters may be deprecated. The current kernel was exporting the any filter without checking. On Icelake, it means you could do cpu/event=0x3c,any/ even though the filter does not exist. This patch corrects the problem by relying on the CPUID
0xaleaf function to determine if anythread is supported or not as described in the Intel SDM Vol3b 18.2.5.1 AnyThread Deprecation section.Signed-off-by Stephane Eranian <[email protected]>--- arch/x86/events/intel/core.c | 20 ++++++++++++++++++++ arch/x86/events/perf_event.h | 1 + arch/x86/include/asm/perf_event.h | 4 +++- arch/x86/kvm/cpuid.c | 4 +++- 4 files changed, 27 insertions(+), 2 deletions(-)arch/x86/events/intel/core.c +0
-0@@ -4220,6 +4220,16 @@ static struct attribute *intel_arch3_formats_attr[] = { NULL, };
arch/x86/events/intel/core.c static struct attribute *intel_arch3_formats_attr[] = { · line 4231
Quoted 10 lines
arch/x86/events/intel/core.c +9
-0+static struct attribute *intel_arch5_formats_attr[] = { + &format_attr_event.attr, + &format_attr_umask.attr, + &format_attr_edge.attr, + &format_attr_pc.attr, + &format_attr_inv.attr, + &format_attr_cmask.attr, +NULL , +};
Instead of adding yet another (which is an exact duplicate of the existing intel_arch_formats_attr BTW), can't we clean this up and use is_visible() as 'demanded' by GregKH and done by Jiri here:
3d5672735b23 ("perf/x86: Add is_visible attribute_group callback for base events") b7c9b3927337 ("perf/x86/intel: Use ->is_visible callback for default group") baa0c83363c7 ("perf/x86: Use the new pmu::update_attrs attribute group")
And only have "any" visible for v3,v4
Quoted 39 lines · Peter Zijlstra
Quoted 22 lines · Stephane Eranian
Starting with Arch Perfmon v5, the anythread filter on generic counters may be deprecated. The current kernel was exporting the any filter without checking. On Icelake, it means you could do cpu/event=0x3c,any/ even though the filter does not exist. This patch corrects the problem by relying on the CPUID
0xaleaf function to determine if anythread is supported or not as described in the Intel SDM Vol3b 18.2.5.1 AnyThread Deprecation section.Signed-off-by Stephane Eranian <[email protected]>--- arch/x86/events/intel/core.c | 20 ++++++++++++++++++++ arch/x86/events/perf_event.h | 1 + arch/x86/include/asm/perf_event.h | 4 +++- arch/x86/kvm/cpuid.c | 4 +++- 4 files changed, 27 insertions(+), 2 deletions(-)arch/x86/events/intel/core.c +0
-0@@ -4220,6 +4220,16 @@ static struct attribute *intel_arch3_formats_attr[] = { NULL, };arch/x86/events/intel/core.c static struct attribute *intel_arch3_formats_attr[] = { · line 4231
Quoted 10 lines
arch/x86/events/intel/core.c +9
-0+static struct attribute *intel_arch5_formats_attr[] = { + &format_attr_event.attr, + &format_attr_umask.attr, + &format_attr_edge.attr, + &format_attr_pc.attr, + &format_attr_inv.attr, + &format_attr_cmask.attr, +NULL , +};Instead of adding yet another (which is an exact duplicate of the existing
intel_arch_formats_attrBTW), can't we clean this up and useis_visible()as 'demanded' by GregKH and done by Jiri here:
Quoted 5 lines
3d5672735b23("perf/x86: Addis_visibleattribute_groupcallback for base events")b7c9b3927337("perf/x86/intel: Use ->is_visible callback for default group")baa0c83363c7("perf/x86: Use the newpmu::update_attrsattribute group")And only have "any" visible for v3,v4
Sure, let me resubmit with these changes.