perf, x86: Disallow flags for most Core2/Atom/Nehalem/Westmere events
Subsystems (2)
PATCH 1/1 perf, x86: Disallow flags for most Core2/Atom/Nehalem/Westmere events
From: Andi Kleen <[email protected]>
Disallow setting inv/cmask/etc. flags for all PEBS events
on these CPUs, except for the UOPS_RETIRED.* events on Nehalem/Westmere, which are needed for cycles:p. This avoids an undefined situation strongly discouraged by the Intle SDM. The PLD_* events were already covered. This follows the earlier changes for Sandy Bridge and alter.
--- arch/x86/kernel/cpu/perf_event_intel_ds.c | 52 +++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_ds.c +26 -26
@@ -552,18 +552,18 @@ int intel_pmu_drain_bts_buffer(void)* PEBS */ struct event_constraint intel_core2_pebs_event_constraints[] = { -INTEL_UEVENT_CONSTRAINT (0x00c0 ,0x1 ),/* INST_RETIRED.ANY */ -INTEL_UEVENT_CONSTRAINT (0xfec1 ,0x1 ),/* X87_OPS_RETIRED.ANY */ -INTEL_UEVENT_CONSTRAINT (0x00c5 ,0x1 ),/* BR_INST_RETIRED.MISPRED */ -INTEL_UEVENT_CONSTRAINT (0x1fc7 ,0x1 ),/* SIMD_INST_RETURED.ANY */ -INTEL_EVENT_CONSTRAINT (0xcb ,0x1 ),/* MEM_LOAD_RETIRED.* */ +INTEL_FLAGS_UEVENT_CONSTRAINT (0x00c0 ,0x1 ),/* INST_RETIRED.ANY */ +INTEL_FLAGS_UEVENT_CONSTRAINT (0xfec1 ,0x1 ),/* X87_OPS_RETIRED.ANY */ +INTEL_FLAGS_UEVENT_CONSTRAINT (0x00c5 ,0x1 ),/* BR_INST_RETIRED.MISPRED */ +INTEL_FLAGS_UEVENT_CONSTRAINT (0x1fc7 ,0x1 ),/* SIMD_INST_RETURED.ANY */ +INTEL_FLAGS_EVENT_CONSTRAINT (0xcb ,0x1 ),/* MEM_LOAD_RETIRED.* */ EVENT_CONSTRAINT_END };struct event_constraint intel_atom_pebs_event_constraints[] = { -INTEL_UEVENT_CONSTRAINT (0x00c0 ,0x1 ),/* INST_RETIRED.ANY */ -INTEL_UEVENT_CONSTRAINT (0x00c5 ,0x1 ),/* MISPREDICTED_BRANCH_RETIRED */ -INTEL_EVENT_CONSTRAINT (0xcb ,0x1 ),/* MEM_LOAD_RETIRED.* */ +INTEL_FLAGS_UEVENT_CONSTRAINT (0x00c0 ,0x1 ),/* INST_RETIRED.ANY */ +INTEL_FLAGS_UEVENT_CONSTRAINT (0x00c5 ,0x1 ),/* MISPREDICTED_BRANCH_RETIRED */ +INTEL_FLAGS_EVENT_CONSTRAINT (0xcb ,0x1 ),/* MEM_LOAD_RETIRED.* */ EVENT_CONSTRAINT_END };
@@ -577,31 +577,31 @@ struct event_constraint intel_slm_pebs_event_constraints[] = {struct event_constraint intel_nehalem_pebs_event_constraints[] = {INTEL_PLD_CONSTRAINT (0x100b ,0xf ),/* MEM_INST_RETIRED.* */ -INTEL_EVENT_CONSTRAINT (0x0f ,0xf ),/* MEM_UNCORE_RETIRED.* */ -INTEL_UEVENT_CONSTRAINT (0x010c ,0xf ),/* MEM_STORE_RETIRED.DTLB_MISS */ -INTEL_EVENT_CONSTRAINT (0xc0 ,0xf ),/* INST_RETIRED.ANY */ +INTEL_FLAGS_EVENT_CONSTRAINT (0x0f ,0xf ),/* MEM_UNCORE_RETIRED.* */ +INTEL_FLAGS_UEVENT_CONSTRAINT (0x010c ,0xf ),/* MEM_STORE_RETIRED.DTLB_MISS */ +INTEL_FLAGS_EVENT_CONSTRAINT (0xc0 ,0xf ),/* INST_RETIRED.ANY */ INTEL_EVENT_CONSTRAINT (0xc2 ,0xf ),/* UOPS_RETIRED.* */ -INTEL_EVENT_CONSTRAINT (0xc4 ,0xf ),/* BR_INST_RETIRED.* */ -INTEL_UEVENT_CONSTRAINT (0x02c5 ,0xf ),/* BR_MISP_RETIRED.NEAR_CALL */ -INTEL_EVENT_CONSTRAINT (0xc7 ,0xf ),/* SSEX_UOPS_RETIRED.* */ -INTEL_UEVENT_CONSTRAINT (0x20c8 ,0xf ),/* ITLB_MISS_RETIRED */ -INTEL_EVENT_CONSTRAINT (0xcb ,0xf ),/* MEM_LOAD_RETIRED.* */ -INTEL_EVENT_CONSTRAINT (0xf7 ,0xf ),/* FP_ASSIST.* */ +INTEL_FLAGS_EVENT_CONSTRAINT (0xc4 ,0xf ),/* BR_INST_RETIRED.* */ +INTEL_FLAGS_UEVENT_CONSTRAINT (0x02c5 ,0xf ),/* BR_MISP_RETIRED.NEAR_CALL */ +INTEL_FLAGS_EVENT_CONSTRAINT (0xc7 ,0xf ),/* SSEX_UOPS_RETIRED.* */ +INTEL_FLAGS_UEVENT_CONSTRAINT (0x20c8 ,0xf ),/* ITLB_MISS_RETIRED */ +INTEL_FLAGS_EVENT_CONSTRAINT (0xcb ,0xf ),/* MEM_LOAD_RETIRED.* */ +INTEL_FLAGS_EVENT_CONSTRAINT (0xf7 ,0xf ),/* FP_ASSIST.* */ EVENT_CONSTRAINT_END };struct event_constraint intel_westmere_pebs_event_constraints[] = {INTEL_PLD_CONSTRAINT (0x100b ,0xf ),/* MEM_INST_RETIRED.* */ -INTEL_EVENT_CONSTRAINT (0x0f ,0xf ),/* MEM_UNCORE_RETIRED.* */ -INTEL_UEVENT_CONSTRAINT (0x010c ,0xf ),/* MEM_STORE_RETIRED.DTLB_MISS */ -INTEL_EVENT_CONSTRAINT (0xc0 ,0xf ),/* INSTR_RETIRED.* */ +INTEL_FLAGS_EVENT_CONSTRAINT (0x0f ,0xf ),/* MEM_UNCORE_RETIRED.* */ +INTEL_FLAGS_UEVENT_CONSTRAINT (0x010c ,0xf ),/* MEM_STORE_RETIRED.DTLB_MISS */ +INTEL_FLAGS_EVENT_CONSTRAINT (0xc0 ,0xf ),/* INSTR_RETIRED.* */ INTEL_EVENT_CONSTRAINT (0xc2 ,0xf ),/* UOPS_RETIRED.* */ -INTEL_EVENT_CONSTRAINT (0xc4 ,0xf ),/* BR_INST_RETIRED.* */ -INTEL_EVENT_CONSTRAINT (0xc5 ,0xf ),/* BR_MISP_RETIRED.* */ -INTEL_EVENT_CONSTRAINT (0xc7 ,0xf ),/* SSEX_UOPS_RETIRED.* */ -INTEL_UEVENT_CONSTRAINT (0x20c8 ,0xf ),/* ITLB_MISS_RETIRED */ -INTEL_EVENT_CONSTRAINT (0xcb ,0xf ),/* MEM_LOAD_RETIRED.* */ -INTEL_EVENT_CONSTRAINT (0xf7 ,0xf ),/* FP_ASSIST.* */ +INTEL_FLAGS_EVENT_CONSTRAINT (0xc4 ,0xf ),/* BR_INST_RETIRED.* */ +INTEL_FLAGS_EVENT_CONSTRAINT (0xc5 ,0xf ),/* BR_MISP_RETIRED.* */ +INTEL_FLAGS_EVENT_CONSTRAINT (0xc7 ,0xf ),/* SSEX_UOPS_RETIRED.* */ +INTEL_FLAGS_UEVENT_CONSTRAINT (0x20c8 ,0xf ),/* ITLB_MISS_RETIRED */ +INTEL_FLAGS_EVENT_CONSTRAINT (0xcb ,0xf ),/* MEM_LOAD_RETIRED.* */ +INTEL_FLAGS_EVENT_CONSTRAINT (0xf7 ,0xf ),/* FP_ASSIST.* */ EVENT_CONSTRAINT_END };
Signature · 1 line
1.9.3
Peter Zijlstra
maintainerQuoted 11 lines · Andi Kleen
From: Andi Kleen <[email protected]>
Disallow setting inv/cmask/etc. flags for all PEBS events
on these CPUs, except for the UOPS_RETIRED.* events on Nehalem/Westmere, which are needed for cycles:p. This avoids an undefined situation strongly discouraged by the Intle SDM. The PLD_* events were already covered. This follows the earlier changes for Sandy Bridge and alter.Signed-off-by Andi Kleen <[email protected]>From the compile before sending dept:
../arch/x86/kernel/cpu/perf_event_intel_ds.c:555:2: error: implicit declaration of function ‘INTEL_FLAGS_UEVENT_CONSTRAINT’ [-Werror=implicit-function-declaration]
Quoted 9 lines · Peter Zijlstra
Quoted 8 lines · Andi Kleen
From: Andi Kleen <[email protected]>
Disallow setting inv/cmask/etc. flags for all PEBS events
on these CPUs, except for the UOPS_RETIRED.* events on Nehalem/Westmere, which are needed for cycles:p. This avoids an undefined situation strongly discouraged by the Intle SDM. The PLD_* events were already covered. This follows the earlier changes for Sandy Bridge and alter.
Quoted 3 lines
Quoted 1 line
Signed-off-by Andi Kleen <[email protected]>From the compile before sending dept:
Sorry, I only sent one patch, instead of all three. Will resend.
-Andi