diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-08-21 21:09:17 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-08-28 11:50:39 +0200 |
| commit | fe0517f893d36636de20d0a809fc0c788ca0cade (patch) | |
| tree | 9315daeee3d886f94664030d8a5caefa9f0b6fb3 /kernel/time | |
| parent | posix-cpu-timers: Switch thread group sampling to array (diff) | |
| download | linux-fe0517f893d36636de20d0a809fc0c788ca0cade.tar.xz linux-fe0517f893d36636de20d0a809fc0c788ca0cade.zip | |
posix-cpu-timers: Respect INFINITY for hard RTTIME limit
The RTIME limit expiry code does not check the hard RTTIME limit for
INFINITY, i.e. being disabled. Add it.
While this could be considered an ABI breakage if something would depend on
this behaviour. Though it's highly unlikely to have an effect because
RLIM_INFINITY is at minimum INT_MAX and the RTTIME limit is in seconds, so
the timer would fire after ~68 years.
Adding this obvious correct limit check also allows further consolidation
of that code and is a prerequisite for cleaning up the 0 based checks and
the rlimit setter code.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lkml.kernel.org/r/20190821192922.078293002@linutronix.de
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/posix-cpu-timers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c index e62139a89375..a738d7659915 100644 --- a/kernel/time/posix-cpu-timers.c +++ b/kernel/time/posix-cpu-timers.c @@ -921,7 +921,7 @@ static void check_process_timers(struct task_struct *tsk, unsigned long hard = task_rlimit_max(tsk, RLIMIT_CPU); unsigned long psecs = div_u64(ptime, NSEC_PER_SEC); - if (psecs >= hard) { + if (hard != RLIM_INFINITY && psecs >= hard) { /* * At the hard limit, we just die. * No need to calculate anything else now. |