korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-01 08:04:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

sched: rt-watchdog: fix .rlim_max = RLIM_INFINITY

Browse Source 
Remove the curious logic to set it_sched_expires in the future. It useless
because rt.timeout wouldn't be incremented anyway.

Explicity check for RLIM_INFINITY as a test programm that had a 1s soft limit
and a inf hard limit would SIGKILL at 1s. This is because RLIM_INFINITY+d-1
is d-2.

Signed-off-by: Peter Zijlsta <a.p.zijlstra@chello.nl>
CC: Michal Schmidt <mschmidt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra 2008-01-25 21:08:32 +01:00 committed by Ingo Molnar
parent 1020387f5f
commit 5a52dd5009
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/posix-cpu-timers.c
View File

@ -1020,7 +1020,8 @@ static void check_thread_timers(struct task_struct *tsk,
unsigned long hard = sig->rlim[RLIMIT_RTTIME].rlim_max; unsigned long hard = sig->rlim[RLIMIT_RTTIME].rlim_max;
unsigned long *soft = &sig->rlim[RLIMIT_RTTIME].rlim_cur; unsigned long *soft = &sig->rlim[RLIMIT_RTTIME].rlim_cur;
if (tsk->rt.timeout > DIV_ROUND_UP(hard, USEC_PER_SEC/HZ)) { if (hard != RLIM_INFINITY &&
tsk->rt.timeout > DIV_ROUND_UP(hard, USEC_PER_SEC/HZ)) {
/* /*
* At the hard limit, we just die. * At the hard limit, we just die.
* No need to calculate anything else now. * No need to calculate anything else now.

8
kernel/sched_rt.c
View File

@ -1125,13 +1125,7 @@ static void watchdog(struct rq *rq, struct task_struct *p)
p->rt.timeout++; p->rt.timeout++;
next = DIV_ROUND_UP(min(soft, hard), USEC_PER_SEC/HZ); next = DIV_ROUND_UP(min(soft, hard), USEC_PER_SEC/HZ);
if (next > p->rt.timeout) { if (p->rt.timeout > next)
u64 next_time = p->se.sum_exec_runtime;
next_time += next * (NSEC_PER_SEC/HZ);
if (p->it_sched_expires > next_time)
p->it_sched_expires = next_time;
} else
p->it_sched_expires = p->se.sum_exec_runtime; p->it_sched_expires = p->se.sum_exec_runtime;
} }
} }