diff options
| author |   Kan Liang <kan.liang@linux.intel.com> | 2020-11-25 13:37:20 -0800 |
|---|---|---|
| committer |   Peter Zijlstra <peterz@infradead.org> | 2020-12-09 17:08:58 +0100 |
| commit | f8129cd958b395575e5543ce25a8434874b04d3a (patch) | |
| tree | 825372c3de9b79bd2669324552bd78bf2893acfd /arch/x86/events/intel/lbr.c | |
| parent | perf/x86/intel: Fix rtm_abort_event encoding on Ice Lake (diff) | |
| download | linux-dev-f8129cd958b395575e5543ce25a8434874b04d3a.tar.xz linux-dev-f8129cd958b395575e5543ce25a8434874b04d3a.zip | |
perf/x86/intel/lbr: Fix the return type of get_lbr_cycles()
The cycle count of a timed LBR is always 1 in perf record -D.
The cycle count is stored in the first 16 bits of the IA32_LBR_x_INFO
register, but the get_lbr_cycles() return Boolean type.
Use u16 to replace the Boolean type.
Fixes: 47125db27e47 ("perf/x86/intel/lbr: Support Architectural LBR")
Reported-by: Stephane Eranian <eranian@google.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://lkml.kernel.org/r/20201125213720.15692-2-kan.liang@linux.intel.com
Diffstat (limited to 'arch/x86/events/intel/lbr.c')
| -rw-r--r-- | arch/x86/events/intel/lbr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c index 8961653c5dd2..e2b0efcba101 100644 --- a/arch/x86/events/intel/lbr.c +++ b/arch/x86/events/intel/lbr.c @@ -919,7 +919,7 @@ static __always_inline bool get_lbr_predicted(u64 info) return !(info & LBR_INFO_MISPRED); } -static __always_inline bool get_lbr_cycles(u64 info) +static __always_inline u16 get_lbr_cycles(u64 info) { if (static_cpu_has(X86_FEATURE_ARCH_LBR) && !(x86_pmu.lbr_timed_lbr && info & LBR_INFO_CYC_CNT_VALID)) |