Skip to contentSkip to conversation

lguest: fix crash lguest_time_init

PATCH New Rusty Russell 1 participant 2 messages Dec 9, 2010 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 lguest: fix crash lguest_time_init

fe25c7fc2e "x86: lguest: Convert to new irq chip functions" converted enable_lguest_irq() to take a struct irq_data *, but didn't fix the one internal caller.

To: [email protected]

---
 arch/x86/lguest/boot.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/lguest/boot.c +1 -1
@@ -1002,7 +1002,7 @@ static void lguest_time_init(void)
 	clockevents_register_device(&lguest_clockevent);
 
 	/* Finally, we unblock the timer interrupt. */
-	enable_lguest_irq(0);
+	clear_bit(0, lguest_data.blocked_interrupts);
 }
 
 /*
#1 lore raw

PATCH 2/2 lguest: restore boot speed

lguest is dumb and drops *all* the pagetables for set_pte (which is only used for kernel mapping manipulation, so it's OK without highmem).

But it's used a lot in boot, too. As a guest optimization, we suppressed this flushing until the first page switch. Now we have initial_page_table, that happens much earlier, so extend the heuristic to wait until we switch to something other than the swapper_pg_dir or initial_page_table.

As measured on my laptop under kvm, this dropped the time-to-mount-root from 48 seconds to 4.3 seconds.

---
 arch/x86/lguest/boot.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
arch/x86/lguest/boot.c +7 -4
@@ -531,7 +531,10 @@ static void lguest_write_cr3(unsigned lo
 {
 	lguest_data.pgdir = cr3;
 	lazy_hcall1(LHCALL_NEW_PGTABLE, cr3);
-	cr3_changed = true;
+
+	/* These two page tables are simple, linear, and used during boot */
+	if (cr3 != __pa(swapper_pg_dir) && cr3 != __pa(initial_page_table))
+		cr3_changed = true;
 }
 
 static unsigned long lguest_read_cr3(void)
@@ -703,9 +706,9 @@ static void lguest_set_pmd(pmd_t *pmdp, 
  * to forget all of them.  Fortunately, this is very rare.
  *
  * ... except in early boot when the kernel sets up the initial pagetables,
- * which makes booting astonishingly slow: 1.83 seconds!  So we don't even tell
- * the Host anything changed until we've done the first page table switch,
- * which brings boot back to 0.25 seconds.
+ * which makes booting astonishingly slow: 48 seconds!  So we don't even tell
+ * the Host anything changed until we've done the first real page table switch,
+ * which brings boot back to 4.3 seconds.
  */
 static void lguest_set_pte(pte_t *ptep, pte_t pteval)
 {