From: Chris Wright Date: Tue, 31 Mar 2009 21:50:09 +0000 (-0700) Subject: really remove posix-timers-fix-rlimit_cpu-fork.patch X-Git-Tag: v2.6.29.1~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e2dd3c74716250dadb8317d87eee3b820998439;p=thirdparty%2Fkernel%2Fstable-queue.git really remove posix-timers-fix-rlimit_cpu-fork.patch --- diff --git a/queue-2.6.29/posix-timers-fix-rlimit_cpu-fork.patch b/queue-2.6.29/posix-timers-fix-rlimit_cpu-fork.patch deleted file mode 100644 index c3a1e0892d3..00000000000 --- a/queue-2.6.29/posix-timers-fix-rlimit_cpu-fork.patch +++ /dev/null @@ -1,57 +0,0 @@ -From stable-bounces@linux.kernel.org Thu Mar 26 23:25:10 2009 -Date: Thu, 26 Mar 2009 23:25:05 GMT -Message-Id: <200903262325.n2QNP5lM020281@hera.kernel.org> -From: Oleg Nesterov -To: stable@kernel.org -Subject: posix timers: fix RLIMIT_CPU && fork() - -From: Oleg Nesterov - -upstream commit: 37bebc70d7ad4144c571d74500db3bb26ec0c0eb - -See http://bugzilla.kernel.org/show_bug.cgi?id=12911 - -copy_signal() copies signal->rlim, but RLIMIT_CPU is "lost". Because -posix_cpu_timers_init_group() sets cputime_expires.prof_exp = 0 and thus -fastpath_timer_check() returns false unless we have other cpu timers. - -This is the minimal fix for 2.6.29 (tested) and 2.6.28. The patch is not -optimal, we need further cleanups here. With this patch update_rlimit_cpu() -is not really needed, but I don't think it should be removed. - -The proper fix (I think) is: - - - set_process_cpu_timer() should just start the cputimer->running - logic (it does), no need to change cputime_expires.xxx_exp - - - posix_cpu_timers_init_group() should set ->running when needed - - - fastpath_timer_check() can check ->running instead of - task_cputime_zero(signal->cputime_expires) - -Reported-by: Peter Lojkin -Signed-off-by: Oleg Nesterov -Cc: Peter Zijlstra -Cc: Roland McGrath -Cc: [for 2.6.29.x] -LKML-Reference: <20090323193411.GA17514@redhat.com> -Signed-off-by: Ingo Molnar -Signed-off-by: Chris Wright ---- -Oleg, what about the other two patches you send? - - kernel/posix-cpu-timers.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/kernel/posix-cpu-timers.c -+++ b/kernel/posix-cpu-timers.c -@@ -1370,7 +1370,8 @@ static inline int fastpath_timer_check(s - if (task_cputime_expired(&group_sample, &sig->cputime_expires)) - return 1; - } -- return 0; -+ -+ return sig->rlim[RLIMIT_CPU].rlim_cur != RLIM_INFINITY; - } - - /*