aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/cpu/perf_event_intel_lbr.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel_lbr.c b/arch/x86/kernel/cpu/perf_event_intel_lbr.c
index ad0b8b0490a0..bfd0b717e944 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_lbr.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_lbr.c
@@ -555,6 +555,8 @@ static int intel_pmu_setup_sw_lbr_filter(struct perf_event *event)
555 if (br_type & PERF_SAMPLE_BRANCH_IND_JUMP) 555 if (br_type & PERF_SAMPLE_BRANCH_IND_JUMP)
556 mask |= X86_BR_IND_JMP; 556 mask |= X86_BR_IND_JMP;
557 557
558 if (br_type & PERF_SAMPLE_BRANCH_CALL)
559 mask |= X86_BR_CALL | X86_BR_ZERO_CALL;
558 /* 560 /*
559 * stash actual user request into reg, it may 561 * stash actual user request into reg, it may
560 * be used by fixup code for some CPU 562 * be used by fixup code for some CPU
@@ -890,6 +892,7 @@ static const int snb_lbr_sel_map[PERF_SAMPLE_BRANCH_MAX_SHIFT] = {
890 [PERF_SAMPLE_BRANCH_IND_CALL_SHIFT] = LBR_IND_CALL, 892 [PERF_SAMPLE_BRANCH_IND_CALL_SHIFT] = LBR_IND_CALL,
891 [PERF_SAMPLE_BRANCH_COND_SHIFT] = LBR_JCC, 893 [PERF_SAMPLE_BRANCH_COND_SHIFT] = LBR_JCC,
892 [PERF_SAMPLE_BRANCH_IND_JUMP_SHIFT] = LBR_IND_JMP, 894 [PERF_SAMPLE_BRANCH_IND_JUMP_SHIFT] = LBR_IND_JMP,
895 [PERF_SAMPLE_BRANCH_CALL_SHIFT] = LBR_REL_CALL,
893}; 896};
894 897
895static const int hsw_lbr_sel_map[PERF_SAMPLE_BRANCH_MAX_SHIFT] = { 898static const int hsw_lbr_sel_map[PERF_SAMPLE_BRANCH_MAX_SHIFT] = {
@@ -905,6 +908,7 @@ static const int hsw_lbr_sel_map[PERF_SAMPLE_BRANCH_MAX_SHIFT] = {
905 [PERF_SAMPLE_BRANCH_CALL_STACK_SHIFT] = LBR_REL_CALL | LBR_IND_CALL 908 [PERF_SAMPLE_BRANCH_CALL_STACK_SHIFT] = LBR_REL_CALL | LBR_IND_CALL
906 | LBR_RETURN | LBR_CALL_STACK, 909 | LBR_RETURN | LBR_CALL_STACK,
907 [PERF_SAMPLE_BRANCH_IND_JUMP_SHIFT] = LBR_IND_JMP, 910 [PERF_SAMPLE_BRANCH_IND_JUMP_SHIFT] = LBR_IND_JMP,
911 [PERF_SAMPLE_BRANCH_CALL_SHIFT] = LBR_REL_CALL,
908}; 912};
909 913
910/* core */ 914/* core */