Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1449637

[PATCH 3/3] hung_task.c: change the "max_count" code to use for_each_process_thread_break/continue

Show all headers | View raw

If sysctl_hung_task_check_count is low and the first "max_count" threads do
not exit, check_hung_uninterruptible_tasks() will never check other tasks,
this is just ugly.

Now that we have for_each_process_thread_continue(), we can save g/t before
return and restart on the next call.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
 kernel/hung_task.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/kernel/hung_task.c b/kernel/hung_task.c
index 517f52e..e6e516d 100644
--- a/kernel/hung_task.c
+++ b/kernel/hung_task.c
@@ -148,6 +148,9 @@ static void rcu_lock_break(void)
  */
 static void check_hung_uninterruptible_tasks(unsigned long timeout)
 {
+	/* we have only one watchdog() thread */
+	static struct task_struct *g_saved, *t_saved;
+
 	int max_count = sysctl_hung_task_check_count;
 	int batch_count = HUNG_TASK_BATCHING;
 	struct task_struct *g, *t;
@@ -160,18 +163,29 @@ static void check_hung_uninterruptible_tasks(unsigned long timeout)
 		return;
 
 	rcu_read_lock();
+	if (g_saved) {
+		g = g_saved;
+		t = t_saved;
+		g_saved = NULL;
+		goto resume;
+	}
+
 	for_each_process_thread(g, t) {
 		/* use "==" to skip the TASK_KILLABLE tasks waiting on NFS */
 		if (t->state == TASK_UNINTERRUPTIBLE)
 			check_hung_task(t, timeout);
 
-		if (!--max_count)
-			goto unlock;
-		if (!--batch_count) {
-			batch_count = HUNG_TASK_BATCHING;
+		if (!--max_count || !--batch_count) {
 			for_each_process_thread_break(g, t);
+			if (!max_count) {
+				g_saved = g;
+				t_saved = t;
+				goto unlock;
+			}
 			rcu_lock_break();
+ resume:
 			for_each_process_thread_continue(&g, &t);
+			batch_count = HUNG_TASK_BATCHING;
 		}
 	}
  unlock:
-- 
2.5.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/3] introduce for_each_process_thread_{break,continue}()  helpers Oleg Nesterov <oleg@redhat.com> - 2016-07-25 18:30 +0200
  [PATCH 3/3] hung_task.c: change the "max_count" code to use  for_each_process_thread_break/continue Oleg Nesterov <oleg@redhat.com> - 2016-07-25 18:30 +0200
  [PATCH 1/3] introduce for_each_process_thread_{break,continue}()  helpers Oleg Nesterov <oleg@redhat.com> - 2016-07-25 18:30 +0200
    Re: [PATCH 1/3] introduce for_each_process_thread_{break,continue}()  helpers Peter Zijlstra <peterz@infradead.org> - 2016-08-02 18:10 +0200
      Re: [PATCH 1/3] introduce for_each_process_thread_{break,continue}()  helpers Oleg Nesterov <oleg@redhat.com> - 2016-08-03 22:40 +0200
        Re: [PATCH 1/3] introduce for_each_process_thread_{break,continue}()  helpers Peter Zijlstra <peterz@infradead.org> - 2016-08-08 14:30 +0200
  [PATCH 0/1] (Was: introduce  for_each_process_thread_{break,continue}() helpers) Oleg Nesterov <oleg@redhat.com> - 2016-07-26 21:00 +0200
    [PATCH 1/1] stop_machine: touch_nmi_watchdog() after  MULTI_STOP_PREPARE Oleg Nesterov <oleg@redhat.com> - 2016-07-26 21:00 +0200
      Re: [PATCH 1/1] stop_machine: touch_nmi_watchdog() after  MULTI_STOP_PREPARE Thomas Gleixner <tglx@linutronix.de> - 2016-07-27 10:10 +0200
      [tip:core/urgent] stop_machine: Touch_nmi_watchdog() after  MULTI_STOP_PREPARE tip-bot for Oleg Nesterov <tipbot@zytor.com> - 2016-07-27 12:50 +0200

csiph-web