Log reason why TSC was marked unstable
PATCH 1/1 Log reason why TSC was marked unstable
This patch changes mark_tsc_unstable() so it takes a string argument, which holds the reason the TSC was marked unstable.
This is then displayed the first time mark_tsc_unstable is called.
This should help us better debug why the TSC was marked unstable on certain systems and allow us to make sure we're not being overly paranoid when throwing out this troublesome clocksource.
thanks
-john
arch/i386/kernel/tsc.c | 5 +++-- arch/x86_64/kernel/time.c | 2 +- arch/x86_64/kernel/tsc.c | 5 +++-- arch/x86_64/kernel/tsc_sync.c | 2 +- drivers/acpi/processor_idle.c | 4 ++-- include/asm-i386/mach-summit/mach_mpparse.h | 4 ++-- include/asm-x86_64/timex.h | 2 +- include/asm-x86_64/tsc.h | 2 +- 8 files changed, 14 insertions(+), 12 deletions(-)
linux-2.6.21-rc1_mark-unstable-reason_C7.patch
============================================
arch/i386/kernel/tsc.c +3 -2
@@ -262,7 +262,7 @@ time_cpufreq_notifier(struct notifier_bl* TSC based sched_clock turns * to junk w/ cpufreq */ -mark_tsc_unstable (); +mark_tsc_unstable ("cpufreq changes" ); } } }
@@ -310,10 +310,11 @@ static struct clocksource clocksource_ts CLOCK_SOURCE_MUST_VERIFY, }; -void mark_tsc_unstable (void ) +void mark_tsc_unstable (char *reason) {if (!tsc_unstable) { tsc_unstable =1 ; +printk ("Marking TSC unstable due to: %s.\n" , reason);/* Can be called before registration */ if (clocksource_tsc.mult)clocksource_change_rating (&clocksource_tsc,0 );
arch/x86_64/kernel/time.c +1 -1
@@ -348,7 +348,7 @@ void __init time_init(void) }if (unsynchronized_tsc ()) -mark_tsc_unstable (); +mark_tsc_unstable ("TSCs unsynchronized" );if (cpu_has (&boot_cpu_data,X86_FEATURE_RDTSCP )) vgetcpu_mode =VGETCPU_RDTSCP ;
arch/x86_64/kernel/tsc.c +3 -2
@@ -109,7 +109,7 @@ #endif cpu_khz =cpufreq_scale (cpu_khz_ref, ref_freq, freq->new);if (!(freq->flags &CPUFREQ_CONST_LOOPS )) -mark_tsc_unstable (); +mark_tsc_unstable ("cpufreq changes" ); }set_cyc2ns_scale (cpu_khz_ref);
@@ -197,10 +197,11 @@ static struct clocksource clocksource_ts .vread = vread_tsc, }; -void mark_tsc_unstable (void ) +void mark_tsc_unstable (char *reason) {if (!tsc_unstable) { tsc_unstable =1 ; +printk ("Marking TSC unstable due to %s\n" , reason);/* Change only the rating, when not registered */ if (clocksource_tsc.mult)clocksource_change_rating (&clocksource_tsc,0 );
arch/x86_64/kernel/tsc_sync.c +1 -1
@@ -138,7 +138,7 @@ void __cpuinit check_tsc_sync_source(intprintk ("\n" );printk (KERN_WARNING "Measured %Ld cycles TSC warp between CPUs," " turning off TSC clock.\n" , max_warp); -mark_tsc_unstable (); +mark_tsc_unstable ("check_tsc_sync_source failed" ); nr_warps =0 ; max_warp =0 ; last_tsc =0 ;
drivers/acpi/processor_idle.c +2 -2
@@ -482,7 +482,7 @@ #endif#ifdef CONFIG_GENERIC_TIME /* TSC halts in C2, so notify users */ -mark_tsc_unstable (); +mark_tsc_unstable ("possible TSC halt in C2" );#endif /* Re-enable interrupts */ local_irq_enable ();
@@ -524,7 +524,7 @@ #endif#ifdef CONFIG_GENERIC_TIME /* TSC halts in C3, so notify users */ -mark_tsc_unstable (); +mark_tsc_unstable ("TSC halts in C3" );#endif /* Re-enable interrupts */ local_irq_enable ();
include/asm-i386/mach-summit/mach_mpparse.h +2 -2
@@ -30,7 +30,7 @@ static inline int mps_oem_check(struct m (!strncmp(productid, "VIGIL SMP", 9) || !strncmp(productid, "EXA", 3) || !strncmp(productid, "RUTHLESS SMP", 12))){ -mark_tsc_unstable (); +mark_tsc_unstable ("Summit based system" ); use_cyclone =1 ;/*enable cyclone-timer*/ setup_summit ();return 1 ;
@@ -44,7 +44,7 @@ static inline int acpi_madt_oem_check(chif (!strncmp (oem_id,"IBM" ,3 ) && (!strncmp (oem_table_id,"SERVIGIL" ,8 ) || !strncmp (oem_table_id,"EXA" ,3 ))){ -mark_tsc_unstable (); +mark_tsc_unstable ("Summit based system" ); use_cyclone =1 ;/*enable cyclone-timer*/ setup_summit ();return 1 ;
include/asm-x86_64/timex.h +1 -1
@@ -27,6 +27,6 @@ #define FSEC_PER_TICK (FSEC_PER_SEC / HZ#define NS_SCALE 10/* 2^10, carefully chosen */ #define US_SCALE 32/* 2^32, arbitralrily chosen */ -extern void mark_tsc_unstable (void ); +extern void mark_tsc_unstable (char *);extern void set_cyc2ns_scale (unsigned long khz);#endif
include/asm-x86_64/tsc.h +1 -1
@@ -53,7 +53,7 @@ #endif }extern void tsc_init (void ); -extern void mark_tsc_unstable (void ); +extern void mark_tsc_unstable (char *);extern int unsynchronized_tsc (void );/*