diff options
| author | Roland McGrath <roland@redhat.com> | 2010-09-07 19:36:28 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 21:04:18 -0700 |
| commit | 7a6c02774aa7ff340d3b69c941ccd2ec2b3bbd73 (patch) | |
| tree | 33e7e45922033fed45485a137c494911fb404859 | |
| parent | a32489590e52abc4bc98ede852b80970ff71c3c3 (diff) | |
| download | linux-stable-7a6c02774aa7ff340d3b69c941ccd2ec2b3bbd73.tar.gz linux-stable-7a6c02774aa7ff340d3b69c941ccd2ec2b3bbd73.tar.bz2 linux-stable-7a6c02774aa7ff340d3b69c941ccd2ec2b3bbd73.zip | |
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>
| -rw-r--r-- | fs/exec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/exec.c b/fs/exec.c index b7a76f8bb071..b89ac31d53d5 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -436,6 +436,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; |