summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>2010-09-07 19:36:28 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-28 21:44:17 -0700
commitbd720c923f7febe45934f4e87c4c755e45b13bdc (patch)
treee3ba8598d010a3bbc0c197bcb91e9615061e29d8 /fs
parent8816b5d01705e2c5c32bbf9e39e9aebad10b5dca (diff)
execve: improve interactivity with large arguments
commit 7993bc1f4663c0db67bb8f0d98e6678145b387cd upstream. This adds a preemption point during the copying of the argument and environment strings for execve, in copy_strings(). There is already a preemption point in the count() loop, so this doesn't add any new points in the abstract sense. When the total argument+environment strings are very large, the time spent copying them can be much more than a normal user time slice. So this change improves the interactivity of the rest of the system when one process is doing an execve with very large arguments. Signed-off-by: Roland McGrath <roland@redhat.com> Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Cc: Chuck Ebbert <cebbert@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/exec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/exec.c b/fs/exec.c
index ca3d4a61fe23..775f054f34c7 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -419,6 +419,8 @@ static int copy_strings(int argc, char __user * __user * argv,
while (len > 0) {
int offset, bytes_to_copy;
+ cond_resched();
+
offset = pos % PAGE_SIZE;
if (offset == 0)
offset = PAGE_SIZE;