Skip to content

Commit 32d35c4

Browse files
Colin Ian KingPeter Zijlstra
authored andcommitted
perf/x86: Allow for 8<num_fixed_counters<16
The 64 bit value read from MSR_ARCH_PERFMON_FIXED_CTR_CTRL is being bit-wise masked with the value (0x03 << i*4). However, the shifted value is evaluated using 32 bit arithmetic, so will UB when i > 8. Fix this by making 0x03 a ULL so that the shift is performed using 64 bit arithmetic. This makes the arithmetic internally consistent and preparers for the day when hardware provides 8<num_fixed_counters<16. Signed-off-by: Colin Ian King <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 6a5f438 commit 32d35c4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/events/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ bool check_hw_exists(struct pmu *pmu, int num_counters, int num_counters_fixed)
278278
for (i = 0; i < num_counters_fixed; i++) {
279279
if (fixed_counter_disabled(i, pmu))
280280
continue;
281-
if (val & (0x03 << i*4)) {
281+
if (val & (0x03ULL << i*4)) {
282282
bios_fail = 1;
283283
val_fail = val;
284284
reg_fail = reg;

0 commit comments

Comments
 (0)