Skip to contentSkip to conversation

hung_task: Allow hung_task_panic when hung_task_warnings is 0.

PATCH Applied [email protected] 3 participants 3 messages Sep 9, 2016 – Sep 10, 2016 Hung task detector

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hung_task: Allow hung_task_panic when hung_task_warnings is 0.

From: John Siddle <[email protected]>

Previously hung_task_panic would not be respected if enabled after hung_task_warnings had already been decremented to 0.

Permit the kernel to panic if hung_task_panic is enabled after hung_task_warnings has already been decremented to 0 and another task hangs for hung_task_timeout_secs seconds.

Check if hung_task_panic is enabled so we don't return prematurely, and check if hung_task_warnings is non-zero so we don't print the warning unnecessarily.

---
 kernel/hung_task.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)
kernel/hung_task.c +13 -11
index d234022..938e0a0 100644
@@ -98,7 +98,7 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout)
 
 	trace_sched_process_hang(t);
 
-	if (!sysctl_hung_task_warnings)
+	if (!sysctl_hung_task_warnings && !sysctl_hung_task_panic)
 		return;
 
 	if (sysctl_hung_task_warnings > 0)
@@ -108,16 +108,18 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout)
 	 * Ok, the task did not get scheduled for more than 2 minutes,
 	 * complain:
 	 */
-	pr_err("INFO: task %s:%d blocked for more than %ld seconds.\n",
-		t->comm, t->pid, timeout);
-	pr_err("      %s %s %.*s\n",
-		print_tainted(), init_utsname()->release,
-		(int)strcspn(init_utsname()->version, " "),
-		init_utsname()->version);
-	pr_err("\"echo 0 > /proc/sys/kernel/hung_task_timeout_secs\""
-		" disables this message.\n");
-	sched_show_task(t);
-	debug_show_held_locks(t);
+	if (sysctl_hung_task_warnings) {
+		pr_err("INFO: task %s:%d blocked for more than %ld seconds.\n",
+			t->comm, t->pid, timeout);
+		pr_err("      %s %s %.*s\n",
+			print_tainted(), init_utsname()->release,
+			(int)strcspn(init_utsname()->version, " "),
+			init_utsname()->version);
+		pr_err("\"echo 0 > /proc/sys/kernel/hung_task_timeout_secs\""
+			" disables this message.\n");
+		sched_show_task(t);
+		debug_show_held_locks(t);
+	}
 
 	touch_nmi_watchdog();
 
Signature · 1 line
2.7.4
maintainer
#1 lore raw
Quoted 42 lines · On Fri, 9 Sep 2016 15:43:34 -0400 [email protected] wrote:

From: John Siddle <[email protected]>

Previously hung_task_panic would not be respected if enabled after hung_task_warnings had already been decremented to 0.

Permit the kernel to panic if hung_task_panic is enabled after hung_task_warnings has already been decremented to 0 and another task hangs for hung_task_timeout_secs seconds.

Check if hung_task_panic is enabled so we don't return prematurely, and check if hung_task_warnings is non-zero so we don't print the warning unnecessarily.

...

kernel/hung_task.c +3 -11
@@ -98,7 +98,7 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout)
 
 	trace_sched_process_hang(t);
 
-	if (!sysctl_hung_task_warnings)
+	if (!sysctl_hung_task_warnings && !sysctl_hung_task_panic)
 		return;
 
 	if (sysctl_hung_task_warnings > 0)
@@ -108,16 +108,18 @@ static void check_hung_task(struct task_struct *t, unsigned long timeout)
 	 * Ok, the task did not get scheduled for more than 2 minutes,
 	 * complain:
 	 */
-	pr_err("INFO: task %s:%d blocked for more than %ld seconds.\n",
-		t->comm, t->pid, timeout);
-	pr_err("      %s %s %.*s\n",
-		print_tainted(), init_utsname()->release,
-		(int)strcspn(init_utsname()->version, " "),
-		init_utsname()->version);
-	pr_err("\"echo 0 > /proc/sys/kernel/hung_task_timeout_secs\""
-		" disables this message.\n");
-	sched_show_task(t);
-	debug_show_held_locks(t);
+	if (sysctl_hung_task_warnings) {
+		pr_err("INFO: task %s:%d blocked for more than %ld seconds.\n",

kernel/hung_task.c static void check_hung_task(struct task_struct *t, unsigned long timeout) · line 122

Quoted 10 lines
kernel/hung_task.c +10 -0
+			t->comm, t->pid, timeout);
+		pr_err("      %s %s %.*s\n",
+			print_tainted(), init_utsname()->release,
+			(int)strcspn(init_utsname()->version, " "),
+			init_utsname()->version);
+		pr_err("\"echo 0 > /proc/sys/kernel/hung_task_timeout_secs\""
+			" disables this message.\n");
+		sched_show_task(t);
+		debug_show_held_locks(t);
+	}

This introduces an off-by-one error. In the old code, if sysctl_hung_task_warnings==1 on entry, we warn. With the new code, we no longer warn.

This?

kernel/hung_task.c renamed from kernel/hung_task.c~hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix +1 -3
@@ -101,14 +101,12 @@ static void check_hung_task(struct task_
 	if (!sysctl_hung_task_warnings && !sysctl_hung_task_panic)
 		return;
 
-	if (sysctl_hung_task_warnings > 0)
-		sysctl_hung_task_warnings--;
-
 	/*
 	 * Ok, the task did not get scheduled for more than 2 minutes,
 	 * complain:
 	 */
 	if (sysctl_hung_task_warnings) {
+		sysctl_hung_task_warnings--;
 		pr_err("INFO: task %s:%d blocked for more than %ld seconds.\n",
 			t->comm, t->pid, timeout);
 		pr_err("      %s %s %.*s\n",

_

#2 lore raw
Quoted 3 lines · Andrew Morton

This introduces an off-by-one error. In the old code, if sysctl_hung_task_warnings==1 on entry, we warn. With the new code, we no longer warn.

Since sysctl_hung_task_warnings == -1 is allowed, we should not sysctl_hung_task_warnings-- unless sysctl_hung_task_warnings > 0.

Quoted 7 lines

This?

kernel/hung_task.c renamed from kernel/hung_task.c~hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix +0 -0
@@ -101,14 +101,12 @@ static void check_hung_task(struct task_
 	if (!sysctl_hung_task_warnings && !sysctl_hung_task_panic)

kernel/hung_task.c static void check_hung_task(struct task_ · line 108

Quoted 10 lines
kernel/hung_task.c renamed from kernel/hung_task.c~hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix +0 -3
 		return;
 
-	if (sysctl_hung_task_warnings > 0)
-		sysctl_hung_task_warnings--;
-
 	/*
 	 * Ok, the task did not get scheduled for more than 2 minutes,
 	 * complain:
 	 */
 	if (sysctl_hung_task_warnings) {

+ if (sysctl_hung_task_warnings > 0)

Quoted 4 lines
kernel/hung_task.c renamed from kernel/hung_task.c~hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix +1 -0
+		sysctl_hung_task_warnings--;
 		pr_err("INFO: task %s:%d blocked for more than %ld seconds.\n",
 			t->comm, t->pid, timeout);
 		pr_err("      %s %s %.*s\n",