[PATCH -next] arm64: perf: Fix hw_event_id check in __armv8_pmuv3_map_event
Shaokun Zhang
zhangshaokun at hisilicon.com
Mon Jun 7 00:19:03 PDT 2021
Raw event SW_INCR (0x0000) shall be included in this check, so fix it.
Cc: Mark Rutland <mark.rutland at arm.com>
Cc: Will Deacon <will at kernel.org>
Signed-off-by: Shaokun Zhang <zhangshaokun at hisilicon.com>
---
arch/arm64/kernel/perf_event.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c
index a661010308c0..fa2f60d09e15 100644
--- a/arch/arm64/kernel/perf_event.c
+++ b/arch/arm64/kernel/perf_event.c
@@ -1000,7 +1000,7 @@ static int __armv8_pmuv3_map_event(struct perf_event *event,
event->hw.flags |= ARMPMU_EVT_64BIT;
/* Only expose micro/arch events supported by this PMU */
- if ((hw_event_id > 0) && (hw_event_id < ARMV8_PMUV3_MAX_COMMON_EVENTS)
+ if ((hw_event_id >= 0) && (hw_event_id < ARMV8_PMUV3_MAX_COMMON_EVENTS)
&& test_bit(hw_event_id, armpmu->pmceid_bitmap)) {
return hw_event_id;
}
--
2.7.4
More information about the linux-arm-kernel
mailing list