[PATCH RESEND v2] perf/core: Fix hardlockup failure caused by perf throttle

From: Yang Jihong
Date: Wed Feb 15 2023 - 07:09:44 EST


In literal sense of "max_samples_per_tick", if hwc->interrupts ==
max_samples_per_tick, it should not be throttled, therefore, the judgment
condition should be changed to "hwc->interrupts > max_samples_per_tick".

In fact, this may cause the hardlockup to fail, The minimum value of
max_samples_per_tick may be 1, in this case, the return value of
__perf_event_account_interrupt function is 1.
As a result, nmi_watchdog gets throttled, which would stop PMU (Use x86
architecture as an example, see x86_pmu_handle_irq).

Signed-off-by: Yang Jihong <yangjihong1@xxxxxxxxxx>
---
Changes since v1:
- Modify commit title.

kernel/events/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index c4be13e50547..c5c3c033ef6b 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -9409,7 +9409,7 @@ __perf_event_account_interrupt(struct perf_event *event, int throttle)
} else {
hwc->interrupts++;
if (unlikely(throttle
- && hwc->interrupts >= max_samples_per_tick)) {
+ && hwc->interrupts > max_samples_per_tick)) {
__this_cpu_inc(perf_throttled_count);
tick_dep_set_cpu(smp_processor_id(), TICK_DEP_BIT_PERF_EVENTS);
hwc->interrupts = MAX_INTERRUPTS;
--
2.30.GIT