X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_ctrl_regs.c;h=89d896baee3425b8245a6aae56a8e7c53378413e;hb=851cedf7660970f7af19bffb63b1ba1d70f77e3e;hp=44393550e83c8595f6d91d84fa27e540c48b9bce;hpb=af355c370ac80f8e19d6375cb3070213c29a92eb;p=palacios.git

diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c
index 4439355..89d896b 100644
--- a/palacios/src/palacios/vmm_ctrl_regs.c
+++ b/palacios/src/palacios/vmm_ctrl_regs.c
@@ -20,6 +20,13 @@
 #endif
 
 
+// Set to 1 if CR3 reload with same value shall not
+// force a shadow page table flush
+// It makes windows loading MUCH faster. 
+// Note that this optimization appears to fail with a 2.6 linux kernel
+#define CR3_RELOAD_OPTIMIZATION 1
+
+
 
 
 
@@ -38,11 +45,13 @@ int handle_cr0_write(struct guest_info * info) {
     ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
   }
 
-  if (ret != 15) {
+  /* The IFetch will already have faulted in the necessary bytes for the full instruction
+    if (ret != 15) {
     // I think we should inject a GPF into the guest
     PrintError("Could not read instruction (ret=%d)\n", ret);
     return -1;
-  }
+    }
+  */
 
   if (v3_decode(info, (addr_t)instr, &dec_instr) == -1) {
     PrintError("Could not decode instruction\n");
@@ -85,7 +94,7 @@ int handle_cr0_write(struct guest_info * info) {
 	struct cr0_32 *real_cr0 = (struct cr0_32*)&(info->ctrl_regs.cr0);
 	struct cr0_32 *new_cr0= (struct cr0_32 *)(dec_instr.src_operand.operand);
 
-	PrintDebug("OperandVal = %x, length=%d\n", *new_cr0, dec_instr.dst_operand.size);
+	PrintDebug("OperandVal = %x, length=%d\n", *new_cr0, dec_instr.src_operand.size);
 
 
 	PrintDebug("Old CR0=%x\n", *real_cr0);
@@ -150,11 +159,13 @@ int handle_cr0_read(struct guest_info * info) {
     ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
   }
 
-  if (ret != 15) {
-    // I think we should inject a GPF into the guest
-    PrintError("Could not read instruction (ret=%d)\n", ret);
-    return -1;
-  }
+  /* The IFetch will already have faulted in the necessary bytes for the full instruction
+     if (ret != 15) {
+     // I think we should inject a GPF into the guest
+     PrintError("Could not read instruction (ret=%d)\n", ret);
+     return -1;
+     }
+  */
 
   if (v3_decode(info, (addr_t)instr, &dec_instr) == -1) {
     PrintError("Could not decode instruction\n");
@@ -213,11 +224,13 @@ int handle_cr3_write(struct guest_info * info) {
     ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
   }
 
-  if (ret != 15) {
-    // I think we should inject a GPF into the guest
-    PrintError("Could not read instruction (ret=%d)\n", ret);
-    return -1;
-  }
+  /* The IFetch will already have faulted in the necessary bytes for the full instruction
+     if (ret != 15) {
+     // I think we should inject a GPF into the guest
+     PrintError("Could not read instruction (ret=%d)\n", ret);
+     return -1;
+     }
+  */
 
   if (v3_decode(info, (addr_t)instr, &dec_instr) == -1) {
     PrintError("Could not decode instruction\n");
@@ -238,7 +251,7 @@ int handle_cr3_write(struct guest_info * info) {
       PrintDebug("Old Shadow CR3=%x; Old Guest CR3=%x\n", 
 		 *(uint_t*)shadow_cr3, *(uint_t*)guest_cr3);
       
-      if (1 || !CR3_32_SAME_BASE(new_cr3, guest_cr3)) { 
+      if (!CR3_RELOAD_OPTIMIZATION || !CR3_32_SAME_BASE(new_cr3, guest_cr3)) { 
 	addr_t shadow_pt;
 
 	
@@ -246,7 +259,7 @@ int handle_cr3_write(struct guest_info * info) {
 	
 	delete_page_tables_pde32((pde32_t *)CR3_TO_PDE32(*(uint_t*)shadow_cr3));
 	
-	shadow_pt =  create_new_shadow_pt32(info);
+	shadow_pt =  create_new_shadow_pt32();
 	
 	shadow_cr3->pdt_base_addr = PD32_BASE_ADDR(shadow_pt);	  
       } 
@@ -290,11 +303,13 @@ int handle_cr3_read(struct guest_info * info) {
     ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
   }
 
-  if (ret != 15) {
-    // I think we should inject a GPF into the guest
-    PrintError("Could not read instruction (ret=%d)\n", ret);
-    return -1;
-  }
+  /* The IFetch will already have faulted in the necessary bytes for the full instruction
+     if (ret != 15) {
+     // I think we should inject a GPF into the guest
+     PrintError("Could not read instruction (ret=%d)\n", ret);
+     return -1;
+     }
+  */
 
   if (v3_decode(info, (addr_t)instr, &dec_instr) == -1) {
     PrintError("Could not decode instruction\n");