Skip to content

Commit 1d5c788

Browse files
Kan LiangPeter Zijlstra
authored andcommitted
perf/x86/intel: Fix instructions:ppp support in Sapphire Rapids
Perf errors out when sampling instructions:ppp. $ perf record -e instructions:ppp -- true Error: The sys_perf_event_open() syscall returned with 22 (Invalid argument) for event (instructions:ppp). The instruction PDIR is only available on the fixed counter 0. The event constraint has been updated to fixed0_constraint in icl_get_event_constraints(). The Sapphire Rapids codes unconditionally error out for the event which is not available on the GP counter 0. Make the instructions:ppp an exception. Fixes: 61b985e ("perf/x86/intel: Add perf core PMU support for Sapphire Rapids") Reported-by: Yasin, Ahmad <ahmad.yasin@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://lore.kernel.org/r/1624029174-122219-4-git-send-email-kan.liang@linux.intel.com
1 parent d18216f commit 1d5c788

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

arch/x86/events/intel/core.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4032,8 +4032,10 @@ spr_get_event_constraints(struct cpu_hw_events *cpuc, int idx,
40324032
* The :ppp indicates the Precise Distribution (PDist) facility, which
40334033
* is only supported on the GP counter 0. If a :ppp event which is not
40344034
* available on the GP counter 0, error out.
4035+
* Exception: Instruction PDIR is only available on the fixed counter 0.
40354036
*/
4036-
if (event->attr.precise_ip == 3) {
4037+
if ((event->attr.precise_ip == 3) &&
4038+
!constraint_match(&fixed0_constraint, event->hw.config)) {
40374039
if (c->idxmsk64 & BIT_ULL(0))
40384040
return &counter0_constraint;
40394041

0 commit comments

Comments
 (0)