Skip to contentSkip to conversation

x86: Reenable TSC sync check at boot, even with NONSTOP_TSC

PATCH In review Jeremy Fitzhardinge 2 participants 2 messages Dec 18, 2009 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: Reenable TSC sync check at boot, even with NONSTOP_TSC

FYI.

J

Commit 83ce4009 did the following change
If the TSC is constant and non-stop, also set it reliable.

But, there seems to be few systems that will end up with TSC warp across sockets, depending on how the cpus come out of reset. Skipping TSC sync test on such systems may result in time inconsistency later.

So, reenable TSC sync test even on constant and non-stop TSC systems. Set, sched_clock_stable to 1 by default and reset it in mark_tsc_unstable, if TSC sync fails.

This change still gives perf benefit mentioned in 83ce4009 for systems where TSC is reliable.

---
 arch/x86/kernel/cpu/intel.c |    1 -
 arch/x86/kernel/tsc.c       |    1 +
 2 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/intel.c +0 -1
index 9c31e8b..879666f 100644
@@ -70,7 +70,6 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
 	if (c->x86_power & (1 << 8)) {
 		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);
 		set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC);
-		set_cpu_cap(c, X86_FEATURE_TSC_RELIABLE);
 		sched_clock_stable = 1;
 	}
 
arch/x86/kernel/tsc.c +1 -0
index cd982f4..597683a 100644
@@ -763,6 +763,7 @@ void mark_tsc_unstable(char *reason)
 {
 	if (!tsc_unstable) {
 		tsc_unstable = 1;
+		sched_clock_stable = 0;
 		printk(KERN_INFO "Marking TSC unstable due to %s\n", reason);
 		/* Change only the rating, when not registered */
 		if (clocksource_tsc.mult)
Signature · 7 lines
1.6.0.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#1 lore raw

Interesting! The code to check for this condition is already in Xen (tsc_check_reliability() and host_tsc_is_safe()) but it looks like some of the conditions will need to be changed a bit.

I'll spin a patch tomorrow.

Quoted 13 lines

-----Original Message-----
From: Jeremy Fitzhardinge [mailto:[email protected]]
Sent: Thursday, December 17, 2009 9:16 PM
To: Keir Fraser
Cc: Dan Magenheimer; Xen-devel
Subject: Fwd: [PATCH] x86: Reenable TSC sync check at boot, even with NONSTOP_TSC

FYI.

J