[tip:x86/timers] x86/tsc: Call check_system_tsc_reliable() before unsynchronized_tsc()

From	tip-bot for Zhenzhong Duan <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:x86/timers] x86/tsc: Call check_system_tsc_reliable() before unsynchronized_tsc()
Date	2017-06-22 16:10 +0200
Message-ID	<tVaY2-5Mw-21@gated-at.bofh.it> (permalink)
References	<tUJbr-3H5-1@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Commit-ID:  a1272dd5531b259bf7313ac7597a67362698038c
Gitweb:     http://git.kernel.org/tip/a1272dd5531b259bf7313ac7597a67362698038c
Author:     Zhenzhong Duan <zhenzhong.duan@oracle.com>
AuthorDate: Wed, 21 Jun 2017 01:23:37 -0700
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 22 Jun 2017 16:00:03 +0200

x86/tsc: Call check_system_tsc_reliable() before unsynchronized_tsc()

tsc_clocksource_reliable is initialized in check_system_tsc_reliable(), but
it is checked in unsynchronized_tsc() which is called before the
initialization.

In practice that's not an issue because systems which mark the TSC
reliable have X86_FEATURE_CONSTANT_TSC set as well, which is evaluated
in unsynchronized_tsc() before tsc_clocksource_reliable.

Reorder the calls so initialization happens before usage.

[ tglx: Massaged changelog ]

Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/b1532ef7-cd9f-45f7-9f49-48dd2a5c2495@default
---
 arch/x86/kernel/tsc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 714dfba..a316bdd 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -1412,11 +1412,11 @@ void __init tsc_init(void)
 
 	use_tsc_delay();
 
+	check_system_tsc_reliable();
+
 	if (unsynchronized_tsc())
 		mark_tsc_unstable("TSCs unsynchronized");
 
-	check_system_tsc_reliable();
-
 	detect_art();
 }

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH RESEND] Calling check_system_tsc_reliable() before  unsynchronized_tsc() Zhenzhong Duan <zhenzhong.duan@oracle.com> - 2017-06-21 10:30 +0200
  Re: [PATCH RESEND] Calling check_system_tsc_reliable() before  unsynchronized_tsc() Thomas Gleixner <tglx@linutronix.de> - 2017-06-22 16:00 +0200
    Re: [PATCH RESEND] Calling check_system_tsc_reliable() before  unsynchronized_tsc() Zhenzhong Duan <zhenzhong.duan@oracle.com> - 2017-06-23 10:40 +0200
  [tip:x86/timers] x86/tsc: Call check_system_tsc_reliable() before  unsynchronized_tsc() tip-bot for Zhenzhong Duan <tipbot@zytor.com> - 2017-06-22 16:10 +0200

csiph-web