]> git.hungrycats.org Git - linux/commitdiff
proc: add a schedule point in proc_pid_readdir()
authorEric Dumazet <edumazet@google.com>
Tue, 24 Jan 2017 23:18:07 +0000 (15:18 -0800)
committerSasha Levin <alexander.levin@verizon.com>
Mon, 26 Jun 2017 02:02:21 +0000 (22:02 -0400)
[ Upstream commit 3ba4bceef23206349d4130ddf140819b365de7c8 ]

We have seen proc_pid_readdir() invocations holding cpu for more than 50
ms.  Add a cond_resched() to be gentle with other tasks.

[akpm@linux-foundation.org: coding style fix]
Link: http://lkml.kernel.org/r/1484238380.15816.42.camel@edumazet-glaptop3.roam.corp.google.com
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
fs/proc/base.c

index fab32ad5d96d1c80b1348f38429a395cd8b66365..d5665490563b296b276ab3845de42d677615b269 100644 (file)
@@ -2880,6 +2880,8 @@ int proc_pid_readdir(struct file *file, struct dir_context *ctx)
             iter.tgid += 1, iter = next_tgid(ns, iter)) {
                char name[PROC_NUMBUF];
                int len;
+
+               cond_resched();
                if (!has_pid_permissions(ns, iter.task, 2))
                        continue;