posix-timers: fix RLIMIT_CPU && setitimer(CPUCLOCK_PROF)
PATCH 2/2 posix-timers: fix RLIMIT_CPU && setitimer(CPUCLOCK_PROF)
update_rlimit_cpu() tries to optimize out set_process_cpu_timer() in case when we already have CPUCLOCK_PROF timer which should expire first. But it uses cputime_lt() instead of cputime_gt().
Test case:
int main(void)
{
struct itimerval it = {
.it_value = { .tv_sec = 1000 },
};
assert(!setitimer(ITIMER_PROF, &it, NULL));
struct rlimit rl = {
.rlim_cur = 1,
.rlim_max = 1,
};
assert(!setrlimit(RLIMIT_CPU, &rl));
for (;;)
;
return 0;
}Without this patch, the task is not killed as RLIMIT_CPU demands.
kernel/posix-cpu-timers.c renamed from kernel/posix-cpu-timers.c~2_UPDATE_RLIM +1 -1
@@ -18,7 +18,7 @@ void update_rlimit_cpu(unsigned long rli cputime =secs_to_cputime (rlim_new);if (cputime_eq (current->signal->it_prof_expires, cputime_zero) || -cputime_lt (current->signal->it_prof_expires, cputime)) { +cputime_gt (current->signal->it_prof_expires, cputime)) {spin_lock_irq (¤t->sighand->siglock);set_process_cpu_timer (current,CPUCLOCK_PROF , &cputime,NULL );spin_unlock_irq (¤t->sighand->siglock);
Quoted 27 lines · Oleg Nesterov
update_rlimit_cpu()tries to optimize outset_process_cpu_timer()in case when we already haveCPUCLOCK_PROFtimer which should expire first. But it usescputime_lt()instead ofcputime_gt().Test case:
int main(void) { struct itimerval it = { .it_value = { .tv_sec = 1000 }, }; assert(!setitimer(ITIMER_PROF, &it, NULL)); struct rlimit rl = { .rlim_cur = 1, .rlim_max = 1, }; assert(!setrlimit(RLIMIT_CPU, &rl)); for (;;) ; return 0; }
Quoted 3 lines
Without this patch, the task is not killed as
RLIMIT_CPUdemands.Signed-off-by Oleg Nesterov <[email protected]>
Nice catch,
Quoted 12 lines
kernel/posix-cpu-timers.c renamed from kernel/posix-cpu-timers.c~2_UPDATE_RLIM +1
-1@@ -18,7 +18,7 @@ void update_rlimit_cpu(unsigned long rli cputime =secs_to_cputime (rlim_new);if (cputime_eq (current->signal->it_prof_expires, cputime_zero) || -cputime_lt (current->signal->it_prof_expires, cputime)) { +cputime_gt (current->signal->it_prof_expires, cputime)) {spin_lock_irq (¤t->sighand->siglock);set_process_cpu_timer (current,CPUCLOCK_PROF , &cputime,NULL );spin_unlock_irq (¤t->sighand->siglock);
Commit-ID: 8f2e586567b1bad72dac7c3810fe9a2ef7117506 Gitweb: http://git.kernel.org/tip/8f2e586567b1bad72dac7c3810fe9a2ef7117506 Author: Oleg Nesterov <[email protected]> AuthorDate: Fri, 27 Mar 2009 01:06:10 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Apr 2009 17:51:39 +0200
posix-timers: fix RLIMIT_CPU && setitimer(CPUCLOCK_PROF)
update_rlimit_cpu() tries to optimize out set_process_cpu_timer() in case when we already have CPUCLOCK_PROF timer which should expire first. But it uses cputime_lt() instead of cputime_gt().
Test case:
int main(void)
{
struct itimerval it = {
.it_value = { .tv_sec = 1000 },
};
assert(!setitimer(ITIMER_PROF, &it, NULL));
struct rlimit rl = {
.rlim_cur = 1,
.rlim_max = 1,
};
assert(!setrlimit(RLIMIT_CPU, &rl));
for (;;)
;
return 0;
}Without this patch, the task is not killed as RLIMIT_CPU demands.
LKML-Reference: <[email protected]>
--- kernel/posix-cpu-timers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/posix-cpu-timers.c +1 -1
@@ -18,7 +18,7 @@ void update_rlimit_cpu(unsigned long rlim_new) cputime =secs_to_cputime (rlim_new);if (cputime_eq (current->signal->it_prof_expires, cputime_zero) || -cputime_lt (current->signal->it_prof_expires, cputime)) { +cputime_gt (current->signal->it_prof_expires, cputime)) {spin_lock_irq (¤t->sighand->siglock);set_process_cpu_timer (current,CPUCLOCK_PROF , &cputime,NULL );spin_unlock_irq (¤t->sighand->siglock);