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: 47125db27e ("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
This commit is contained in:
Kan Liang 2020-11-25 13:37:20 -08:00 коммит произвёл Peter Zijlstra
Родитель 46b72e1bf4
Коммит f8129cd958
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -919,7 +919,7 @@ static __always_inline bool get_lbr_predicted(u64 info)
return !(info & LBR_INFO_MISPRED); 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) && if (static_cpu_has(X86_FEATURE_ARCH_LBR) &&
!(x86_pmu.lbr_timed_lbr && info & LBR_INFO_CYC_CNT_VALID)) !(x86_pmu.lbr_timed_lbr && info & LBR_INFO_CYC_CNT_VALID))