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 03/44] posix-timer: Use a callback for cancel synchronization
Date: Mon, 19 Aug 2019 16:31:44 +0200 [thread overview]
Message-ID: <20190819143801.656864506@linutronix.de> (raw)
In-Reply-To: 20190819143141.221906747@linutronix.de
Cleanup timer_wait_running() by using a kclock callback. Get's rid of the
ifdeffery and the odd conditionals. Should have thought about this right
away.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
kernel/time/alarmtimer.c | 14 ++++++++++++++
kernel/time/posix-timers.c | 32 ++++++++++++--------------------
kernel/time/posix-timers.h | 1 +
3 files changed, 27 insertions(+), 20 deletions(-)
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -606,6 +606,19 @@ static int alarm_timer_try_to_cancel(str
}
/**
+ * alarm_timer_wait_running - Posix timer callback to wait for a timer
+ * @timr: Pointer to the posixtimer data struct
+ *
+ * Called from the core code when timer cancel detected that the callback
+ * is running. @timr is unlocked and rcu read lock is held to prevent it
+ * from being freed.
+ */
+static void alarm_timer_wait_running(struct k_itimer *timr)
+{
+ hrtimer_cancel_wait_running(&timr->it.alarm.alarmtimer.timer);
+}
+
+/**
* alarm_timer_arm - Posix timer callback to arm a timer
* @timr: Pointer to the posixtimer data struct
* @expires: The new expiry time
@@ -834,6 +847,7 @@ const struct k_clock alarm_clock = {
.timer_forward = alarm_timer_forward,
.timer_remaining = alarm_timer_remaining,
.timer_try_to_cancel = alarm_timer_try_to_cancel,
+ .timer_wait_running = alarm_timer_wait_running,
.nsleep = alarm_timer_nsleep,
};
#endif /* CONFIG_POSIX_TIMERS */
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -805,7 +805,11 @@ static int common_hrtimer_try_to_cancel(
return hrtimer_try_to_cancel(&timr->it.real.timer);
}
-#ifdef CONFIG_PREEMPT_RT
+static void common_timer_wait_running(struct k_itimer *timer)
+{
+ hrtimer_cancel_wait_running(&timer->it.real.timer);
+}
+
static struct k_itimer *timer_wait_running(struct k_itimer *timer,
unsigned long *flags)
{
@@ -816,29 +820,13 @@ static struct k_itimer *timer_wait_runni
rcu_read_lock();
unlock_timer(timer, *flags);
- if (kc->timer_arm == common_hrtimer_arm)
- hrtimer_cancel_wait_running(&timer->it.real.timer);
- else if (kc == &alarm_clock)
- hrtimer_cancel_wait_running(&timer->it.alarm.alarmtimer.timer);
- else
- WARN_ON_ONCE(1);
- rcu_read_unlock();
-
- /* Relock the timer. It might be not longer hashed. */
- return lock_timer(timer_id, flags);
-}
-#else
-static struct k_itimer *timer_wait_running(struct k_itimer *timer,
- unsigned long *flags)
-{
- timer_t timer_id = READ_ONCE(timer->it_id);
+ if (!WARN_ON_ONCE(kc->timer_wait_running))
+ kc->timer_wait_running(timer);
- unlock_timer(timer, *flags);
- cpu_relax();
+ rcu_read_unlock();
/* Relock the timer. It might be not longer hashed. */
return lock_timer(timer_id, flags);
}
-#endif
/* Set a POSIX.1b interval timer. */
int common_timer_set(struct k_itimer *timr, int flags,
@@ -1279,6 +1267,7 @@ static const struct k_clock clock_realti
.timer_forward = common_hrtimer_forward,
.timer_remaining = common_hrtimer_remaining,
.timer_try_to_cancel = common_hrtimer_try_to_cancel,
+ .timer_wait_running = common_timer_wait_running,
.timer_arm = common_hrtimer_arm,
};
@@ -1294,6 +1283,7 @@ static const struct k_clock clock_monoto
.timer_forward = common_hrtimer_forward,
.timer_remaining = common_hrtimer_remaining,
.timer_try_to_cancel = common_hrtimer_try_to_cancel,
+ .timer_wait_running = common_timer_wait_running,
.timer_arm = common_hrtimer_arm,
};
@@ -1324,6 +1314,7 @@ static const struct k_clock clock_tai =
.timer_forward = common_hrtimer_forward,
.timer_remaining = common_hrtimer_remaining,
.timer_try_to_cancel = common_hrtimer_try_to_cancel,
+ .timer_wait_running = common_timer_wait_running,
.timer_arm = common_hrtimer_arm,
};
@@ -1339,6 +1330,7 @@ static const struct k_clock clock_bootti
.timer_forward = common_hrtimer_forward,
.timer_remaining = common_hrtimer_remaining,
.timer_try_to_cancel = common_hrtimer_try_to_cancel,
+ .timer_wait_running = common_timer_wait_running,
.timer_arm = common_hrtimer_arm,
};
--- a/kernel/time/posix-timers.h
+++ b/kernel/time/posix-timers.h
@@ -24,6 +24,7 @@ struct k_clock {
int (*timer_try_to_cancel)(struct k_itimer *timr);
void (*timer_arm)(struct k_itimer *timr, ktime_t expires,
bool absolute, bool sigev_none);
+ void (*timer_wait_running)(struct k_itimer *timr);
};
extern const struct k_clock clock_posix_cpu;
next prev parent reply other threads:[~2019-08-19 15:47 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 ` Thomas Gleixner [this message]
2019-08-20 2:21 ` [patch 03/44] posix-timer: Use a callback for cancel synchronization 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 ` [patch 42/44] posix-cpu-timers: Move state tracking to struct posix_cputimers Thomas Gleixner
2019-08-19 19:13 ` 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=20190819143801.656864506@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).