From: Kan Liang <kan.liang@xxxxxxxxxxxxxxx> Define and apply the PERF_PMU_CAP_VPMU_PASSTHROUGH flag for the version 4 and later PMUs, which includes the improvements for virtualization. Signed-off-by: Kan Liang <kan.liang@xxxxxxxxxxxxxxx> Signed-off-by: Mingwei Zhang <mizhang@xxxxxxxxxx> --- arch/x86/events/intel/core.c | 6 ++++++ include/linux/perf_event.h | 1 + 2 files changed, 7 insertions(+) diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index a08f794a0e79..cf790c37757a 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -4662,6 +4662,9 @@ static void intel_pmu_check_hybrid_pmus(struct x86_hybrid_pmu *pmu) else pmu->pmu.capabilities |= ~PERF_PMU_CAP_AUX_OUTPUT; + if (x86_pmu.version >= 4) + pmu->pmu.capabilities |= PERF_PMU_CAP_VPMU_PASSTHROUGH; + intel_pmu_check_event_constraints(pmu->event_constraints, pmu->num_counters, pmu->num_counters_fixed, @@ -6137,6 +6140,9 @@ __init int intel_pmu_init(void) pr_cont(" AnyThread deprecated, "); } + if (version >= 4) + x86_get_pmu(smp_processor_id())->capabilities |= PERF_PMU_CAP_VPMU_PASSTHROUGH; + /* * Install the hw-cache-events table: */ diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index afb028c54f33..60eff413dbba 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -291,6 +291,7 @@ struct perf_event_pmu_context; #define PERF_PMU_CAP_NO_EXCLUDE 0x0040 #define PERF_PMU_CAP_AUX_OUTPUT 0x0080 #define PERF_PMU_CAP_EXTENDED_HW_TYPE 0x0100 +#define PERF_PMU_CAP_VPMU_PASSTHROUGH 0x0200 struct perf_output_handle; -- 2.34.1