From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>, Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
John Stultz <john.stultz@linaro.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Anna-Maria Behnsen <anna-maria@linutronix.de>
Subject: [patch 42/44] posix-cpu-timers: Move state tracking to struct posix_cputimers
Date: Mon, 19 Aug 2019 16:32:23 +0200 [thread overview]
Message-ID: <20190819143805.419809496@linutronix.de> (raw)
In-Reply-To: 20190819143141.221906747@linutronix.de
Put it where it belongs and cleanup the ifdeffery in fork completely.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
include/linux/posix-timers.h | 12 ++++++-
include/linux/sched/cputime.h | 9 +++--
include/linux/sched/signal.h | 6 ---
init/init_task.c | 2 -
kernel/fork.c | 6 ---
kernel/time/posix-cpu-timers.c | 68 +++++++++++++++++++++--------------------
6 files changed, 53 insertions(+), 50 deletions(-)
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -66,18 +66,26 @@ static inline int clockid_to_fd(const cl
/**
* posix_cputimers - Container for posix CPU timer related data
* @expiries: Earliest-expiration cache array based
+ * @timers_active: Timers are queued.
+ * @expiry_active: Timer expiry is active. Used for
+ * process wide timers to avoid multiple
+ * trying to handle expiry
* @cpu_timers: List heads to queue posix CPU timers
*
* Used in task_struct and signal_struct
*/
struct posix_cputimers {
u64 expiries[CPUCLOCK_MAX];
+ unsigned int timers_active;
+ unsigned int expiry_active;
struct list_head cpu_timers[CPUCLOCK_MAX];
};
static inline void posix_cputimers_init(struct posix_cputimers *pct)
{
memset(&pct->expiries, 0xff, sizeof(pct->expiries));
+ pct->timers_active = 0;
+ pct->expiry_active = 0;
INIT_LIST_HEAD(&pct->cpu_timers[0]);
INIT_LIST_HEAD(&pct->cpu_timers[1]);
INIT_LIST_HEAD(&pct->cpu_timers[2]);
@@ -87,8 +95,10 @@ static inline void posix_cputimers_group
u64 cpu_limit)
{
posix_cputimers_init(pct);
- if (cpu_limit != RLIM_INFINITY)
+ if (cpu_limit != RLIM_INFINITY) {
pct->expiries[CPUCLOCK_PROF] = cpu_limit * NSEC_PER_SEC;
+ pct->timers_active = true;
+ }
}
static inline void posix_cputimers_rt_watchdog(struct posix_cputimers *pct,
--- a/include/linux/sched/cputime.h
+++ b/include/linux/sched/cputime.h
@@ -70,7 +70,7 @@ void thread_group_sample_cputime(struct
*/
/**
- * get_running_cputimer - return &tsk->signal->cputimer if cputimer is running
+ * get_running_cputimer - return &tsk->signal->cputimer if cputimers are active
*
* @tsk: Pointer to target task.
*/
@@ -80,8 +80,11 @@ struct thread_group_cputimer *get_runnin
{
struct thread_group_cputimer *cputimer = &tsk->signal->cputimer;
- /* Check if cputimer isn't running. This is accessed without locking. */
- if (!READ_ONCE(cputimer->running))
+ /*
+ * Check whether posix cpu timers are active. If not the thread
+ * group accounting is not active either. Lockless check.
+ */
+ if (!READ_ONCE(tsk->signal->posix_cputimers.timers_active))
return NULL;
/*
--- a/include/linux/sched/signal.h
+++ b/include/linux/sched/signal.h
@@ -57,18 +57,12 @@ struct task_cputime_atomic {
/**
* struct thread_group_cputimer - thread group interval timer counts
* @cputime_atomic: atomic thread group interval timers.
- * @running: true when there are timers running and
- * @cputime_atomic receives updates.
- * @checking_timer: true when a thread in the group is in the
- * process of checking for thread group timers.
*
* This structure contains the version of task_cputime, above, that is
* used for thread group CPU timer calculations.
*/
struct thread_group_cputimer {
struct task_cputime_atomic cputime_atomic;
- bool running;
- bool checking_timer;
};
struct multiprocess_signals {
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -30,8 +30,6 @@ static struct signal_struct init_signals
.posix_timers = LIST_HEAD_INIT(init_signals.posix_timers),
.cputimer = {
.cputime_atomic = INIT_CPUTIME_ATOMIC,
- .running = false,
- .checking_timer = false,
},
#endif
INIT_CPU_TIMERS(init_signals)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1517,7 +1517,6 @@ void __cleanup_sighand(struct sighand_st
}
}
-#ifdef CONFIG_POSIX_TIMERS
/*
* Initialize POSIX timer handling for a thread group.
*/
@@ -1528,12 +1527,7 @@ static void posix_cpu_timers_init_group(
cpu_limit = READ_ONCE(sig->rlim[RLIMIT_CPU].rlim_cur);
posix_cputimers_group_init(pct, cpu_limit);
- if (cpu_limit != RLIM_INFINITY)
- sig->cputimer.running = true;
}
-#else
-static inline void posix_cpu_timers_init_group(struct signal_struct *sig) { }
-#endif
static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
{
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -239,8 +239,9 @@ static void update_gt_cputime(struct tas
void thread_group_sample_cputime(struct task_struct *tsk, u64 *samples)
{
struct thread_group_cputimer *cputimer = &tsk->signal->cputimer;
+ struct posix_cputimers *pct = &tsk->signal->posix_cputimers;
- WARN_ON_ONCE(!cputimer->running);
+ WARN_ON_ONCE(!pct->timers_active);
proc_sample_cputime_atomic(&cputimer->cputime_atomic, samples);
}
@@ -261,9 +262,10 @@ static void
thread_group_start_cputime(struct task_struct *tsk, u64 *samples)
{
struct thread_group_cputimer *cputimer = &tsk->signal->cputimer;
+ struct posix_cputimers *pct = &tsk->signal->posix_cputimers;
/* Check if cputimer isn't running. This is accessed without locking. */
- if (!READ_ONCE(cputimer->running)) {
+ if (!READ_ONCE(pct->timers_active)) {
struct task_cputime sum;
/*
@@ -275,13 +277,13 @@ thread_group_start_cputime(struct task_s
update_gt_cputime(&cputimer->cputime_atomic, &sum);
/*
- * We're setting cputimer->running without a lock. Ensure
- * this only gets written to in one operation. We set
- * running after update_gt_cputime() as a small optimization,
- * but barriers are not required because update_gt_cputime()
+ * We're setting timers_active without a lock. Ensure this
+ * only gets written to in one operation. We set it after
+ * update_gt_cputime() as a small optimization, but
+ * barriers are not required because update_gt_cputime()
* can handle concurrent updates.
*/
- WRITE_ONCE(cputimer->running, true);
+ WRITE_ONCE(pct->timers_active, true);
}
proc_sample_cputime_atomic(&cputimer->cputime_atomic, samples);
}
@@ -305,9 +307,10 @@ static u64 cpu_clock_sample_group(const
bool start)
{
struct thread_group_cputimer *cputimer = &p->signal->cputimer;
+ struct posix_cputimers *pct = &p->signal->posix_cputimers;
u64 samples[CPUCLOCK_MAX];
- if (!READ_ONCE(cputimer->running)) {
+ if (!READ_ONCE(pct->timers_active)) {
if (start)
thread_group_start_cputime(p, samples);
else
@@ -827,10 +830,10 @@ static void check_thread_timers(struct t
static inline void stop_process_timers(struct signal_struct *sig)
{
- struct thread_group_cputimer *cputimer = &sig->cputimer;
+ struct posix_cputimers *pct = &sig->posix_cputimers;
- /* Turn off cputimer->running. This is done without locking. */
- WRITE_ONCE(cputimer->running, false);
+ /* Turn off the active flag. This is done without locking. */
+ WRITE_ONCE(pct->timers_active, false);
tick_dep_clear_signal(sig, TICK_DEP_BIT_POSIX_TIMER);
}
@@ -870,17 +873,17 @@ static void check_process_timers(struct
unsigned long soft;
/*
- * If cputimer is not running, then there are no active
- * process wide timers (POSIX 1.b, itimers, RLIMIT_CPU).
+ * If there are no active process wide timers (POSIX 1.b, itimers,
+ * RLIMIT_CPU) nothing to check.
*/
- if (!READ_ONCE(sig->cputimer.running))
+ if (!READ_ONCE(pct->timers_active))
return;
/*
* Signify that a thread is checking for process timers.
* Write access to this field is protected by the sighand lock.
*/
- sig->cputimer.checking_timer = true;
+ pct->timers_active = true;
/*
* Collect the current process totals. Group accounting is active
@@ -924,7 +927,7 @@ static void check_process_timers(struct
if (expiry_cache_is_inactive(sig->posix_cputimers.expiries))
stop_process_timers(sig);
- sig->cputimer.checking_timer = false;
+ pct->expiry_active = false;
}
/*
@@ -1017,7 +1020,8 @@ static inline bool task_cputimers_expire
*/
static inline bool fastpath_timer_check(struct task_struct *tsk)
{
- u64 *expiries = tsk->posix_cputimers.expiries;
+ struct posix_cputimers *pct = &tsk->posix_cputimers;
+ u64 *expiries = pct->expiries;
struct signal_struct *sig;
if (!expiry_cache_is_inactive(expiries)) {
@@ -1029,29 +1033,29 @@ static inline bool fastpath_timer_check(
}
sig = tsk->signal;
+ pct = &sig->posix_cputimers;
/*
- * Check if thread group timers expired when the cputimer is
- * running and no other thread in the group is already checking
- * for thread group cputimers. These fields are read without the
- * sighand lock. However, this is fine because this is meant to
- * be a fastpath heuristic to determine whether we should try to
- * acquire the sighand lock to check/handle timers.
+ * Check if thread group timers expired when timers are active and
+ * no other thread in the group is already handling expiry for
+ * thread group cputimers. These fields are read without the
+ * sighand lock. However, this is fine because this is meant to be
+ * a fastpath heuristic to determine whether we should try to
+ * acquire the sighand lock to handle timer expiry.
*
- * In the worst case scenario, if 'running' or 'checking_timer' gets
- * set but the current thread doesn't see the change yet, we'll wait
- * until the next thread in the group gets a scheduler interrupt to
- * handle the timer. This isn't an issue in practice because these
- * types of delays with signals actually getting sent are expected.
+ * In the worst case scenario, if concurrently timers_active is set
+ * or expiry_active is cleared, but the current thread doesn't see
+ * the change yet, the timer checks are delayed until the next
+ * thread in the group gets a scheduler interrupt to handle the
+ * timer. This isn't an issue in practice because these types of
+ * delays with signals actually getting sent are expected.
*/
- if (READ_ONCE(sig->cputimer.running) &&
- !READ_ONCE(sig->cputimer.checking_timer)) {
+ if (READ_ONCE(pct->timers_active) && !READ_ONCE(pct->expiry_active)) {
u64 samples[CPUCLOCK_MAX];
proc_sample_cputime_atomic(&sig->cputimer.cputime_atomic,
samples);
- if (task_cputimers_expired(samples,
- sig->posix_cputimers.expiries))
+ if (task_cputimers_expired(samples, pct->expiries))
return true;
}
next prev parent reply other threads:[~2019-08-19 15:46 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-19 14:31 [patch 00/44] posix-cpu-timers: Cleanup and consolidation Thomas Gleixner
2019-08-19 14:31 ` [patch 01/44] posix-timers: Cleanup forward declarations and includes Thomas Gleixner
2019-08-20 12:20 ` Frederic Weisbecker
2019-08-20 13:03 ` Thomas Gleixner
2019-08-20 13:48 ` Frederic Weisbecker
2019-08-23 2:12 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-19 14:31 ` [patch 02/44] alarmtimers: Avoid rtc.h include Thomas Gleixner
2019-08-20 13:49 ` Frederic Weisbecker
2019-08-23 2:12 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-19 14:31 ` [patch 03/44] posix-timer: Use a callback for cancel synchronization Thomas Gleixner
2019-08-20 2:21 ` Christoph Hellwig
2019-08-20 13:08 ` Thomas Gleixner
2019-08-20 13:59 ` Frederic Weisbecker
2019-08-23 2:12 ` [tip: timers/core] posix-timers: Use a callback for cancel synchronization on PREEMPT_RT tip-bot2 for Thomas Gleixner
2019-08-19 14:31 ` [patch 04/44] posix-cpu-timers: Fixup stale comment Thomas Gleixner
2019-08-20 14:26 ` Frederic Weisbecker
2019-08-20 17:57 ` Thomas Gleixner
2019-08-20 20:48 ` Frederic Weisbecker
2019-08-20 21:43 ` Thomas Gleixner
2019-08-20 22:56 ` Frederic Weisbecker
2019-08-21 13:31 ` Thomas Gleixner
2019-08-21 15:51 ` Frederic Weisbecker
2019-08-23 2:12 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-19 14:31 ` [patch 05/44] posix-cpu-timers: Sanitize bogus WARNONS Thomas Gleixner
2019-08-21 11:34 ` Frederic Weisbecker
2019-08-23 2:12 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-19 14:31 ` [patch 06/44] posix-cpu-timers: Remove tsk argument from run_posix_cpu_timers() Thomas Gleixner
2019-08-21 11:36 ` Frederic Weisbecker
2019-08-23 2:12 ` [tip: timers/core] " tip-bot2 for Thomas Gleixner
2019-08-19 14:31 ` [patch 07/44] posix-cpu-timers: Simplify sighand locking in run_posix_cpu_timers() Thomas Gleixner
2019-08-21 12:09 ` Frederic Weisbecker
2019-08-21 13:25 ` Thomas Gleixner
2019-08-21 15:42 ` Frederic Weisbecker
2019-08-21 17:13 ` Thomas Gleixner
2019-08-19 14:31 ` [patch 08/44] posix-cpu-timers: Provide task validation functions Thomas Gleixner
2019-08-19 14:31 ` [patch 09/44] posix-cpu-timers: Use common permission check in posix_cpu_clock_get() Thomas Gleixner
2019-08-19 14:31 ` [patch 10/44] posix-cpu-timers: Use common permission check in posix_cpu_timer_create() Thomas Gleixner
2019-08-19 14:31 ` [patch 11/44] posix-cpu-timers: Provide quick sample function for itimer Thomas Gleixner
2019-08-19 14:31 ` [patch 12/44] itimers: Use quick sample function Thomas Gleixner
2019-08-19 14:31 ` [patch 13/44] posix-cpu-timers: Sample directly in timer check Thomas Gleixner
2019-08-19 14:31 ` [patch 14/44] posix-cpu-timers: Rename thread_group_cputimer() and make it static Thomas Gleixner
2019-08-19 14:31 ` [patch 15/44] posix-cpu-timer: Comsolidate thread group sample code Thomas Gleixner
2019-08-19 19:07 ` Ingo Molnar
2019-08-19 14:31 ` [patch 16/44] posix-cpu-timers: Use clock ID in posix_cpu_timer_set() Thomas Gleixner
2019-08-19 14:31 ` [patch 17/44] posix-cpu-timers: Use clock ID in posix_cpu_timer_get() Thomas Gleixner
2019-08-19 14:31 ` [patch 18/44] posix-cpu-timers: Use clock ID in posix_cpu_timer_rearm() Thomas Gleixner
2019-08-19 14:32 ` [patch 19/44] posix-cpu-timer: Remove pointless return value check Thomas Gleixner
2019-08-19 14:32 ` [patch 20/44] posix-cpu-timers: Simplify sample functions Thomas Gleixner
2019-08-19 14:32 ` [patch 21/44] posix-cpu-timers: Get rid of pointer indirection Thomas Gleixner
2019-08-19 14:32 ` [patch 22/44] posix-cpu-timers: Sample task times once in expiry check Thomas Gleixner
2019-08-19 14:32 ` [patch 23/44] posix-cpu-timers: Move prof/virt_ticks into caller Thomas Gleixner
2019-08-19 14:32 ` [patch 24/44] posix-cpu-timers: Create a container struct Thomas Gleixner
2019-08-19 14:32 ` [patch 25/44] sched: Move struct task_cputime to types.h Thomas Gleixner
2019-08-19 14:32 ` [patch 26/44] posix-cpu-timers: Move expiry cache into struct posix_cputimers Thomas Gleixner
2019-08-19 14:32 ` [patch 27/44] posix-cpu-timers: Provide array based access to expiry cache Thomas Gleixner
2019-08-19 19:32 ` Ingo Molnar
2019-08-20 20:22 ` Thomas Gleixner
2019-08-19 14:32 ` [patch 28/44] posix-cpu-timers: Simplify timer queueing Thomas Gleixner
2019-08-19 14:32 ` [patch 29/44] posix-cpu-timers: Simplify set_process_cpu_timer() Thomas Gleixner
2019-08-19 14:32 ` [patch 30/44] posix-cpu-timers: Switch check_*_timers() to array cache Thomas Gleixner
2019-08-19 14:32 ` [patch 31/44] posix-cpu-timers: Remove the odd field rename defines Thomas Gleixner
2019-08-19 14:32 ` [patch 32/44] posix-cpu-timers: Provide array based sample functions Thomas Gleixner
2019-08-19 14:32 ` [patch 33/44] posix-cpu-timers: Make expiry checks array based Thomas Gleixner
2019-08-19 14:32 ` [patch 34/44] posix-cpu-timers: Remove cputime_expires Thomas Gleixner
2019-08-19 14:32 ` [patch 35/44] posix-cpu-timers: Switch thread group sampling to array Thomas Gleixner
2019-08-19 14:32 ` [patch 36/44] posix-cpu-timers: Get rid of zero checks Thomas Gleixner
2019-08-19 14:32 ` [patch 37/44] posix-cpu-timers: Consolidate timer expiry further Thomas Gleixner
2019-08-19 14:32 ` [patch 38/44] posix-cpu-timers: Respect INFINITY for hard RTTIME limit Thomas Gleixner
2019-08-19 20:06 ` Ingo Molnar
2019-08-19 20:29 ` Thomas Gleixner
2019-08-19 14:32 ` [patch 39/44] posix-cpu-timers: Get rid of 64bit divisions Thomas Gleixner
2019-08-19 14:32 ` [patch 40/44] posix-cpu-timers: Remove pointless comparisions Thomas Gleixner
2019-08-19 20:10 ` Ingo Molnar
2019-08-19 14:32 ` [patch 41/44] posix-cpu-timers: Deduplicate rlimit handling Thomas Gleixner
2019-08-19 14:32 ` Thomas Gleixner [this message]
2019-08-19 19:13 ` [patch 42/44] posix-cpu-timers: Move state tracking to struct posix_cputimers Ingo Molnar
2019-08-19 20:29 ` Thomas Gleixner
2019-08-19 14:32 ` [patch 43/44] posix-cpu-timers: Utilize timerqueue for storage Thomas Gleixner
2019-08-19 14:32 ` [patch 44/44] posix-cpu-timers: Expire timers directly Thomas Gleixner
2019-08-19 19:09 ` Ingo Molnar
2019-08-20 13:07 ` Thomas Gleixner
2019-08-20 2:18 ` [patch 00/44] posix-cpu-timers: Cleanup and consolidation Christoph Hellwig
2019-08-20 13:09 ` 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=20190819143805.419809496@linutronix.de \
--to=tglx@linutronix.de \
--cc=anna-maria@linutronix.de \
--cc=fweisbec@gmail.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
/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).