Commit 70b6f57f authored by Kan Liang's avatar Kan Liang Committed by Aichun Shi
Browse files

perf/x86/intel: Fix instructions:ppp support in Sapphire Rapids 

mainline inclusion
from mainline-v5.14-rc1
commit 1d5c7880
category: feature
feature: SPR PMU core event enhancement
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I596BF



Intel-SIG: commit 1d5c7880 ("perf/x86/intel: Fix instructions:ppp
support in Sapphire Rapids")

-------------------------------------

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: 61b985e3 ("perf/x86/intel: Add perf core PMU support for Sapphire Rapids")
Reported-by: default avatarYasin, Ahmad <ahmad.yasin@intel.com>
Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Signed-off-by: default avatarPeter 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


Signed-off-by: default avatarYunying Sun <yunying.sun@intel.com>
Signed-off-by: default avatarJason Zeng <jason.zeng@intel.com>
Signed-off-by: default avatarAichun Shi <aichun.shi@intel.com>
parent 73527c57

arch/x86/events/intel/core.c

+3 −1
Original line number Diff line number Diff line
@@ -4089,8 +4089,10 @@ spr_get_event_constraints(struct cpu_hw_events *cpuc, int idx, 
	 * The :ppp indicates the Precise Distribution (PDist) facility, which

	 * is only supported on the GP counter 0. If a :ppp event which is not

	 * available on the GP counter 0, error out.

	 * Exception: Instruction PDIR is only available on the fixed counter 0.

	 */

	if (event->attr.precise_ip == 3) {

	if ((event->attr.precise_ip == 3) &&

	    !constraint_match(&fixed0_constraint, event->hw.config)) {

		if (c->idxmsk64 & BIT_ULL(0))

			return &counter0_constraint;