From: Roland McGrath Date: Wed, 8 Sep 2010 02:36:28 +0000 (-0700) Subject: execve: improve interactivity with large arguments X-Git-Tag: v2.6.34.8~46 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=530cec0b21b6f8fdd2cd45893bb9c06b6afe256e;p=thirdparty%2Fkernel%2Fstable.git 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 Reviewed-by: KOSAKI Motohiro Signed-off-by: Linus Torvalds Signed-off-by: Paul Gortmaker --- diff --git a/fs/exec.c b/fs/exec.c index b884fdebbdb9e..b187ab03133f1 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;