Skip to content

Commit 7a05c0f

Browse files
Michal Hockotorvalds
authored andcommitted
watchdog: make sure the watchdog thread gets CPU on loaded system
If the system is loaded while hotplugging a CPU we might end up with a bogus hardlockup detection. This has been seen during LTP pounder test executed in parallel with hotplug test. The main problem is that enable_watchdog (called when CPU is brought up) registers perf event which periodically checks per-cpu counter (hrtimer_interrupts), updated from a hrtimer callback, but the hrtimer is fired from the kernel thread. This means that while we already do check for the hard lockup the kernel thread might be sitting on the runqueue with zillions of tasks so there is nobody to update the value we rely on and so we KABOOM. Let's fix this by boosting the watchdog thread priority before we wake it up rather than when it's already running. This still doesn't handle a case where we have the same amount of high prio FIFO tasks but that doesn't seem to be common. The current implementation doesn't handle that case anyway so this is not worse at least. Unfortunately, we cannot start perf counter from the watchdog thread because we could miss a real lock up and also we cannot start the hrtimer watchdog_enable because we there is no way (at least I don't know any) to start a hrtimer from a different CPU. [[email protected]: fix compile issue with param] Cc: Ingo Molnar <[email protected]> Cc: Peter Zijlstra <[email protected]> Reviewed-by: Mandeep Singh Baines <[email protected]> Signed-off-by: Michal Hocko <[email protected]> Signed-off-by: Don Zickus <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 397a21f commit 7a05c0f

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

kernel/watchdog.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,11 +319,9 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer)
319319
*/
320320
static int watchdog(void *unused)
321321
{
322-
struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };
322+
struct sched_param param = { .sched_priority = 0 };
323323
struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);
324324

325-
sched_setscheduler(current, SCHED_FIFO, &param);
326-
327325
/* initialize timestamp */
328326
__touch_watchdog();
329327

@@ -350,7 +348,6 @@ static int watchdog(void *unused)
350348
set_current_state(TASK_INTERRUPTIBLE);
351349
}
352350
__set_current_state(TASK_RUNNING);
353-
param.sched_priority = 0;
354351
sched_setscheduler(current, SCHED_NORMAL, &param);
355352
return 0;
356353
}
@@ -439,6 +436,7 @@ static int watchdog_enable(int cpu)
439436

440437
/* create the watchdog thread */
441438
if (!p) {
439+
struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };
442440
p = kthread_create_on_node(watchdog, NULL, cpu_to_node(cpu), "watchdog/%d", cpu);
443441
if (IS_ERR(p)) {
444442
printk(KERN_ERR "softlockup watchdog for %i failed\n", cpu);
@@ -450,6 +448,7 @@ static int watchdog_enable(int cpu)
450448
}
451449
goto out;
452450
}
451+
sched_setscheduler(p, SCHED_FIFO, &param);
453452
kthread_bind(p, cpu);
454453
per_cpu(watchdog_touch_ts, cpu) = 0;
455454
per_cpu(softlockup_watchdog, cpu) = p;

0 commit comments

Comments
 (0)