aboutsummaryrefslogtreecommitdiff
path: root/kernel/task_work.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2012-08-21 15:05:14 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-21 09:11:44 -0700
commitf341861fb0b701139849f8a85c2d3cdff466e8e8 (patch)
treea6e6fedd03fdb923828fa7143a0363738cd7dfcb /kernel/task_work.c
parentec5da7f8dc023fc4dcbdd42e87dad231d2c2812d (diff)
downloadvexpress-lsk-f341861fb0b701139849f8a85c2d3cdff466e8e8.tar.gz
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 'kernel/task_work.c')
-rw-r--r--kernel/task_work.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/task_work.c b/kernel/task_work.c
index 91d4e1742a0..d320d44903b 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();
}
}
}