Skip to content

Commit 15def34

Browse files
Yang JihongPeter Zijlstra
authored andcommitted
perf/core: Fix hardlockup failure caused by perf throttle
commit e050e3f ("perf: Fix broken interrupt rate throttling") introduces a change in throttling threshold judgment. Before this, compare hwc->interrupts and max_samples_per_tick, then increase hwc->interrupts by 1, but this commit reverses order of these two behaviors, causing the semantics of max_samples_per_tick to change. 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). Fixes: e050e3f ("perf: Fix broken interrupt rate throttling") Signed-off-by: Yang Jihong <yangjihong1@huawei.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/20230227023508.102230-1-yangjihong1@huawei.com
1 parent 872d280 commit 15def34

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

kernel/events/core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9433,8 +9433,8 @@ __perf_event_account_interrupt(struct perf_event *event, int throttle)
94339433
hwc->interrupts = 1;
94349434
} else {
94359435
hwc->interrupts++;
9436-
if (unlikely(throttle
9437-
&& hwc->interrupts >= max_samples_per_tick)) {
9436+
if (unlikely(throttle &&
9437+
hwc->interrupts > max_samples_per_tick)) {
94389438
__this_cpu_inc(perf_throttled_count);
94399439
tick_dep_set_cpu(smp_processor_id(), TICK_DEP_BIT_PERF_EVENTS);
94409440
hwc->interrupts = MAX_INTERRUPTS;

0 commit comments

Comments
 (0)