Skip to contentSkip to conversation

Fix PIT override bug for paravirt

PATCH In review Zachary Amsden 2 participants 3 messages Feb 6, 2007 – Feb 7, 2007 PARAVIRT_OPS interface

lore
Share & tools
lore
#0 lore raw

PATCH 5/11 Fix PIT override bug for paravirt

The time initialization changed for i386 when some code moved into time_init. This made it no longer possible to override the PIT / HPET, which broke paravirt guests.

Subject: Fix PIT override bug for paravirt

arch/i386/kernel/paravirt.c +1 -1
diff -r acd12d5196c7 arch/i386/kernel/paravirt.c
@@ -497,7 +497,7 @@ struct paravirt_ops paravirt_ops = {
 	.memory_setup = machine_specific_memory_setup,
 	.get_wallclock = native_get_wallclock,
 	.set_wallclock = native_set_wallclock,
-	.time_init = time_init_hook,
+	.time_init = native_time_init,
 	.init_IRQ = native_init_IRQ,
 
 	.cpuid = native_cpuid,
arch/i386/kernel/time.c +12 -5
diff -r acd12d5196c7 arch/i386/kernel/time.c
@@ -268,10 +268,17 @@ static void __init hpet_time_init(void)
 {
 	if (!hpet_enable())
 		setup_pit_timer();
-	do_time_init();
-}
-
+	time_init_hook();
+}
+
+void __init native_time_init(void)
+{
+	late_time_init = hpet_time_init;
+}
+
+#ifndef CONFIG_PARAVIRT
 void __init time_init(void)
 {
-	late_time_init = hpet_time_init;
-}
+	native_time_init();
+}
+#endif
include/asm-i386/paravirt.h +1 -1
diff -r acd12d5196c7 include/asm-i386/paravirt.h
@@ -185,7 +185,7 @@ static inline int set_wallclock(unsigned
 	return paravirt_ops.set_wallclock(nowtime);
 }
 
-static inline void do_time_init(void)
+static inline void time_init(void)
 {
 	return paravirt_ops.time_init();
 }
include/asm-i386/time.h +2 -1
diff -r acd12d5196c7 include/asm-i386/time.h
@@ -28,13 +28,14 @@ static inline int native_set_wallclock(u
 	return retval;
 }
 
+extern void native_time_init(void);
+
 #ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
 #else /* !CONFIG_PARAVIRT */
 
 #define get_wallclock() native_get_wallclock()
 #define set_wallclock(x) native_set_wallclock(x)
-#define do_time_init() time_init_hook()
 
 #endif /* CONFIG_PARAVIRT */
 
#1 lore raw
Quoted 3 lines · Zachary Amsden

The time initialization changed for i386 when some code moved into time_init. This made it no longer possible to override the PIT / HPET, which broke paravirt guests.

Looks still fragile. Can this be done cleaner?

In particularly some comments would be good, but clearer code logic would be preferred.

-Andi

#2 lore raw
Quoted 7 lines · Andi Kleen
Quoted 4 lines · Zachary Amsden

The time initialization changed for i386 when some code moved into time_init. This made it no longer possible to override the PIT / HPET, which broke paravirt guests.

Quoted 6 lines

Looks still fragile. Can this be done cleaner?

In particularly some comments would be good, but clearer code logic would be preferred.

-Andi

Well, the logic is still overly complicated, but I axed the ifdef and commented it. It is difficult to work around the number of different compile and boot sequences here.

arch/i386/kernel/paravirt.c +1 -1
diff -r 31c3528be5d2 arch/i386/kernel/paravirt.c
@@ -497,7 +497,7 @@ struct paravirt_ops paravirt_ops = {
 	.memory_setup = machine_specific_memory_setup,
 	.get_wallclock = native_get_wallclock,
 	.set_wallclock = native_set_wallclock,
-	.time_init = time_init_hook,
+	.time_init = native_time_init,
 	.init_IRQ = native_init_IRQ,
 
 	.cpuid = native_cpuid,
arch/i386/kernel/time.c +19 -5
diff -r 31c3528be5d2 arch/i386/kernel/time.c
@@ -266,10 +266,24 @@ static void __init hpet_time_init(void)
 {
 	if (!hpet_enable())
 		setup_pit_timer();
+	time_init_hook();
+}
+
+void __init native_time_init(void)
+{
+	late_time_init = hpet_time_init;
+}
+
+/*
+ * This is called directly from init code; we must delay timer setup in the
+ * HPET case as we can't make the decision to turn on HPET this early in the
+ * boot process.  So we call do_time_init(), which either calls
+ * native_time_init above or a paravirt-op which implements an alternative
+ * timer.  This may seem like overkill, but is necessary for the rather large
+ * number of timer combinations.  But remember, this is all dealing with time,
+ * and with time, too much is never enough.
+ */
+void __init time_init(void)
+{
 	do_time_init();
 }
-
-void __init time_init(void)
-{
-	late_time_init = hpet_time_init;
-}
include/asm-i386/time.h +3 -1
diff -r 31c3528be5d2 include/asm-i386/time.h
@@ -28,13 +28,15 @@ static inline int native_set_wallclock(u
 	return retval;
 }
 
+extern void native_time_init(void);
+
 #ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
 #else /* !CONFIG_PARAVIRT */
 
 #define get_wallclock() native_get_wallclock()
 #define set_wallclock(x) native_set_wallclock(x)
-#define do_time_init() time_init_hook()
+#define do_time_init() native_time_init()
 
 #endif /* CONFIG_PARAVIRT */