X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_ctrl_regs.c;h=26272cc9cbf2170acec41b9fb1d893eb4e8f3405;hb=091d8b1fcfc3a766f6603d4c1c69d9f8f4bf3031;hp=2e566ef8727687cb323724d1ffb90bb3241edacd;hpb=a5c5675571882a9b8a7594ef07fe303b195ef9ae;p=palacios.releases.git

diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c
index 2e566ef..26272cc 100644
--- a/palacios/src/palacios/vmm_ctrl_regs.c
+++ b/palacios/src/palacios/vmm_ctrl_regs.c
@@ -1,3 +1,7 @@
+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+
+
 #include <palacios/vmm_mem.h>
 #include <palacios/vmm.h>
 #include <palacios/vmcb.h>
@@ -20,18 +24,6 @@
 #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 0
-
-
-
-
-
-
-
 // First Attempt = 494 lines
 // current = 106 lines
 int handle_cr0_write(struct guest_info * info) {
@@ -45,11 +37,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");
@@ -92,7 +86,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_src_operand.size);
+	PrintDebug("OperandVal = %x, length=%d\n", *new_cr0, dec_instr.src_operand.size);
 
 
 	PrintDebug("Old CR0=%x\n", *real_cr0);
@@ -157,11 +151,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");
@@ -207,7 +203,7 @@ int handle_cr0_read(struct guest_info * info) {
 
 
 
-// First Attemp = 256 lines
+// First Attempt = 256 lines
 // current = 65 lines
 int handle_cr3_write(struct guest_info * info) {
   int ret;
@@ -220,11 +216,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");
@@ -241,13 +239,20 @@ int handle_cr3_write(struct guest_info * info) {
       struct cr3_32 * new_cr3 = (struct cr3_32 *)(dec_instr.src_operand.operand);	
       struct cr3_32 * guest_cr3 = (struct cr3_32 *)&(info->shdw_pg_state.guest_cr3);
       struct cr3_32 * shadow_cr3 = (struct cr3_32 *)&(info->shdw_pg_state.shadow_cr3);
+      int cached = 0;
       
+
       PrintDebug("Old Shadow CR3=%x; Old Guest CR3=%x\n", 
 		 *(uint_t*)shadow_cr3, *(uint_t*)guest_cr3);
       
-      if (!CR3_RELOAD_OPTIMIZATION || !CR3_32_SAME_BASE(new_cr3, guest_cr3)) { 
-	addr_t shadow_pt;
 
+      cached = cache_page_tables32(info, CR3_TO_PDE32(*(addr_t *)new_cr3));
+
+      if (cached == -1) {
+	PrintError("CR3 Cache failed\n");
+	return -1;
+      } else if (cached == 0) {
+	addr_t shadow_pt;
 	
 	PrintDebug("New CR3 is different - flushing shadow page table\n");	
 	
@@ -256,7 +261,9 @@ int handle_cr3_write(struct guest_info * info) {
 	shadow_pt =  create_new_shadow_pt32();
 	
 	shadow_cr3->pdt_base_addr = PD32_BASE_ADDR(shadow_pt);	  
-      } 
+      } else {
+	PrintDebug("Reusing cached shadow Page table\n");
+      }
       
       shadow_cr3->pwt = new_cr3->pwt;
       shadow_cr3->pcd = new_cr3->pcd;
@@ -297,11 +304,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");
@@ -324,7 +333,6 @@ int handle_cr3_read(struct guest_info * info) {
     return -1;
   }
 
-
   info->rip += dec_instr.instr_length;
 
   return 0;