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

diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c
index 89d896b..3dab368 100644
--- a/palacios/src/palacios/vmm_ctrl_regs.c
+++ b/palacios/src/palacios/vmm_ctrl_regs.c
@@ -1,3 +1,22 @@
+/* 
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
+
 #include <palacios/vmm_mem.h>
 #include <palacios/vmm.h>
 #include <palacios/vmcb.h>
@@ -20,22 +39,10 @@
 #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
-
-
-
-
-
-
-
 // First Attempt = 494 lines
 // current = 106 lines
 int handle_cr0_write(struct guest_info * info) {
-  char instr[15];
+  uchar_t instr[15];
   int ret;
   struct x86_instr dec_instr;
 
@@ -149,7 +156,7 @@ int handle_cr0_write(struct guest_info * info) {
 // First attempt = 253 lines
 // current = 51 lines
 int handle_cr0_read(struct guest_info * info) {
-  char instr[15];
+  uchar_t instr[15];
   int ret;
   struct x86_instr dec_instr;
 
@@ -211,11 +218,11 @@ 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;
-  char instr[15];
+  uchar_t instr[15];
   struct x86_instr dec_instr;
 
   if (info->mem_mode == PHYSICAL_MEM) { 
@@ -247,13 +254,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");	
 	
@@ -262,7 +276,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;
@@ -293,7 +309,7 @@ int handle_cr3_write(struct guest_info * info) {
 // first attempt = 156 lines
 // current = 36 lines
 int handle_cr3_read(struct guest_info * info) {
-  char instr[15];
+  uchar_t instr[15];
   int ret;
   struct x86_instr dec_instr;
 
@@ -332,7 +348,6 @@ int handle_cr3_read(struct guest_info * info) {
     return -1;
   }
 
-
   info->rip += dec_instr.instr_length;
 
   return 0;