From: shengminghu512 <shengminghu512@qq.com>
To: broonie <broonie@kernel.org>
Cc: linux-kernel <linux-kernel@vger.kernel.org>,
"hu.shengming" <hu.shengming@zte.com.cn>,
"zhang.run" <zhang.run@zte.com.cn>
Subject: [PATCH] watchdog/softlockup: Fix sample ring index wrap in need_counting_irqs()
Date: Sun, 18 Jan 2026 17:14:49 +0800 [thread overview]
Message-ID: <tencent_08C319B2F9CDBDCAD20B0D380C4CDB7CF406@qq.com> (raw)
From: Shengming Hu <hu.shengming@zte.com.cn>
cpustat_tail indexes cpustat_util[], which is a NUM_SAMPLE_PERIODS-sized
ring buffer. need_counting_irqs() currently wraps the index using
NUM_HARDIRQ_REPORT, which only happens to match NUM_SAMPLE_PERIODS.
Use NUM_SAMPLE_PERIODS for the wrap to keep the ring math correct even if
the NUM_HARDIRQ_REPORT or NUM_SAMPLE_PERIODS changes.
Signed-off-by: Shengming Hu <hu.shengming@zte.com.cn>
---
kernel/watchdog.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index b4d5fbdb9..7d675781b 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -550,7 +550,7 @@ static bool need_counting_irqs(void)
u8 util;
int tail = __this_cpu_read(cpustat_tail);
- tail = (tail + NUM_HARDIRQ_REPORT - 1) % NUM_HARDIRQ_REPORT;
+ tail = (tail + NUM_SAMPLE_PERIODS - 1) % NUM_SAMPLE_PERIODS;
util = __this_cpu_read(cpustat_util[tail][STATS_HARDIRQ]);
return util > HARDIRQ_PERCENT_THRESH;
}
--
2.25.1
next reply other threads:[~2026-01-18 9:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-18 9:14 shengminghu512 [this message]
2026-01-19 13:59 shengminghu512
2026-01-28 17:52 ` Petr Mladek
2026-01-28 18:13 ` Andrew Morton
2026-01-29 9:42 ` Petr Mladek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_08C319B2F9CDBDCAD20B0D380C4CDB7CF406@qq.com \
--to=shengminghu512@qq.com \
--cc=broonie@kernel.org \
--cc=hu.shengming@zte.com.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=zhang.run@zte.com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®