[PATCH] hrtimer: fix up unlocked access to wall_to_monotonic (ad28d94a) · Commits · 戴 / test

commit (HZ free NTP) moved the access to wall_to_monotonic in hrtimer_get_softirq_time() out of the xtime_lock protection. Move it back into the seq_lock section. Signed-off-by:

Thomas Gleixner <tglx@linutronix.de> Acked-by:

John Stultz <johnstul@us.ibm.com> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

kernel/hrtimer.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -135,7 +135,7 @@ EXPORT_SYMBOL_GPL(ktime_get_ts);
		static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base)
		{
		ktime_t xtim, tomono;
		struct timespec xts;
		struct timespec xts, tom;
		unsigned long seq;

		do {
		@@ -145,10 +145,11 @@ static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base)
		#else
		xts = xtime;
		#endif
		tom = wall_to_monotonic;
		} while (read_seqretry(&xtime_lock, seq));

		xtim = timespec_to_ktime(xts);
		tomono = timespec_to_ktime(wall_to_monotonic);
		tomono = timespec_to_ktime(tom);
		base->clock_base[CLOCK_REALTIME].softirq_time = xtim;
		base->clock_base[CLOCK_MONOTONIC].softirq_time =
		ktime_add(xtim, tomono);

Admin message