Merge branch 'kitten' of ssh://sharedev@newskysaw.cs.northwestern.edu/home/sharedev...

diff --git a/kitten/init/main.c b/kitten/init/main.c
index 070f67c..9b8c086 100644 (file)
--- a/kitten/init/main.c
+++ b/kitten/init/main.c
@@ -118,6 +118,8 @@ start_kernel()
 
 #ifdef CONFIG_V3VEE
        v3vee_run_vmm();
+       printk( "%s: VMM returned.  We're spinning\n", __func__ );
+       while(1) { asm( "hlt" ); }
 #else
        /*
         * Start up user-space...
@@ -128,6 +130,6 @@ start_kernel()
                panic("Failed to create init_task (status=%d).", status);
 
        schedule();  /* This should not return */
-#endif
        BUG();
+#endif
 }

diff --git a/kitten/kernel/printk.c b/kitten/kernel/printk.c
index b410ec6..772c872 100644 (file)
--- a/kitten/kernel/printk.c
+++ b/kitten/kernel/printk.c
@@ -15,6 +15,9 @@ int printk(const char *fmt, ...)
 }
 
 
+int printk_print_cpu_number;
+
+
 int
 vprintk(
        const char *            fmt,
@@ -30,9 +33,12 @@ vprintk(
        *p = '\0';
 
        /* Tack on the logical CPU ID */
-       len = sprintf(p, "[%u]:", this_cpu);
-       p      += len;
-       remain -= len;
+       if( printk_print_cpu_number )
+       {
+               len = sprintf(p, "[%u]:", this_cpu);
+               p      += len;
+               remain -= len;
+       }
 
        /* Construct the string... */
        len = vscnprintf(p, remain, fmt, args);

diff --git a/kitten/palacios-glue/vmm_stubs.c b/kitten/palacios-glue/vmm_stubs.c
index 0721a1e..aa5f54a 100644 (file)
--- a/kitten/palacios-glue/vmm_stubs.c
+++ b/kitten/palacios-glue/vmm_stubs.c
@@ -84,8 +84,14 @@ Free_VMM_Page(
 
        int rc = pmem_query(&query,&result);
 
-       if (rc)
-               panic( "BAD" );
+       if( rc )
+       {
+               panic( "Asked to free non-allocated page %p! rc=%d",
+                       page,
+                       rc
+               );
+               return;
+       }
 
        result.allocated = 0;
        pmem_update(&result);
@@ -228,7 +234,7 @@ v3vee_printk(
 
 
 struct v3_os_hooks v3vee_os_hooks = {
-       .print_debug            = 0, // printk,  // serial print ideally
+       .print_debug            = v3vee_printk,  // serial print ideally
        .print_info             = v3vee_printk,   // serial print ideally
        .print_trace            = v3vee_printk,  // serial print ideally
        .allocate_pages         = Allocate_VMM_Pages, // defined in vmm_stubs

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 86629d3..77653af 100644 (file)
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -327,7 +327,7 @@ static int start_svm_guest(struct guest_info *info) {
     v3_clgi();
 
 
-    PrintDebug("SVM Entry to rip=%p...\n", (void *)info->rip);
+    //PrintDebug("SVM Entry to rip=%p...\n", (void *)info->rip);
 
     v3_get_msr(0xc0000101, &vm_cr_high, &vm_cr_low);
 
@@ -339,7 +339,7 @@ static int start_svm_guest(struct guest_info *info) {
     rdtscll(tmp_tsc);
 
     v3_set_msr(0xc0000101, vm_cr_high, vm_cr_low);
-    PrintDebug("SVM Returned\n");
+    //PrintDebug("SVM Returned\n");
 
 
 #if PrintDebug
@@ -353,11 +353,11 @@ static int start_svm_guest(struct guest_info *info) {
     v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc);
     num_exits++;
 
-    PrintDebug("Turning on global interrupts\n");
+    //PrintDebug("Turning on global interrupts\n");
     v3_stgi();
 
 
-    PrintDebug("SVM Exit number %d\n", num_exits);
+    //PrintDebug("SVM Exit number %d\n", num_exits);
 
 
      

diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c
index 1a287cd..f56c5a6 100644 (file)
--- a/palacios/src/palacios/vmm_ctrl_regs.c
+++ b/palacios/src/palacios/vmm_ctrl_regs.c
@@ -270,13 +270,20 @@ int v3_handle_cr3_write(struct guest_info * info) {
       } else if (cached == 0) {
        addr_t shadow_pt;
        
-       PrintDebug("New CR3 is different - flushing shadow page table\n");      
+       if( info->mem_mode == VIRTUAL_MEM )
+       {
+               PrintDebug("New CR3 is different - flushing shadow page table %p\n", shadow_cr3 );      
        
-       delete_page_tables_pde32((pde32_t *)CR3_TO_PDE32(*(uint_t*)shadow_cr3));
+               delete_page_tables_pde32((pde32_t *)CR3_TO_PDE32(*(uint_t*)shadow_cr3));
+       }
        
        shadow_pt =  v3_create_new_shadow_pt32();
        
        shadow_cr3->pdt_base_addr = (addr_t)V3_PAddr((void *)(addr_t)PD32_BASE_ADDR(shadow_pt));
+       PrintDebug( "Created new shadow page table %p\n", shadow_cr3->pdt_base_addr );
+       //PrintDebugPageTables( (pde32_t *)CR3_TO_PDE32(*(uint_t*)shadow_cr3) );
+
+
       } else {
        PrintDebug("Reusing cached shadow Page table\n");
       }

diff --git a/palacios/src/palacios/vmm_shadow_paging.c b/palacios/src/palacios/vmm_shadow_paging.c
index 83ffff2..7baee58 100644 (file)
--- a/palacios/src/palacios/vmm_shadow_paging.c
+++ b/palacios/src/palacios/vmm_shadow_paging.c
@@ -385,13 +385,13 @@ static int handle_large_pagefault32(struct guest_info * info,
 static int handle_shadow_pagefault32(struct guest_info * info, addr_t fault_addr, pf_error_t error_code) {
   pde32_t * guest_pd = NULL;
   pde32_t * shadow_pd = (pde32_t *)CR3_TO_PDE32(info->shdw_pg_state.shadow_cr3);
-  addr_t guest_cr3 = (addr_t)CR3_TO_PDE32(info->shdw_pg_state.guest_cr3);
+  addr_t guest_cr3 = (addr_t) V3_PAddr( CR3_TO_PDE32(info->shdw_pg_state.guest_cr3) );
   pt_access_status_t guest_pde_access;
   pt_access_status_t shadow_pde_access;
   pde32_t * guest_pde = NULL;
   pde32_t * shadow_pde = (pde32_t *)&(shadow_pd[PDE32_INDEX(fault_addr)]);
 
-  PrintDebug("Shadow page fault handler\n");
+  PrintDebug("Shadow page fault handler: %p\n", (void*) fault_addr );
 
   if (guest_pa_to_host_va(info, guest_cr3, (addr_t*)&guest_pd) == -1) {
     PrintError("Invalid Guest PDE Address: 0x%p\n",  (void *)guest_cr3);
@@ -449,7 +449,7 @@ static int handle_shadow_pagefault32(struct guest_info * info, addr_t fault_addr
       //
       // PTE fault
       //
-      pte32_t * shadow_pt = (pte32_t *)(addr_t)PDE32_T_ADDR((*shadow_pde));
+      pte32_t * shadow_pt = (pte32_t *)V3_VAddr( (void*)(addr_t) PDE32_T_ADDR(*shadow_pde) );
 
       if (guest_pde->large_page == 0) {
        pte32_t * guest_pt = NULL;
@@ -663,56 +663,64 @@ static int handle_shadow_pte32_fault(struct guest_info * info,
 
 
 /* Currently Does not work with Segmentation!!! */
-int v3_handle_shadow_invlpg(struct guest_info * info) {
-  if (info->mem_mode != VIRTUAL_MEM) {
-    // Paging must be turned on...
-    // should handle with some sort of fault I think
-    PrintError("ERROR: INVLPG called in non paged mode\n");
-    return -1;
-  }
+int v3_handle_shadow_invlpg(struct guest_info * info)
+{
+       if (info->mem_mode != VIRTUAL_MEM) {
+               // Paging must be turned on...
+               // should handle with some sort of fault I think
+               PrintError("ERROR: INVLPG called in non paged mode\n");
+               return -1;
+       }
 
 
-  if (info->cpu_mode == PROTECTED) {
-    uchar_t instr[15];
-    int ret;
-    int index = 0;
+       if (info->cpu_mode != PROTECTED)
+               return 0;
 
-    ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
-    if (ret != 15) {
-      PrintError("Could not read instruction 0x%p (ret=%d)\n",  (void *)(info->rip), ret);
-      return -1;
-    }
+       uchar_t instr[15];
+       int index = 0;
+
+       int ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
+       if (ret != 15) {
+               PrintError("Could not read instruction 0x%p (ret=%d)\n",  (void *)(info->rip), ret);
+               return -1;
+       }
 
    
-    /* Can INVLPG work with Segments?? */
-    while (is_prefix_byte(instr[index])) {
-      index++;
-    }
+       /* Can INVLPG work with Segments?? */
+       while (is_prefix_byte(instr[index])) {
+               index++;
+       }
     
     
-    if ((instr[index] == (uchar_t)0x0f) &&
-       (instr[index + 1] == (uchar_t)0x01)) {
-
-      addr_t first_operand;
-      addr_t second_operand;
-      v3_operand_type_t addr_type;
-      addr_t guest_cr3 = (addr_t)CR3_TO_PDE32(info->shdw_pg_state.guest_cr3);
+       if( instr[index + 0] != (uchar_t) 0x0f
+       ||  instr[index + 1] != (uchar_t) 0x01
+       ) {
+               PrintError("invalid Instruction Opcode\n");
+               PrintTraceMemDump(instr, 15);
+               return -1;
+       }
 
-      pde32_t * guest_pd = NULL;
+       addr_t first_operand;
+       addr_t second_operand;
+       addr_t guest_cr3 = (addr_t)V3_PAddr( (void*)(addr_t) CR3_TO_PDE32(info->shdw_pg_state.guest_cr3) );
 
-      if (guest_pa_to_host_va(info, guest_cr3, (addr_t*)&guest_pd) == -1) {
-       PrintError("Invalid Guest PDE Address: 0x%p\n",  (void *)guest_cr3);
-       return -1;
-      }
+       pde32_t * guest_pd = NULL;
 
-      
+       if (guest_pa_to_host_va(info, guest_cr3, (addr_t*)&guest_pd) == -1)
+       {
+               PrintError("Invalid Guest PDE Address: 0x%p\n",  (void *)guest_cr3);
+               return -1;
+       }
 
+       index += 2;
 
-      index += 2;
+       v3_operand_type_t addr_type = decode_operands32(&(info->vm_regs), instr + index, &index, &first_operand, &second_operand, REG32);
 
-      addr_type = decode_operands32(&(info->vm_regs), instr + index, &index, &first_operand, &second_operand, REG32);
+       if (addr_type != MEM_OPERAND) {
+               PrintError("Invalid Operand type\n");
+               return -1;
+       }
 
-      if (addr_type == MEM_OPERAND) {
        pde32_t * shadow_pd = (pde32_t *)CR3_TO_PDE32(info->shdw_pg_state.shadow_cr3);
        pde32_t * shadow_pde = (pde32_t *)&shadow_pd[PDE32_INDEX(first_operand)];
        pde32_t * guest_pde;
@@ -725,37 +733,24 @@ int v3_handle_shadow_invlpg(struct guest_info * info) {
        guest_pde = (pde32_t *)&(guest_pd[PDE32_INDEX(first_operand)]);
 
        if (guest_pde->large_page == 1) {
-         shadow_pde->present = 0;
-         PrintDebug("Invalidating Large Page\n");
-       } else {
-        
-         if (shadow_pde->present == 1) {
-           pte32_t * shadow_pt = (pte32_t *)(addr_t)PDE32_T_ADDR((*shadow_pde));
-           pte32_t * shadow_pte = (pte32_t *)&shadow_pt[PTE32_INDEX(first_operand)];
+               shadow_pde->present = 0;
+               PrintDebug("Invalidating Large Page\n");
+       } else
+       if (shadow_pde->present == 1) {
+               pte32_t * shadow_pt = (pte32_t *)(addr_t)PDE32_T_ADDR((*shadow_pde));
+               pte32_t * shadow_pte = (pte32_t *) V3_VAddr( (void*) &shadow_pt[PTE32_INDEX(first_operand)] );
 
 #ifdef DEBUG_SHADOW_PAGING
-           PrintDebug("Setting not present\n");
-           PrintPTE32(first_operand, shadow_pte);
+               PrintDebug("Setting not present\n");
+               PrintPTE32(first_operand, shadow_pte );
 #endif
 
-           shadow_pte->present = 0;
-         }
+               shadow_pte->present = 0;
        }
 
        info->rip += index;
 
-      } else {
-       PrintError("Invalid Operand type\n");
-       return -1;
-      }
-    } else {
-      PrintError("invalid Instruction Opcode\n");
-      PrintTraceMemDump(instr, 15);
-      return -1;
-    }
-  }
-
-  return 0;
+       return 0;
 }