Skip to content

Commit 507f2f1

Browse files
vittyvkgregkh
authored andcommitted
kernel: hung_task.c: disable on suspend
[ Upstream commit a1c6ca3 ] It is possible to observe hung_task complaints when system goes to suspend-to-idle state: # echo freeze > /sys/power/state PM: Syncing filesystems ... done. Freezing user space processes ... (elapsed 0.001 seconds) done. OOM killer disabled. Freezing remaining freezable tasks ... (elapsed 0.002 seconds) done. sd 0:0:0:0: [sda] Synchronizing SCSI cache INFO: task bash:1569 blocked for more than 120 seconds. Not tainted 4.19.0-rc3_+ #687 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. bash D 0 1569 604 0x00000000 Call Trace: ? __schedule+0x1fe/0x7e0 schedule+0x28/0x80 suspend_devices_and_enter+0x4ac/0x750 pm_suspend+0x2c0/0x310 Register a PM notifier to disable the detector on suspend and re-enable back on wakeup. Signed-off-by: Vitaly Kuznetsov <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 1d41cd1 commit 507f2f1

File tree

1 file changed

+29
-1
lines changed

1 file changed

+29
-1
lines changed

kernel/hung_task.c

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <linux/lockdep.h>
1616
#include <linux/export.h>
1717
#include <linux/sysctl.h>
18+
#include <linux/suspend.h>
1819
#include <linux/utsname.h>
1920
#include <linux/sched/signal.h>
2021
#include <linux/sched/debug.h>
@@ -232,6 +233,28 @@ void reset_hung_task_detector(void)
232233
}
233234
EXPORT_SYMBOL_GPL(reset_hung_task_detector);
234235

236+
static bool hung_detector_suspended;
237+
238+
static int hungtask_pm_notify(struct notifier_block *self,
239+
unsigned long action, void *hcpu)
240+
{
241+
switch (action) {
242+
case PM_SUSPEND_PREPARE:
243+
case PM_HIBERNATION_PREPARE:
244+
case PM_RESTORE_PREPARE:
245+
hung_detector_suspended = true;
246+
break;
247+
case PM_POST_SUSPEND:
248+
case PM_POST_HIBERNATION:
249+
case PM_POST_RESTORE:
250+
hung_detector_suspended = false;
251+
break;
252+
default:
253+
break;
254+
}
255+
return NOTIFY_OK;
256+
}
257+
235258
/*
236259
* kthread which checks for tasks stuck in D state
237260
*/
@@ -246,7 +269,8 @@ static int watchdog(void *dummy)
246269
long t = hung_timeout_jiffies(hung_last_checked, timeout);
247270

248271
if (t <= 0) {
249-
if (!atomic_xchg(&reset_hung_task, 0))
272+
if (!atomic_xchg(&reset_hung_task, 0) &&
273+
!hung_detector_suspended)
250274
check_hung_uninterruptible_tasks(timeout);
251275
hung_last_checked = jiffies;
252276
continue;
@@ -260,6 +284,10 @@ static int watchdog(void *dummy)
260284
static int __init hung_task_init(void)
261285
{
262286
atomic_notifier_chain_register(&panic_notifier_list, &panic_block);
287+
288+
/* Disable hung task detector on suspend */
289+
pm_notifier(hungtask_pm_notify, 0);
290+
263291
watchdog_task = kthread_run(watchdog, NULL, "khungtaskd");
264292

265293
return 0;

0 commit comments

Comments
 (0)