2019-04-08 23:49:20 +00:00
|
|
|
From 3ae267e2e8aab45de92b1aa5900c038e4dc41f50 Mon Sep 17 00:00:00 2001
|
2018-08-27 14:32:32 +00:00
|
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
|
|
Date: Thu, 14 Feb 2013 22:36:59 +0100
|
2019-04-08 23:49:20 +00:00
|
|
|
Subject: [PATCH 033/266] timekeeping: Split jiffies seqlock
|
|
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.31-rt18.tar.xz
|
2018-08-27 14:32:32 +00:00
|
|
|
|
|
|
|
Replace jiffies_lock seqlock with a simple seqcounter and a rawlock so
|
|
|
|
it can be taken in atomic context on RT.
|
|
|
|
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
|
|
---
|
2019-04-08 23:49:20 +00:00
|
|
|
kernel/time/jiffies.c | 7 ++++---
|
|
|
|
kernel/time/tick-common.c | 10 ++++++----
|
|
|
|
kernel/time/tick-sched.c | 19 ++++++++++++-------
|
|
|
|
kernel/time/timekeeping.c | 6 ++++--
|
|
|
|
kernel/time/timekeeping.h | 3 ++-
|
2018-08-27 14:32:32 +00:00
|
|
|
5 files changed, 28 insertions(+), 17 deletions(-)
|
|
|
|
|
2019-04-08 23:49:20 +00:00
|
|
|
diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
|
|
|
|
index 497719127bf9..62acb8914c9e 100644
|
2018-08-27 14:32:32 +00:00
|
|
|
--- a/kernel/time/jiffies.c
|
|
|
|
+++ b/kernel/time/jiffies.c
|
2019-04-08 23:49:20 +00:00
|
|
|
@@ -74,7 +74,8 @@ static struct clocksource clocksource_jiffies = {
|
2018-08-27 14:32:32 +00:00
|
|
|
.max_cycles = 10,
|
|
|
|
};
|
|
|
|
|
|
|
|
-__cacheline_aligned_in_smp DEFINE_SEQLOCK(jiffies_lock);
|
|
|
|
+__cacheline_aligned_in_smp DEFINE_RAW_SPINLOCK(jiffies_lock);
|
|
|
|
+__cacheline_aligned_in_smp seqcount_t jiffies_seq;
|
|
|
|
|
|
|
|
#if (BITS_PER_LONG < 64)
|
|
|
|
u64 get_jiffies_64(void)
|
|
|
|
@@ -83,9 +84,9 @@ u64 get_jiffies_64(void)
|
|
|
|
u64 ret;
|
|
|
|
|
|
|
|
do {
|
|
|
|
- seq = read_seqbegin(&jiffies_lock);
|
|
|
|
+ seq = read_seqcount_begin(&jiffies_seq);
|
|
|
|
ret = jiffies_64;
|
|
|
|
- } while (read_seqretry(&jiffies_lock, seq));
|
|
|
|
+ } while (read_seqcount_retry(&jiffies_seq, seq));
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(get_jiffies_64);
|
2019-04-08 23:49:20 +00:00
|
|
|
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
|
|
|
|
index 14de3727b18e..7a87a4488a5e 100644
|
2018-08-27 14:32:32 +00:00
|
|
|
--- a/kernel/time/tick-common.c
|
|
|
|
+++ b/kernel/time/tick-common.c
|
|
|
|
@@ -79,13 +79,15 @@ int tick_is_oneshot_available(void)
|
|
|
|
static void tick_periodic(int cpu)
|
|
|
|
{
|
|
|
|
if (tick_do_timer_cpu == cpu) {
|
|
|
|
- write_seqlock(&jiffies_lock);
|
|
|
|
+ raw_spin_lock(&jiffies_lock);
|
|
|
|
+ write_seqcount_begin(&jiffies_seq);
|
|
|
|
|
|
|
|
/* Keep track of the next tick event */
|
|
|
|
tick_next_period = ktime_add(tick_next_period, tick_period);
|
|
|
|
|
|
|
|
do_timer(1);
|
|
|
|
- write_sequnlock(&jiffies_lock);
|
|
|
|
+ write_seqcount_end(&jiffies_seq);
|
|
|
|
+ raw_spin_unlock(&jiffies_lock);
|
|
|
|
update_wall_time();
|
|
|
|
}
|
|
|
|
|
2019-04-08 23:49:20 +00:00
|
|
|
@@ -157,9 +159,9 @@ void tick_setup_periodic(struct clock_event_device *dev, int broadcast)
|
2018-08-27 14:32:32 +00:00
|
|
|
ktime_t next;
|
|
|
|
|
|
|
|
do {
|
|
|
|
- seq = read_seqbegin(&jiffies_lock);
|
|
|
|
+ seq = read_seqcount_begin(&jiffies_seq);
|
|
|
|
next = tick_next_period;
|
|
|
|
- } while (read_seqretry(&jiffies_lock, seq));
|
|
|
|
+ } while (read_seqcount_retry(&jiffies_seq, seq));
|
|
|
|
|
|
|
|
clockevents_switch_state(dev, CLOCK_EVT_STATE_ONESHOT);
|
|
|
|
|
2019-04-08 23:49:20 +00:00
|
|
|
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
|
|
|
|
index 5b33e2f5c0ed..54fd344ef973 100644
|
2018-08-27 14:32:32 +00:00
|
|
|
--- a/kernel/time/tick-sched.c
|
|
|
|
+++ b/kernel/time/tick-sched.c
|
2019-04-08 23:49:20 +00:00
|
|
|
@@ -67,7 +67,8 @@ static void tick_do_update_jiffies64(ktime_t now)
|
2018-08-27 14:32:32 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
/* Reevaluate with jiffies_lock held */
|
|
|
|
- write_seqlock(&jiffies_lock);
|
|
|
|
+ raw_spin_lock(&jiffies_lock);
|
|
|
|
+ write_seqcount_begin(&jiffies_seq);
|
|
|
|
|
|
|
|
delta = ktime_sub(now, last_jiffies_update);
|
|
|
|
if (delta >= tick_period) {
|
2019-04-08 23:49:20 +00:00
|
|
|
@@ -90,10 +91,12 @@ static void tick_do_update_jiffies64(ktime_t now)
|
2018-08-27 14:32:32 +00:00
|
|
|
/* Keep the tick_next_period variable up to date */
|
|
|
|
tick_next_period = ktime_add(last_jiffies_update, tick_period);
|
|
|
|
} else {
|
|
|
|
- write_sequnlock(&jiffies_lock);
|
|
|
|
+ write_seqcount_end(&jiffies_seq);
|
|
|
|
+ raw_spin_unlock(&jiffies_lock);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
- write_sequnlock(&jiffies_lock);
|
|
|
|
+ write_seqcount_end(&jiffies_seq);
|
|
|
|
+ raw_spin_unlock(&jiffies_lock);
|
|
|
|
update_wall_time();
|
|
|
|
}
|
|
|
|
|
2019-04-08 23:49:20 +00:00
|
|
|
@@ -104,12 +107,14 @@ static ktime_t tick_init_jiffy_update(void)
|
2018-08-27 14:32:32 +00:00
|
|
|
{
|
|
|
|
ktime_t period;
|
|
|
|
|
|
|
|
- write_seqlock(&jiffies_lock);
|
|
|
|
+ raw_spin_lock(&jiffies_lock);
|
|
|
|
+ write_seqcount_begin(&jiffies_seq);
|
|
|
|
/* Did we start the jiffies update yet ? */
|
|
|
|
if (last_jiffies_update == 0)
|
|
|
|
last_jiffies_update = tick_next_period;
|
|
|
|
period = last_jiffies_update;
|
|
|
|
- write_sequnlock(&jiffies_lock);
|
|
|
|
+ write_seqcount_end(&jiffies_seq);
|
|
|
|
+ raw_spin_unlock(&jiffies_lock);
|
|
|
|
return period;
|
|
|
|
}
|
|
|
|
|
2019-04-08 23:49:20 +00:00
|
|
|
@@ -652,10 +657,10 @@ static ktime_t tick_nohz_next_event(struct tick_sched *ts, int cpu)
|
2018-08-27 14:32:32 +00:00
|
|
|
|
|
|
|
/* Read jiffies and the time when jiffies were updated last */
|
|
|
|
do {
|
|
|
|
- seq = read_seqbegin(&jiffies_lock);
|
|
|
|
+ seq = read_seqcount_begin(&jiffies_seq);
|
|
|
|
basemono = last_jiffies_update;
|
|
|
|
basejiff = jiffies;
|
|
|
|
- } while (read_seqretry(&jiffies_lock, seq));
|
|
|
|
+ } while (read_seqcount_retry(&jiffies_seq, seq));
|
|
|
|
ts->last_jiffies = basejiff;
|
|
|
|
ts->timer_expires_base = basemono;
|
|
|
|
|
2019-04-08 23:49:20 +00:00
|
|
|
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
|
|
|
|
index 7846ce24ecc0..68cf97548cba 100644
|
2018-08-27 14:32:32 +00:00
|
|
|
--- a/kernel/time/timekeeping.c
|
|
|
|
+++ b/kernel/time/timekeeping.c
|
2019-02-27 18:51:46 +00:00
|
|
|
@@ -2417,8 +2417,10 @@ EXPORT_SYMBOL(hardpps);
|
2018-08-27 14:32:32 +00:00
|
|
|
*/
|
|
|
|
void xtime_update(unsigned long ticks)
|
|
|
|
{
|
|
|
|
- write_seqlock(&jiffies_lock);
|
|
|
|
+ raw_spin_lock(&jiffies_lock);
|
|
|
|
+ write_seqcount_begin(&jiffies_seq);
|
|
|
|
do_timer(ticks);
|
|
|
|
- write_sequnlock(&jiffies_lock);
|
|
|
|
+ write_seqcount_end(&jiffies_seq);
|
|
|
|
+ raw_spin_unlock(&jiffies_lock);
|
|
|
|
update_wall_time();
|
|
|
|
}
|
2019-04-08 23:49:20 +00:00
|
|
|
diff --git a/kernel/time/timekeeping.h b/kernel/time/timekeeping.h
|
|
|
|
index 7a9b4eb7a1d5..acdcf97c99b6 100644
|
2018-08-27 14:32:32 +00:00
|
|
|
--- a/kernel/time/timekeeping.h
|
|
|
|
+++ b/kernel/time/timekeeping.h
|
|
|
|
@@ -18,7 +18,8 @@ extern void timekeeping_resume(void);
|
|
|
|
extern void do_timer(unsigned long ticks);
|
|
|
|
extern void update_wall_time(void);
|
|
|
|
|
|
|
|
-extern seqlock_t jiffies_lock;
|
|
|
|
+extern raw_spinlock_t jiffies_lock;
|
|
|
|
+extern seqcount_t jiffies_seq;
|
|
|
|
|
|
|
|
#define CS_NAME_LEN 32
|
|
|
|
|
2019-04-08 23:49:20 +00:00
|
|
|
--
|
|
|
|
2.20.1
|
|
|
|
|