diff options
author | Eric Dumazet <edumazet@google.com> | 2012-08-21 15:05:14 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-21 18:11:44 +0200 |
commit | f341861fb0b701139849f8a85c2d3cdff466e8e8 (patch) | |
tree | a6e6fedd03fdb923828fa7143a0363738cd7dfcb /kernel/task_work.c | |
parent | fbcon: fix race condition between console lock and cursor timer (diff) | |
download | linux-f341861fb0b701139849f8a85c2d3cdff466e8e8.tar.xz linux-f341861fb0b701139849f8a85c2d3cdff466e8e8.zip |
task_work: add a scheduling point in task_work_run()
It seems commit 4a9d4b024a31 ("switch fput to task_work_add") re-
introduced the problem addressed in 944be0b22472 ("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: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r-- | kernel/task_work.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/task_work.c b/kernel/task_work.c index 91d4e1742a0c..d320d44903bd 100644 --- a/kernel/task_work.c +++ b/kernel/task_work.c @@ -75,6 +75,7 @@ void task_work_run(void) p = q->next; q->func(q); q = p; + cond_resched(); } } } |