From: Kan Liang <kan.liang@linux.intel.com> mainline inclusion from mainline-v5.10-rc1 commit bbdbde2a415d9f479803266cae6fb0c1a9f6c80e category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I47H3V CVE: NA -------------------------------- commit bbdbde2a415d9f479803266cae6fb0c1a9f6c80e upstream Backport summary: backport to kernel 4.19.57 for ICX perf topdown support Bit 15 of the PERF_CAPABILITIES MSR indicates that the perf METRICS feature is supported. The perf METRICS is not a PEBS feature. Rename pebs_metrics_available perf_metrics. The bit is not used in the current code. It will be used in a later patch. Signed-off-by: Kan Liang <kan.liang@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/20200723171117.9918-6-kan.liang@linux.intel.com Signed-off-by: Yunying Sun <yunying.sun@intel.com> Signed-off-by: Jackie Liu <liuyun01@kylinos.cn> Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com> Reviewed-by: Wei Li <liwei391@huawei.com> Reviewed-by: Xie XiuQi <xiexiuqi@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- arch/x86/events/perf_event.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h index 79404b95beca7..5f754bfd5384e 100644 --- a/arch/x86/events/perf_event.h +++ b/arch/x86/events/perf_event.h @@ -516,6 +516,7 @@ union perf_capabilities { */ u64 full_width_write:1; u64 pebs_baseline:1; + u64 perf_metrics:1; }; u64 capabilities; }; -- 2.25.1