]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
task_work: add a scheduling point in task_work_run()
authorEric Dumazet <edumazet@google.com>
Tue, 21 Aug 2012 13:05:14 +0000 (15:05 +0200)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 22 Aug 2012 14:31:05 +0000 (10:31 -0400)
It seems commit 4a9d4b02 (switch fput to task_work_add) reintroduced
the problem addressed in commit 944be0b2 (close_files(): add scheduling
point)

If a server process with a lot of files (say 2 million tcp sockets)
is killed, we can spend a lot of time in task_work_run() and trigger
a soft lockup.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
kernel/task_work.c

index 91d4e1742a0c4ec1cd8805b6663f5a95b5d42b3b..d320d44903bd0ab8ce3a1dc3e40dee28a26e714f 100644 (file)
@@ -75,6 +75,7 @@ void task_work_run(void)
                        p = q->next;
                        q->func(q);
                        q = p;
+                       cond_resched();
                }
        }
 }