Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e40672d authored by Thomas Gleixner's avatar Thomas Gleixner Committed by John Stultz
Browse files

timekeeping: Move lock out of timekeeper struct 



Make the lock a separate entity. Preparatory patch for shadow
timekeeper structure.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
[Merged with CLOCK_TAI changes]
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent eb93e4d9

include/linux/timekeeper_internal.h

+0 −2
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ struct timekeeper { 
	/* Offset clock monotonic -> clock tai */

	ktime_t			offs_tai;



	/* Seqlock for all timekeeper values */

	seqlock_t		lock;

};



static inline struct timespec tk_xtime(struct timekeeper *tk)

kernel/time/timekeeping.c

+53 −55
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "tick-internal.h"



static struct timekeeper timekeeper;

static DEFINE_SEQLOCK(timekeeper_lock);



/* flag for if timekeeping is suspended */

int __read_mostly timekeeping_suspended;
@@ -212,11 +213,11 @@ int pvclock_gtod_register_notifier(struct notifier_block *nb) 
	unsigned long flags;

	int ret;



	write_seqlock_irqsave(&tk->lock, flags);

	write_seqlock_irqsave(&timekeeper_lock, flags);

	ret = raw_notifier_chain_register(&pvclock_gtod_chain, nb);

	/* update timekeeping data */

	update_pvclock_gtod(tk);

	write_sequnlock_irqrestore(&tk->lock, flags);

	write_sequnlock_irqrestore(&timekeeper_lock, flags);



	return ret;

}
@@ -230,13 +231,12 @@ EXPORT_SYMBOL_GPL(pvclock_gtod_register_notifier); 
 */

int pvclock_gtod_unregister_notifier(struct notifier_block *nb)

{

	struct timekeeper *tk = &timekeeper;

	unsigned long flags;

	int ret;



	write_seqlock_irqsave(&tk->lock, flags);

	write_seqlock_irqsave(&timekeeper_lock, flags);

	ret = raw_notifier_chain_unregister(&pvclock_gtod_chain, nb);

	write_sequnlock_irqrestore(&tk->lock, flags);

	write_sequnlock_irqrestore(&timekeeper_lock, flags);



	return ret;

}
@@ -296,12 +296,12 @@ int __getnstimeofday(struct timespec *ts) 
	s64 nsecs = 0;



	do {

		seq = read_seqbegin(&tk->lock);

		seq = read_seqbegin(&timekeeper_lock);



		ts->tv_sec = tk->xtime_sec;

		nsecs = timekeeping_get_ns(tk);



	} while (read_seqretry(&tk->lock, seq));

	} while (read_seqretry(&timekeeper_lock, seq));



	ts->tv_nsec = 0;

	timespec_add_ns(ts, nsecs);
@@ -337,11 +337,11 @@ ktime_t ktime_get(void) 
	WARN_ON(timekeeping_suspended);



	do {

		seq = read_seqbegin(&tk->lock);

		seq = read_seqbegin(&timekeeper_lock);

		secs = tk->xtime_sec + tk->wall_to_monotonic.tv_sec;

		nsecs = timekeeping_get_ns(tk) + tk->wall_to_monotonic.tv_nsec;



	} while (read_seqretry(&tk->lock, seq));

	} while (read_seqretry(&timekeeper_lock, seq));

	/*

	 * Use ktime_set/ktime_add_ns to create a proper ktime on

	 * 32-bit architectures without CONFIG_KTIME_SCALAR.
@@ -368,12 +368,12 @@ void ktime_get_ts(struct timespec *ts) 
	WARN_ON(timekeeping_suspended);



	do {

		seq = read_seqbegin(&tk->lock);

		seq = read_seqbegin(&timekeeper_lock);

		ts->tv_sec = tk->xtime_sec;

		nsec = timekeeping_get_ns(tk);

		tomono = tk->wall_to_monotonic;



	} while (read_seqretry(&tk->lock, seq));

	} while (read_seqretry(&timekeeper_lock, seq));



	ts->tv_sec += tomono.tv_sec;

	ts->tv_nsec = 0;
@@ -397,12 +397,12 @@ void timekeeping_clocktai(struct timespec *ts) 
	WARN_ON(timekeeping_suspended);



	do {

		seq = read_seqbegin(&tk->lock);

		seq = read_seqbegin(&timekeeper_lock);



		ts->tv_sec = tk->xtime_sec + tk->tai_offset;

		nsecs = timekeeping_get_ns(tk);



	} while (read_seqretry(&tk->lock, seq));

	} while (read_seqretry(&timekeeper_lock, seq));



	ts->tv_nsec = 0;

	timespec_add_ns(ts, nsecs);
@@ -445,7 +445,7 @@ void getnstime_raw_and_real(struct timespec *ts_raw, struct timespec *ts_real) 
	WARN_ON_ONCE(timekeeping_suspended);



	do {

		seq = read_seqbegin(&tk->lock);

		seq = read_seqbegin(&timekeeper_lock);



		*ts_raw = tk->raw_time;

		ts_real->tv_sec = tk->xtime_sec;
@@ -454,7 +454,7 @@ void getnstime_raw_and_real(struct timespec *ts_raw, struct timespec *ts_real) 
		nsecs_raw = timekeeping_get_ns_raw(tk);

		nsecs_real = timekeeping_get_ns(tk);



	} while (read_seqretry(&tk->lock, seq));

	} while (read_seqretry(&timekeeper_lock, seq));



	timespec_add_ns(ts_raw, nsecs_raw);

	timespec_add_ns(ts_real, nsecs_real);
@@ -494,7 +494,7 @@ int do_settimeofday(const struct timespec *tv) 
	if (!timespec_valid_strict(tv))

		return -EINVAL;



	write_seqlock_irqsave(&tk->lock, flags);

	write_seqlock_irqsave(&timekeeper_lock, flags);



	timekeeping_forward_now(tk);
@@ -508,7 +508,7 @@ int do_settimeofday(const struct timespec *tv) 


	timekeeping_update(tk, true);



	write_sequnlock_irqrestore(&tk->lock, flags);

	write_sequnlock_irqrestore(&timekeeper_lock, flags);



	/* signal hrtimers about time change */

	clock_was_set();
@@ -533,7 +533,7 @@ int timekeeping_inject_offset(struct timespec *ts) 
	if ((unsigned long)ts->tv_nsec >= NSEC_PER_SEC)

		return -EINVAL;



	write_seqlock_irqsave(&tk->lock, flags);

	write_seqlock_irqsave(&timekeeper_lock, flags);



	timekeeping_forward_now(tk);
@@ -550,7 +550,7 @@ int timekeeping_inject_offset(struct timespec *ts) 
error: /* even if we error out, we forwarded the time, so call update */

	timekeeping_update(tk, true);



	write_sequnlock_irqrestore(&tk->lock, flags);

	write_sequnlock_irqrestore(&timekeeper_lock, flags);



	/* signal hrtimers about time change */

	clock_was_set();
@@ -571,9 +571,9 @@ s32 timekeeping_get_tai_offset(void) 
	s32 ret;



	do {

		seq = read_seqbegin(&tk->lock);

		seq = read_seqbegin(&timekeeper_lock);

		ret = tk->tai_offset;

	} while (read_seqretry(&tk->lock, seq));

	} while (read_seqretry(&timekeeper_lock, seq));



	return ret;

}
@@ -597,9 +597,9 @@ void timekeeping_set_tai_offset(s32 tai_offset) 
	struct timekeeper *tk = &timekeeper;

	unsigned long flags;



	write_seqlock_irqsave(&tk->lock, flags);

	write_seqlock_irqsave(&timekeeper_lock, flags);

	__timekeeping_set_tai_offset(tk, tai_offset);

	write_sequnlock_irqrestore(&tk->lock, flags);

	write_sequnlock_irqrestore(&timekeeper_lock, flags);

}



/**
@@ -615,7 +615,7 @@ static int change_clocksource(void *data) 


	new = (struct clocksource *) data;



	write_seqlock_irqsave(&tk->lock, flags);

	write_seqlock_irqsave(&timekeeper_lock, flags);



	timekeeping_forward_now(tk);

	if (!new->enable || new->enable(new) == 0) {
@@ -626,7 +626,7 @@ static int change_clocksource(void *data) 
	}

	timekeeping_update(tk, true);



	write_sequnlock_irqrestore(&tk->lock, flags);

	write_sequnlock_irqrestore(&timekeeper_lock, flags);



	return 0;

}
@@ -676,11 +676,11 @@ void getrawmonotonic(struct timespec *ts) 
	s64 nsecs;



	do {

		seq = read_seqbegin(&tk->lock);

		seq = read_seqbegin(&timekeeper_lock);

		nsecs = timekeeping_get_ns_raw(tk);

		*ts = tk->raw_time;



	} while (read_seqretry(&tk->lock, seq));

	} while (read_seqretry(&timekeeper_lock, seq));



	timespec_add_ns(ts, nsecs);

}
@@ -696,11 +696,11 @@ int timekeeping_valid_for_hres(void) 
	int ret;



	do {

		seq = read_seqbegin(&tk->lock);

		seq = read_seqbegin(&timekeeper_lock);



		ret = tk->clock->flags & CLOCK_SOURCE_VALID_FOR_HRES;



	} while (read_seqretry(&tk->lock, seq));

	} while (read_seqretry(&timekeeper_lock, seq));



	return ret;

}
@@ -715,11 +715,11 @@ u64 timekeeping_max_deferment(void) 
	u64 ret;



	do {

		seq = read_seqbegin(&tk->lock);

		seq = read_seqbegin(&timekeeper_lock);



		ret = tk->clock->max_idle_ns;



	} while (read_seqretry(&tk->lock, seq));

	} while (read_seqretry(&timekeeper_lock, seq));



	return ret;

}
@@ -782,11 +782,9 @@ void __init timekeeping_init(void) 
		boot.tv_nsec = 0;

	}



	seqlock_init(&tk->lock);



	ntp_init();



	write_seqlock_irqsave(&tk->lock, flags);

	write_seqlock_irqsave(&timekeeper_lock, flags);

	clock = clocksource_default_clock();

	if (clock->enable)

		clock->enable(clock);
@@ -805,7 +803,7 @@ void __init timekeeping_init(void) 
	tmp.tv_nsec = 0;

	tk_set_sleep_time(tk, tmp);



	write_sequnlock_irqrestore(&tk->lock, flags);

	write_sequnlock_irqrestore(&timekeeper_lock, flags);

}



/* time in seconds when suspend began */
@@ -853,7 +851,7 @@ void timekeeping_inject_sleeptime(struct timespec *delta) 
	if (has_persistent_clock())

		return;



	write_seqlock_irqsave(&tk->lock, flags);

	write_seqlock_irqsave(&timekeeper_lock, flags);



	timekeeping_forward_now(tk);
@@ -861,7 +859,7 @@ void timekeeping_inject_sleeptime(struct timespec *delta) 


	timekeeping_update(tk, true);



	write_sequnlock_irqrestore(&tk->lock, flags);

	write_sequnlock_irqrestore(&timekeeper_lock, flags);



	/* signal hrtimers about time change */

	clock_was_set();
@@ -888,7 +886,7 @@ static void timekeeping_resume(void) 
	clockevents_resume();

	clocksource_resume();



	write_seqlock_irqsave(&tk->lock, flags);

	write_seqlock_irqsave(&timekeeper_lock, flags);



	/*

	 * After system resumes, we need to calculate the suspended time and
@@ -940,7 +938,7 @@ static void timekeeping_resume(void) 
	tk->ntp_error = 0;

	timekeeping_suspended = 0;

	timekeeping_update(tk, false);

	write_sequnlock_irqrestore(&tk->lock, flags);

	write_sequnlock_irqrestore(&timekeeper_lock, flags);



	touch_softlockup_watchdog();
@@ -959,7 +957,7 @@ static int timekeeping_suspend(void) 


	read_persistent_clock(&timekeeping_suspend_time);



	write_seqlock_irqsave(&tk->lock, flags);

	write_seqlock_irqsave(&timekeeper_lock, flags);

	timekeeping_forward_now(tk);

	timekeeping_suspended = 1;
@@ -982,7 +980,7 @@ static int timekeeping_suspend(void) 
		timekeeping_suspend_time =

			timespec_add(timekeeping_suspend_time, delta_delta);

	}

	write_sequnlock_irqrestore(&tk->lock, flags);

	write_sequnlock_irqrestore(&timekeeper_lock, flags);



	clockevents_notify(CLOCK_EVT_NOTIFY_SUSPEND, NULL);

	clocksource_suspend();
@@ -1322,7 +1320,7 @@ static void update_wall_time(void) 
	int shift = 0, maxshift;

	unsigned long flags;



	write_seqlock_irqsave(&tk->lock, flags);

	write_seqlock_irqsave(&timekeeper_lock, flags);



	/* Make sure we're fully resumed: */

	if (unlikely(timekeeping_suspended))
@@ -1377,7 +1375,7 @@ static void update_wall_time(void) 
	timekeeping_update(tk, false);



out:

	write_sequnlock_irqrestore(&tk->lock, flags);

	write_sequnlock_irqrestore(&timekeeper_lock, flags);



}
@@ -1425,13 +1423,13 @@ void get_monotonic_boottime(struct timespec *ts) 
	WARN_ON(timekeeping_suspended);



	do {

		seq = read_seqbegin(&tk->lock);

		seq = read_seqbegin(&timekeeper_lock);

		ts->tv_sec = tk->xtime_sec;

		nsec = timekeeping_get_ns(tk);

		tomono = tk->wall_to_monotonic;

		sleep = tk->total_sleep_time;



	} while (read_seqretry(&tk->lock, seq));

	} while (read_seqretry(&timekeeper_lock, seq));



	ts->tv_sec += tomono.tv_sec + sleep.tv_sec;

	ts->tv_nsec = 0;
@@ -1490,10 +1488,10 @@ struct timespec current_kernel_time(void) 
	unsigned long seq;



	do {

		seq = read_seqbegin(&tk->lock);

		seq = read_seqbegin(&timekeeper_lock);



		now = tk_xtime(tk);

	} while (read_seqretry(&tk->lock, seq));

	} while (read_seqretry(&timekeeper_lock, seq));



	return now;

}
@@ -1506,11 +1504,11 @@ struct timespec get_monotonic_coarse(void) 
	unsigned long seq;



	do {

		seq = read_seqbegin(&tk->lock);

		seq = read_seqbegin(&timekeeper_lock);



		now = tk_xtime(tk);

		mono = tk->wall_to_monotonic;

	} while (read_seqretry(&tk->lock, seq));

	} while (read_seqretry(&timekeeper_lock, seq));



	set_normalized_timespec(&now, now.tv_sec + mono.tv_sec,

				now.tv_nsec + mono.tv_nsec);
@@ -1541,11 +1539,11 @@ void get_xtime_and_monotonic_and_sleep_offset(struct timespec *xtim, 
	unsigned long seq;



	do {

		seq = read_seqbegin(&tk->lock);

		seq = read_seqbegin(&timekeeper_lock);

		*xtim = tk_xtime(tk);

		*wtom = tk->wall_to_monotonic;

		*sleep = tk->total_sleep_time;

	} while (read_seqretry(&tk->lock, seq));

	} while (read_seqretry(&timekeeper_lock, seq));

}



#ifdef CONFIG_HIGH_RES_TIMERS
@@ -1566,7 +1564,7 @@ ktime_t ktime_get_update_offsets(ktime_t *offs_real, ktime_t *offs_boot, 
	u64 secs, nsecs;



	do {

		seq = read_seqbegin(&tk->lock);

		seq = read_seqbegin(&timekeeper_lock);



		secs = tk->xtime_sec;

		nsecs = timekeeping_get_ns(tk);
@@ -1574,7 +1572,7 @@ ktime_t ktime_get_update_offsets(ktime_t *offs_real, ktime_t *offs_boot, 
		*offs_real = tk->offs_real;

		*offs_boot = tk->offs_boot;

		*offs_tai = tk->offs_tai;

	} while (read_seqretry(&tk->lock, seq));

	} while (read_seqretry(&timekeeper_lock, seq));



	now = ktime_add_ns(ktime_set(secs, 0), nsecs);

	now = ktime_sub(now, *offs_real);
@@ -1592,9 +1590,9 @@ ktime_t ktime_get_monotonic_offset(void) 
	struct timespec wtom;



	do {

		seq = read_seqbegin(&tk->lock);

		seq = read_seqbegin(&timekeeper_lock);

		wtom = tk->wall_to_monotonic;

	} while (read_seqretry(&tk->lock, seq));

	} while (read_seqretry(&timekeeper_lock, seq));



	return timespec_to_ktime(wtom);

}