The following commit has been merged into the timers/core branch of tip:
Commit-ID: 0476ff2c151ee35bda2f938e8828b6f6113ebf55
Gitweb: https://git.kernel.org/tip/0476ff2c151ee35bda2f938e8828b6f6113ebf55
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Wed, 21 Aug 2019 21:09:02 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Wed, 28 Aug 2019 11:50:32 +02:00
posix-cpu-timers: Sample task times once in expiry check
Sampling the task times twice does not make sense. Do it once.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Reviewed-by: Frederic Weisbecker <frederic@xxxxxxxxxx>
Link: https://lkml.kernel.org/r/20190821192920.639878168@xxxxxxxxxxxxx
---
kernel/time/posix-cpu-timers.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index a2007ce..98dab3e 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -785,9 +785,9 @@ static inline void check_dl_overrun(struct task_struct *tsk)
static void check_thread_timers(struct task_struct *tsk,
struct list_head *firing)
{
- struct list_head *timers = tsk->cpu_timers;
struct task_cputime *tsk_expires = &tsk->cputime_expires;
- u64 expires;
+ struct list_head *timers = tsk->cpu_timers;
+ u64 expires, stime, utime;
unsigned long soft;
if (dl_task(tsk))
@@ -800,10 +800,12 @@ static void check_thread_timers(struct task_struct *tsk,
if (task_cputime_zero(&tsk->cputime_expires))
return;
- expires = check_timers_list(timers, firing, prof_ticks(tsk));
+ task_cputime(tsk, &utime, &stime);
+
+ expires = check_timers_list(timers, firing, utime + stime);
tsk_expires->prof_exp = expires;
- expires = check_timers_list(++timers, firing, virt_ticks(tsk));
+ expires = check_timers_list(++timers, firing, utime);
tsk_expires->virt_exp = expires;
tsk_expires->sched_exp = check_timers_list(++timers, firing,
|