lguest simplification: don't pin guest trap handlers
PATCH 1/1 lguest simplification: don't pin guest trap handlers
We don't actually need the Guest handlers mapped to avoid double fault, just the stack pages. Thanks to Zach for confirming.
Signed-off-by Rusty Russell <[email protected]>
--- drivers/lguest/interrupts_and_traps.c | 26 +------------------------- drivers/lguest/lg.h | 2 +- drivers/lguest/page_tables.c | 6 +++--- 3 files changed, 5 insertions(+), 29 deletions(-)
===================================================================
drivers/lguest/interrupts_and_traps.c +1 -25
@@ -138,31 +138,12 @@ static int direct_trap(const struct lguereturn idt_type (trap->a, trap->b) ==0xF ; } -static void pin_stack_pages (struct lguest *lg) +void pin_stack_pages (struct lguest *lg) {unsigned int i;for (i =0 ; i < lg->stack_pages; i++)pin_page (lg, lg->esp1 - i *PAGE_SIZE ); -} - -/* We need to ensure all the direct trap pages are mapped after we -* clear shadow mappings. */ -void pin_trap_pages (struct lguest *lg) -{ -unsigned int i; -struct desc_struct *trap; - -for (i =0 ; i <FIRST_EXTERNAL_VECTOR ; i++) { - trap = &lg->idt[i]; -if (direct_trap (lg, trap, i)) -pin_page (lg,idt_address (trap->a, trap->b)); - } - - trap = &lg->syscall_idt; -if (direct_trap (lg, trap,SYSCALL_VECTOR )) -pin_page (lg,idt_address (trap->a, trap->b)); -pin_stack_pages (lg); }void guest_set_stack (struct lguest *lg,u32 seg,u32 esp,unsigned int pages)
@@ -194,11 +175,6 @@ static void set_trap(struct lguest *lg, trap->a = ((__KERNEL_CS|GUEST_PL )<<16 ) | (lo&0x0000FFFF ); trap->b = (hi&0xFFFFEF00 ); - -/* Make sure trap address is available so we don't fault. In -* theory, it could overlap two pages, in practice it's aligned. */ -if (direct_trap (lg, trap, num)) -pin_page (lg,idt_address (lo, hi)); }void load_guest_idt_entry (struct lguest *lg,unsigned int num,u32 lo,u32 hi)
===================================================================
drivers/lguest/lg.h +1 -1
@@ -190,7 +190,7 @@ int deliver_trap(struct lguest *lg, unsiint deliver_trap (struct lguest *lg,unsigned int num);void load_guest_idt_entry (struct lguest *lg,unsigned int i,u32 low,u32 hi);void guest_set_stack (struct lguest *lg,u32 seg,u32 esp,unsigned int pages); -void pin_trap_pages (struct lguest *lg); +void pin_stack_pages (struct lguest *lg);void setup_default_idt_entries (struct lguest_ro_state *state,const unsigned long *def); void copy_traps(const struct lguest *lg, struct desc_struct *idt,
===================================================================
drivers/lguest/page_tables.c +3 -3
@@ -186,7 +186,7 @@ void pin_page(struct lguest *lg, unsignevoid pin_page (struct lguest *lg,unsigned long vaddr) {if (!page_writable (lg, vaddr) && !demand_page (lg, vaddr,0 )) -kill_guest (lg,"bad trap page %#lx" , vaddr); +kill_guest (lg,"bad stack page %#lx" , vaddr); }static void release_pgd (struct lguest *lg,spgd_t *spgd)
@@ -253,7 +253,7 @@ void guest_new_pagetable(struct lguest * newpgdir =new_pgdir (lg, pgtable, &repin); lg->pgdidx = newpgdir;if (repin) -pin_trap_pages (lg); +pin_stack_pages (lg); }static void release_all_pagetables (struct lguest *lg)
@@ -269,7 +269,7 @@ void guest_pagetable_clear_all(struct lgvoid guest_pagetable_clear_all (struct lguest *lg) {release_all_pagetables (lg); -pin_trap_pages (lg); +pin_stack_pages (lg); } static void do_set_pte(struct lguest *lg, int idx,