You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
43 lines
1.4 KiB
43 lines
1.4 KiB
From: Roland McGrath <roland@redhat.com>
|
|
Date: Wed, 8 Sep 2010 02:36:28 +0000 (-0700)
|
|
Subject: execve: improve interactivity with large arguments
|
|
Git-commit: 7993bc1f4663c0db67bb8f0d98e6678145b387cd
|
|
Patch-mainline: 2.6.36-rc4
|
|
References: bnc#635425
|
|
Introduced-by: 2.6.23
|
|
|
|
execve: improve interactivity with large arguments
|
|
|
|
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>
|
|
Acked-by: Jeff Mahoney <jeffm@suse.com>
|
|
---
|
|
|
|
fs/exec.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/fs/exec.c b/fs/exec.c
|
|
index 1b63237..6f2d777 100644
|
|
--- a/fs/exec.c
|
|
+++ b/fs/exec.c
|
|
@@ -419,6 +419,8 @@ static int copy_strings(int argc, const char __user *const __user *argv,
|
|
while (len > 0) {
|
|
int offset, bytes_to_copy;
|
|
|
|
+ cond_resched();
|
|
+
|
|
offset = pos % PAGE_SIZE;
|
|
if (offset == 0)
|
|
offset = PAGE_SIZE;
|