From: "tip-bot2 for Thomas Gleixner" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Frederic Weisbecker <frederic@kernel.org>,
Ingo Molnar <mingo@kernel.org>, Borislav Petkov <bp@alien8.de>,
linux-kernel@vger.kernel.org
Subject: [tip: timers/core] posix-cpu-timers: Consolidate timer expiry further
Date: Wed, 28 Aug 2019 10:16:33 -0000 [thread overview]
Message-ID: <156698739395.5786.693651296957117258.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20190821192922.365469982@linutronix.de>
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 1cd07c0b94f2c320270d76edb7dd49bceb09c1df
Gitweb: https://git.kernel.org/tip/1cd07c0b94f2c320270d76edb7dd49bceb09c1df
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Wed, 21 Aug 2019 21:09:20 +02:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Wed, 28 Aug 2019 11:50:41 +02:00
posix-cpu-timers: Consolidate timer expiry further
With the array based samples and expiry cache, the expiry function can use
a loop to collect timers from the clock specific lists.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lkml.kernel.org/r/20190821192922.365469982@linutronix.de
---
kernel/time/posix-cpu-timers.c | 63 +++++++++++++++------------------
1 file changed, 30 insertions(+), 33 deletions(-)
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index cf85292..caafdfd 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -752,6 +752,18 @@ check_timers_list(struct list_head *timers,
return U64_MAX;
}
+static void collect_posix_cputimers(struct posix_cputimers *pct,
+ u64 *samples, struct list_head *firing)
+{
+ struct posix_cputimer_base *base = pct->bases;
+ int i;
+
+ for (i = 0; i < CPUCLOCK_MAX; i++, base++) {
+ base->nextevt = check_timers_list(&base->cpu_timers, firing,
+ samples[i]);
+ }
+}
+
static inline void check_dl_overrun(struct task_struct *tsk)
{
if (tsk->dl.dl_overrun) {
@@ -768,25 +780,18 @@ static inline void check_dl_overrun(struct task_struct *tsk)
static void check_thread_timers(struct task_struct *tsk,
struct list_head *firing)
{
- struct posix_cputimer_base *base = tsk->posix_cputimers.bases;
+ struct posix_cputimers *pct = &tsk->posix_cputimers;
+ u64 samples[CPUCLOCK_MAX];
unsigned long soft;
- u64 stime, utime;
if (dl_task(tsk))
check_dl_overrun(tsk);
- if (expiry_cache_is_inactive(&tsk->posix_cputimers))
+ if (expiry_cache_is_inactive(pct))
return;
- task_cputime(tsk, &utime, &stime);
-
- base->nextevt = check_timers_list(&base->cpu_timers, firing,
- utime + stime);
- base++;
- base->nextevt = check_timers_list(&base->cpu_timers, firing, utime);
- base++;
- base->nextevt = check_timers_list(&base->cpu_timers, firing,
- tsk->se.sum_exec_runtime);
+ task_sample_cputime(tsk, samples);
+ collect_posix_cputimers(pct, samples, firing);
/*
* Check for the special case thread timers.
@@ -825,7 +830,7 @@ static void check_thread_timers(struct task_struct *tsk,
}
}
- if (expiry_cache_is_inactive(&tsk->posix_cputimers))
+ if (expiry_cache_is_inactive(pct))
tick_dep_clear_task(tsk, TICK_DEP_BIT_POSIX_TIMER);
}
@@ -869,15 +874,15 @@ static void check_process_timers(struct task_struct *tsk,
struct list_head *firing)
{
struct signal_struct *const sig = tsk->signal;
- struct posix_cputimer_base *base = sig->posix_cputimers.bases;
- u64 virt_exp, prof_exp, sched_exp, samples[CPUCLOCK_MAX];
+ struct posix_cputimers *pct = &sig->posix_cputimers;
+ u64 samples[CPUCLOCK_MAX];
unsigned long soft;
/*
* If cputimer is not running, then there are no active
* process wide timers (POSIX 1.b, itimers, RLIMIT_CPU).
*/
- if (!READ_ONCE(tsk->signal->cputimer.running))
+ if (!READ_ONCE(sig->cputimer.running))
return;
/*
@@ -891,21 +896,17 @@ static void check_process_timers(struct task_struct *tsk,
* so the sample can be taken directly.
*/
proc_sample_cputime_atomic(&sig->cputimer.cputime_atomic, samples);
-
- prof_exp = check_timers_list(&base[CPUCLOCK_PROF].cpu_timers,
- firing, samples[CPUCLOCK_PROF]);
- virt_exp = check_timers_list(&base[CPUCLOCK_VIRT].cpu_timers,
- firing, samples[CPUCLOCK_VIRT]);
- sched_exp = check_timers_list(&base[CPUCLOCK_SCHED].cpu_timers,
- firing, samples[CPUCLOCK_SCHED]);
+ collect_posix_cputimers(pct, samples, firing);
/*
* Check for the special case process timers.
*/
- check_cpu_itimer(tsk, &sig->it[CPUCLOCK_PROF], &prof_exp,
+ check_cpu_itimer(tsk, &sig->it[CPUCLOCK_PROF],
+ &pct->bases[CPUCLOCK_PROF].nextevt,
samples[CPUCLOCK_PROF], SIGPROF);
- check_cpu_itimer(tsk, &sig->it[CPUCLOCK_VIRT], &virt_exp,
- samples[CPUCLOCK_PROF], SIGVTALRM);
+ check_cpu_itimer(tsk, &sig->it[CPUCLOCK_VIRT],
+ &pct->bases[CPUCLOCK_VIRT].nextevt,
+ samples[CPUCLOCK_VIRT], SIGVTALRM);
soft = task_rlimit(tsk, RLIMIT_CPU);
if (soft != RLIM_INFINITY) {
@@ -940,15 +941,11 @@ static void check_process_timers(struct task_struct *tsk,
}
}
softns = soft * NSEC_PER_SEC;
- if (softns < prof_exp)
- prof_exp = softns;
+ if (softns < pct->bases[CPUCLOCK_PROF].nextevt)
+ pct->bases[CPUCLOCK_PROF].nextevt = softns;
}
- base[CPUCLOCK_PROF].nextevt = prof_exp;
- base[CPUCLOCK_VIRT].nextevt = virt_exp;
- base[CPUCLOCK_SCHED].nextevt = sched_exp;
-
- if (expiry_cache_is_inactive(&sig->posix_cputimers))
+ if (expiry_cache_is_inactive(pct))
stop_process_timers(sig);
sig->cputimer.checking_timer = false;
next prev parent reply other threads:[~2019-08-28 10:17 UTC|newest]
Thread overview: 137+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-21 19:08 [patch V2 00/38] posix-cpu-timers: Cleanup and consolidation Thomas Gleixner
2019-08-21 19:08 ` [patch V2 01/38] posix-cpu-timers: Provide task validation functions Thomas Gleixner
2019-08-21 22:33 ` Frederic Weisbecker
2019-08-21 23:03 ` Frederic Weisbecker
2019-08-23 15:33 ` Thomas Gleixner
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:08 ` [patch V2 02/38] posix-cpu-timers: Use common permission check in posix_cpu_clock_get() Thomas Gleixner
2019-08-21 23:40 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-29 11:00 ` kbuild test robot
2019-08-29 11:21 ` Thomas Gleixner
2019-08-30 1:08 ` [kbuild-all] " Philip Li
2019-08-29 11:23 ` kbuild test robot
2019-08-21 19:08 ` [patch V2 03/38] posix-cpu-timers: Use common permission check in posix_cpu_timer_create() Thomas Gleixner
2019-08-21 23:49 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:08 ` [patch V2 04/38] posix-cpu-timers: Provide quick sample function for itimer Thomas Gleixner
2019-08-22 12:13 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:08 ` [patch V2 05/38] itimers: Use quick sample function Thomas Gleixner
2019-08-22 12:15 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-29 23:47 ` kbuild test robot
2019-08-30 6:01 ` Thomas Gleixner
2019-08-21 19:08 ` [patch V2 06/38] posix-cpu-timers: Sample directly in timer check Thomas Gleixner
2019-08-22 12:30 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:08 ` [patch V2 07/38] posix-cpu-timers: Rename thread_group_cputimer() and make it static Thomas Gleixner
2019-08-22 12:41 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:08 ` [patch V2 08/38] posix-cpu-timers: Consolidate thread group sample code Thomas Gleixner
2019-08-22 13:49 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:08 ` [patch V2 09/38] posix-cpu-timers: Use clock ID in posix_cpu_timer_set() Thomas Gleixner
2019-08-22 13:58 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:08 ` [patch V2 10/38] posix-cpu-timers: Use clock ID in posix_cpu_timer_get() Thomas Gleixner
2019-08-22 14:07 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:08 ` [patch V2 11/38] posix-cpu-timers: Use clock ID in posix_cpu_timer_rearm() Thomas Gleixner
2019-08-22 14:12 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:08 ` [patch V2 12/38] posix-cpu-timers: Remove pointless return value check Thomas Gleixner
2019-08-22 14:15 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 13/38] posix-cpu-timers: Simplify sample functions Thomas Gleixner
2019-08-22 14:20 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 14/38] posix-cpu-timers: Get rid of pointer indirection Thomas Gleixner
2019-08-22 14:41 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 15/38] posix-cpu-timers: Sample task times once in expiry check Thomas Gleixner
2019-08-22 15:00 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 16/38] posix-cpu-timers: Move prof/virt_ticks into caller Thomas Gleixner
2019-08-22 15:05 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 17/38] posix-cpu-timers: Create a container struct Thomas Gleixner
2019-08-22 15:32 ` Frederic Weisbecker
2019-08-23 15:34 ` Thomas Gleixner
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 19/38] posix-cpu-timers: Move expiry cache into struct posix_cputimers Thomas Gleixner
2019-08-22 16:29 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 20/38] posix-cpu-timers: Provide array based access to expiry cache Thomas Gleixner
2019-08-23 17:33 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 21/38] posix-cpu-timers: Simplify timer queueing Thomas Gleixner
2019-08-23 17:51 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 22/38] posix-cpu-timers: Simplify set_process_cpu_timer() Thomas Gleixner
2019-08-23 18:00 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 23/38] posix-cpu-timers: Switch check_*_timers() to array cache Thomas Gleixner
2019-08-23 18:13 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 24/38] posix-cpu-timers: Remove the odd field rename defines Thomas Gleixner
2019-08-23 18:36 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 25/38] posix-cpu-timers: Provide array based sample functions Thomas Gleixner
2019-08-23 22:08 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 26/38] posix-cpu-timers: Make expiry checks array based Thomas Gleixner
2019-08-23 22:44 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 27/38] posix-cpu-timers: Remove cputime_expires Thomas Gleixner
2019-08-23 22:50 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 28/38] posix-cpu-timers: Restructure expiry array Thomas Gleixner
2019-08-26 16:32 ` Frederic Weisbecker
2019-08-26 18:16 ` Thomas Gleixner
2019-08-26 18:22 ` [patch V3 " Thomas Gleixner
2019-08-26 19:45 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-26 21:06 ` [patch V2 28/38] " Frederic Weisbecker
2019-08-26 21:46 ` Thomas Gleixner
2019-08-21 19:09 ` [patch V2 29/38] posix-cpu-timers: Switch thread group sampling to array Thomas Gleixner
2019-08-26 21:12 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 30/38] posix-cpu-timers: Respect INFINITY for hard RTTIME limit Thomas Gleixner
2019-08-26 21:19 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 31/38] rlimit: Rewrite non-sensical RLIMIT_CPU comment Thomas Gleixner
2019-08-26 21:41 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 32/38] posix-cpu-timers: Get rid of zero checks Thomas Gleixner
2019-08-26 21:57 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 33/38] posix-cpu-timers: Consolidate timer expiry further Thomas Gleixner
2019-08-26 22:29 ` Frederic Weisbecker
2019-08-28 10:16 ` tip-bot2 for Thomas Gleixner [this message]
2019-08-21 19:09 ` [patch V2 34/38] posix-cpu-timers: Get rid of 64bit divisions Thomas Gleixner
2019-08-26 22:51 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 35/38] posix-cpu-timers: Remove pointless comparisons Thomas Gleixner
2019-08-26 22:59 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 36/38] posix-cpu-timers: Deduplicate rlimit handling Thomas Gleixner
2019-08-26 23:13 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 37/38] posix-cpu-timers: Move state tracking to struct posix_cputimers Thomas Gleixner
2019-08-26 23:28 ` Frederic Weisbecker
2019-08-26 23:33 ` Thomas Gleixner
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-21 19:09 ` [patch V2 38/38] posix-cpu-timers: Utilize timerqueue for storage Thomas Gleixner
2019-08-27 0:48 ` Frederic Weisbecker
2019-08-27 6:08 ` Thomas Gleixner
2019-08-27 13:17 ` Frederic Weisbecker
2019-08-27 13:46 ` Thomas Gleixner
2019-08-27 19:31 ` [patch V3 " Thomas Gleixner
2019-08-27 22:23 ` Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-22 0:54 ` [patch V2 00/38] posix-cpu-timers: Cleanup and consolidation Christoph Hellwig
2019-08-22 1:02 ` Frederic Weisbecker
2019-08-22 1:02 ` Christoph Hellwig
[not found] ` <20190821192920.909530418@linutronix.de>
2019-08-22 16:06 ` [patch V2 18/38] sched: Move struct task_cputime to types.h Frederic Weisbecker
2019-08-28 10:16 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=156698739395.5786.693651296957117258.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@alien8.de \
--cc=frederic@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).