mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-14 14:34:28 +08:00
perf/x86/intel: Output LBR TOS information correctly
For Intel LBR, the LBR Top-of-Stack (TOS) information is the HW index of raw branch record for the most recent branch. For non-adaptive PEBS and non-PEBS, the TOS information can be directly retrieved from TOS MSR read in intel_pmu_lbr_read(). For adaptive PEBS, the LBR information stored in PEBS record doesn't include the TOS information. For single PEBS, TOS can be directly read from MSR, because the PMI is triggered immediately after PEBS is written. TOS MSR is still unchanged. For large PEBS, TOS MSR has stale value. Set -1ULL to indicate that the TOS information is not available. Signed-off-by: Kan Liang <kan.liang@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Link: https://lkml.kernel.org/r/20200127165355.27495-3-kan.liang@linux.intel.com
This commit is contained in:
parent
bbfd5e4fab
commit
db278b90c3
@ -585,7 +585,7 @@ static void intel_pmu_lbr_read_32(struct cpu_hw_events *cpuc)
|
||||
cpuc->lbr_entries[i].reserved = 0;
|
||||
}
|
||||
cpuc->lbr_stack.nr = i;
|
||||
cpuc->lbr_stack.hw_idx = -1ULL;
|
||||
cpuc->lbr_stack.hw_idx = tos;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -681,7 +681,7 @@ static void intel_pmu_lbr_read_64(struct cpu_hw_events *cpuc)
|
||||
out++;
|
||||
}
|
||||
cpuc->lbr_stack.nr = out;
|
||||
cpuc->lbr_stack.hw_idx = -1ULL;
|
||||
cpuc->lbr_stack.hw_idx = tos;
|
||||
}
|
||||
|
||||
void intel_pmu_lbr_read(void)
|
||||
@ -1122,7 +1122,13 @@ void intel_pmu_store_pebs_lbrs(struct pebs_lbr *lbr)
|
||||
int i;
|
||||
|
||||
cpuc->lbr_stack.nr = x86_pmu.lbr_nr;
|
||||
cpuc->lbr_stack.hw_idx = -1ULL;
|
||||
|
||||
/* Cannot get TOS for large PEBS */
|
||||
if (cpuc->n_pebs == cpuc->n_large_pebs)
|
||||
cpuc->lbr_stack.hw_idx = -1ULL;
|
||||
else
|
||||
cpuc->lbr_stack.hw_idx = intel_pmu_lbr_tos();
|
||||
|
||||
for (i = 0; i < x86_pmu.lbr_nr; i++) {
|
||||
u64 info = lbr->lbr[i].info;
|
||||
struct perf_branch_entry *e = &cpuc->lbr_entries[i];
|
||||
|
Loading…
Reference in New Issue
Block a user