| From 010cb00265f150bf82b23c02ad1fb87ce5c781e1 Mon Sep 17 00:00:00 2001 |
| From: Kan Liang <kan.liang@linux.intel.com> |
| Date: Mon, 28 Sep 2020 06:47:26 -0700 |
| Subject: perf/x86/intel: Fix Ice Lake event constraint table |
| |
| From: Kan Liang <kan.liang@linux.intel.com> |
| |
| commit 010cb00265f150bf82b23c02ad1fb87ce5c781e1 upstream. |
| |
| An error occues when sampling non-PEBS INST_RETIRED.PREC_DIST(0x01c0) |
| event. |
| |
| perf record -e cpu/event=0xc0,umask=0x01/ -- sleep 1 |
| Error: |
| The sys_perf_event_open() syscall returned with 22 (Invalid argument) |
| for event (cpu/event=0xc0,umask=0x01/). |
| /bin/dmesg | grep -i perf may provide additional information. |
| |
| The idxmsk64 of the event is set to 0. The event never be successfully |
| scheduled. |
| |
| The event should be limit to the fixed counter 0. |
| |
| Fixes: 6017608936c1 ("perf/x86/intel: Add Icelake support") |
| Reported-by: Yi, Ammy <ammy.yi@intel.com> |
| Signed-off-by: Kan Liang <kan.liang@linux.intel.com> |
| Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> |
| Cc: stable@vger.kernel.org |
| Link: https://lkml.kernel.org/r/20200928134726.13090-1-kan.liang@linux.intel.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/x86/events/intel/core.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/x86/events/intel/core.c |
| +++ b/arch/x86/events/intel/core.c |
| @@ -243,7 +243,7 @@ static struct extra_reg intel_skl_extra_ |
| |
| static struct event_constraint intel_icl_event_constraints[] = { |
| FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */ |
| - INTEL_UEVENT_CONSTRAINT(0x1c0, 0), /* INST_RETIRED.PREC_DIST */ |
| + FIXED_EVENT_CONSTRAINT(0x01c0, 0), /* INST_RETIRED.PREC_DIST */ |
| FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */ |
| FIXED_EVENT_CONSTRAINT(0x0300, 2), /* CPU_CLK_UNHALTED.REF */ |
| FIXED_EVENT_CONSTRAINT(0x0400, 3), /* SLOTS */ |
