Skip to content

Commit 134b667

Browse files
ZhenguoYao1akpm00
authored andcommitted
watchdog/softlockup:Fix incorrect CPU utilization output during softlockup
Since we use 16-bit precision, the raw data will undergo integer division, which may sometimes result in data loss. This can lead to slightly inaccurate CPU utilization calculations. Under normal circumstances, this isn't an issue. However, when CPU utilization reaches 100%, the calculated result might exceed 100%. For example, with raw data like the following: sample_period 400000134 new_stat 83648414036 old_stat 83247417494 sample_period=400000134/2^24=23 new_stat=83648414036/2^24=4985 old_stat=83247417494/2^24=4961 util=105% Below log will output: CPU#3 Utilization every 0s during lockup: #1: 0% system, 0% softirq, 105% hardirq, 0% idle #2: 0% system, 0% softirq, 105% hardirq, 0% idle #3: 0% system, 0% softirq, 100% hardirq, 0% idle #4: 0% system, 0% softirq, 105% hardirq, 0% idle #5: 0% system, 0% softirq, 105% hardirq, 0% idle To avoid confusion, we enforce a 100% display cap when calculations exceed this threshold. We also round to the nearest multiple of 16.8 milliseconds to improve the accuracy. Link: https://lkml.kernel.org/r/20250812082510.32291-1-yaozhenguo@jd.com Signed-off-by: ZhenguoYao <yaozhenguo1@gmail.com> Cc: Bitao Hu <yaoma@linux.alibaba.com> Cc: Li Huafei <lihuafei1@huawei.com> Cc: Max Kellermann <max.kellermann@ionos.com> Cc: Thomas Gleinxer <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent dc6cc4d commit 134b667

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

kernel/watchdog.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,13 @@ static void update_cpustat(void)
444444
old_stat = __this_cpu_read(cpustat_old[i]);
445445
new_stat = get_16bit_precision(cpustat[tracked_stats[i]]);
446446
util = DIV_ROUND_UP(100 * (new_stat - old_stat), sample_period_16);
447+
/* Since we use 16-bit precision, the raw data will undergo
448+
* integer division, which may sometimes result in data loss,
449+
* and then result might exceed 100%. To avoid confusion,
450+
* we enforce a 100% display cap when calculations exceed this threshold.
451+
*/
452+
if (util > 100)
453+
util = 100;
447454
__this_cpu_write(cpustat_util[tail][i], util);
448455
__this_cpu_write(cpustat_old[i], new_stat);
449456
}

0 commit comments

Comments
 (0)