hrtimer: Account nr_retries on recovered interrupt retries

Re-arranging hrtimer_interrupt() switched the retry path to a local
counter and dropped the update of cpu_base->nr_retries, leaving the
field exported via /proc/timer_list stuck at zero.

Increment nr_retries only when another pass through the expiry loop
is started; the third attempt that falls through to hang handling is
still accounted by nr_hangs alone.

Fixes: 2889243848 ("hrtimer: Re-arrange hrtimer_interrupt()")
Signed-off-by: Liang Hao <haohlliang@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260731150408.19554-1-haohlliang@gmail.com
This commit is contained in:
Liang Hao
2026-07-31 23:04:08 +08:00
committed by Thomas Gleixner
parent 18c7d85864
commit 32a05ba399

View File

@@ -2254,8 +2254,10 @@ void hrtimer_interrupt(struct clock_event_device *dev)
expires_next = hrtimer_update_next_event(cpu_base);
cpu_base->hang_detected = false;
if (expires_next < now) {
if (++retries < 3)
if (++retries < 3) {
cpu_base->nr_retries++;
goto retry;
}
delta = ktime_sub(now, entry_time);
cpu_base->max_hang_time = max_t(unsigned int, cpu_base->max_hang_time, delta);