X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_ctrl_regs.c;h=7b637ed29ce222317a95012a41405e3b148971ec;hb=da0f0deecf22754656bad2a95640461ec3ac4f1d;hp=0fb2e2c2722b856394804343b18514ab8a25c50b;hpb=f1d070a7d98fea4d37069555d653e37524f50ac8;p=palacios.releases.git

diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c
index 0fb2e2c..7b637ed 100644
--- a/palacios/src/palacios/vmm_ctrl_regs.c
+++ b/palacios/src/palacios/vmm_ctrl_regs.c
@@ -41,19 +41,7 @@
 
 static int handle_lmsw(struct guest_info * info, struct x86_instr * dec_instr);
 static int handle_clts(struct guest_info * info, struct x86_instr * dec_instr);
-
 static int handle_mov_to_cr0(struct guest_info * info, struct x86_instr * dec_instr);
-static int handle_mov_to_cr0_32(struct guest_info * info, struct x86_instr * dec_instr);
-static int handle_mov_to_cr0_32pae(struct guest_info * info, struct x86_instr * dec_instr);
-static int handle_mov_to_cr0_64(struct guest_info * info, struct x86_instr * dec_instr);
-static int handle_mov_to_cr0_64compat(struct guest_info * info, struct x86_instr * dec_instr);
-
-static int handle_mov_to_cr3_32(struct guest_info * info, struct x86_instr * dec_instr);
-static int handle_mov_to_cr3_32pae(struct guest_info * info, struct x86_instr * dec_instr);
-static int handle_mov_to_cr3_64(struct guest_info * info, struct x86_instr * dec_instr);
-static int handle_mov_to_cr3_64compat(struct guest_info * info, struct x86_instr * dec_instr);
-
-
 
 
 // First Attempt = 494 lines
@@ -69,32 +57,26 @@ int v3_handle_cr0_write(struct guest_info * info) {
     ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
   }
 
-  /* 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");
     return -1;
   }
 
-  if (v3_opcode_cmp(V3_OPCODE_LMSW, (const uchar_t *)(dec_instr.opcode)) == 0) {
+  if (dec_instr.op_type == V3_OP_LMSW) {
+  //  if (v3_opcode_cmp(V3_OPCODE_LMSW, (const uchar_t *)(dec_instr.opcode)) == 0) {
 
     if (handle_lmsw(info, &dec_instr) == -1) {
       return -1;
     }
 
-  } else if (v3_opcode_cmp(V3_OPCODE_MOV2CR, (const uchar_t *)(dec_instr.opcode)) == 0) {
-
+    //  } else if (v3_opcode_cmp(V3_OPCODE_MOV2CR, (const uchar_t *)(dec_instr.opcode)) == 0) {
+  } else if (dec_instr.op_type == V3_OP_MOV2CR) {
     if (handle_mov_to_cr0(info, &dec_instr) == -1) {
       return -1;
     }
 
-  } else if (v3_opcode_cmp(V3_OPCODE_CLTS, (const uchar_t *)(dec_instr.opcode)) == 0) {
+    //  } else if (v3_opcode_cmp(V3_OPCODE_CLTS, (const uchar_t *)(dec_instr.opcode)) == 0) {
+  } else if (dec_instr.op_type == V3_OP_CLTS) {
 
     if (handle_clts(info, &dec_instr) == -1) {
       return -1;
@@ -113,53 +95,29 @@ int v3_handle_cr0_write(struct guest_info * info) {
 
 
 
+// The CR0 register only has flags in the low 32 bits
+// The hardware does a format check to make sure the high bits are zero
+// Because of this we can ignore the high 32 bits here
 static int handle_mov_to_cr0(struct guest_info * info, struct x86_instr * dec_instr) {
-  PrintDebug("MOV2CR0\n");
-
-  switch (info->cpu_mode) {
-  case REAL:
-  case PROTECTED:
-    return handle_mov_to_cr0_32(info, dec_instr);    
-  case PROTECTED_PAE:
-    return handle_mov_to_cr0_32pae(info, dec_instr);
-  case LONG:
-    return handle_mov_to_cr0_64(info, dec_instr);
-  case LONG_32_COMPAT:
-    return handle_mov_to_cr0_64compat(info, dec_instr);
-  default:
-    PrintError("Invalid CPU Operating Mode: %d\n", info->cpu_mode);
-    return -1;
-
-  }
-}
-
-static int handle_mov_to_cr0_32pae(struct guest_info * info, struct x86_instr * dec_instr) {
-  PrintError("32 bit PAE mov to CR0 not implemented\n");
-  return -1;
-}
-
-static int handle_mov_to_cr0_64(struct guest_info * info, struct x86_instr * dec_instr) {
-  PrintError("64 bit mov to CR0 not implemented\n");
-  return -1;
-}
-
-static int handle_mov_to_cr0_64compat(struct guest_info * info, struct x86_instr * dec_instr) {
-  PrintError("64 bit compatibility mode move to CR0 not implemented\n");
-  return -1;
-}
-
-
-static int handle_mov_to_cr0_32(struct guest_info * info, struct x86_instr * dec_instr) {
   // 32 bit registers
   struct cr0_32 * shadow_cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0);
   struct cr0_32 * new_cr0 = (struct cr0_32 *)(dec_instr->src_operand.operand);
   struct cr0_32 * guest_cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0);
+  uint_t paging_transition = 0;
+
+  PrintDebug("MOV2CR0 (MODE=%s)\n", v3_cpu_mode_to_str(info->cpu_mode));
   
   PrintDebug("OperandVal = %x, length=%d\n", *(uint_t *)new_cr0, dec_instr->src_operand.size);
   
   PrintDebug("Old CR0=%x\n", *(uint_t *)shadow_cr0);
   PrintDebug("Old Guest CR0=%x\n", *(uint_t *)guest_cr0);	
 
+
+  // We detect if this is a paging transition
+  if (guest_cr0->pg != new_cr0->pg) {
+    paging_transition = 1;
+  }  
+
   // Guest always sees the value they wrote
   *guest_cr0 = *new_cr0;
 
@@ -168,21 +126,33 @@ static int handle_mov_to_cr0_32(struct guest_info * info, struct x86_instr * dec
 
   // Set the shadow register to catch non-virtualized flags
   *shadow_cr0 = *guest_cr0;
-  
 
-  if (v3_get_mem_mode(info) == VIRTUAL_MEM) {
-    struct cr3_32 * guest_cr3 = (struct cr3_32 *)&(info->shdw_pg_state.guest_cr3);
-    PrintDebug("Setting up Guest Page Table\n");
-    info->ctrl_regs.cr3 = *(addr_t*)guest_cr3;
-  } else  {
-    info->ctrl_regs.cr3 = *(addr_t*)&(info->direct_map_pt);
-    shadow_cr0->pg = 1;
+  // Paging is always enabled
+  shadow_cr0->pg = 1;  
+
+  // Was there a paging transition
+  // Meaning we need to change the page tables
+  if (paging_transition) {
+    if (v3_get_mem_mode(info) == VIRTUAL_MEM) {
+
+      PrintDebug("Activating Shadow Page Tables\n");
+      
+      if (v3_activate_shadow_pt(info) == -1) {
+	PrintError("Failed to activate shadow page tables\n");
+	return -1;
+      }
+    } else  {
+      
+      if (v3_activate_passthrough_pt(info) == -1) {
+	PrintError("Failed to activate passthrough page tables\n");
+	return -1;
+      }
+    }
   }
-  
-  PrintDebug("New Guest CR0=%x\n",*(uint_t *)guest_cr0);
-  
+
+  PrintDebug("New Guest CR0=%x\n",*(uint_t *)guest_cr0);  
   PrintDebug("New CR0=%x\n", *(uint_t *)shadow_cr0);
-  
+
   return 0;
 }
 
@@ -251,24 +221,18 @@ int v3_handle_cr0_read(struct guest_info * info) {
     ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
   }
 
-  /* 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");
     return -1;
   }
   
-  if (v3_opcode_cmp(V3_OPCODE_MOVCR2, (const uchar_t *)(dec_instr.opcode)) == 0) {
+  //  if (v3_opcode_cmp(V3_OPCODE_MOVCR2, (const uchar_t *)(dec_instr.opcode)) == 0) {
+  if (dec_instr.op_type == V3_OP_MOVCR2) {
     struct cr0_32 * dst_reg = (struct cr0_32 *)(dec_instr.dst_operand.operand);
     struct cr0_32 * shadow_cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0);
 
-    PrintDebug("MOVCR2\n");
+    PrintDebug("MOVCR2 (mode=%s)\n", v3_cpu_mode_to_str(info->cpu_mode));
 
     if (info->shdw_pg_mode == SHADOW_PAGING) {
       struct cr0_32 * guest_cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0);
@@ -279,7 +243,8 @@ int v3_handle_cr0_read(struct guest_info * info) {
 
     PrintDebug("Shadow CR0: %x\n", *(uint_t*)shadow_cr0);    
     PrintDebug("returned CR0: %x\n", *(uint_t*)dst_reg);
-  } else if (v3_opcode_cmp(V3_OPCODE_SMSW, (const uchar_t *)(dec_instr.opcode)) == 0) {
+    //  } else if (v3_opcode_cmp(V3_OPCODE_SMSW, (const uchar_t *)(dec_instr.opcode)) == 0) {
+  } else if (dec_instr.op_type == V3_OP_SMSW) {
     struct cr0_real * shadow_cr0 = (struct cr0_real *)&(info->ctrl_regs.cr0);
     struct cr0_real * dst_reg = (struct cr0_real *)(dec_instr.dst_operand.operand);
     char cr0_val = *(char*)shadow_cr0 & 0x0f;
@@ -322,12 +287,17 @@ int v3_handle_cr3_write(struct guest_info * info) {
     return -1;
   }
 
-  if (v3_opcode_cmp(V3_OPCODE_MOV2CR, (const uchar_t *)(dec_instr.opcode)) == 0) {
-    PrintDebug("MOV2CR3\n");
-
-    if (info->mem_mode == PHYSICAL_MEM) {
-      // All we do is update the guest CR3
+  //  if (v3_opcode_cmp(V3_OPCODE_MOV2CR, (const uchar_t *)(dec_instr.opcode)) == 0) {
+  if (dec_instr.op_type == V3_OP_MOV2CR) {
+    PrintDebug("MOV2CR3 (cpu_mode=%s)\n", v3_cpu_mode_to_str(info->cpu_mode));
 
+    if (info->shdw_pg_mode == SHADOW_PAGING) {
+      PrintDebug("Old Shadow CR3=%p; Old Guest CR3=%p\n", 
+		 (void *)(addr_t)(info->ctrl_regs.cr3), 
+		 (void*)(addr_t)(info->shdw_pg_state.guest_cr3));
+      
+    
+      // We update the guest CR3    
       if (info->cpu_mode == LONG) {
 	struct cr3_64 * new_cr3 = (struct cr3_64 *)(dec_instr.src_operand.operand);
 	struct cr3_64 * guest_cr3 = (struct cr3_64 *)&(info->shdw_pg_state.guest_cr3);
@@ -337,30 +307,32 @@ int v3_handle_cr3_write(struct guest_info * info) {
 	struct cr3_32 * guest_cr3 = (struct cr3_32 *)&(info->shdw_pg_state.guest_cr3);
 	*guest_cr3 = *new_cr3;
       }
-
-    } else {
-
-      switch (info->cpu_mode) {
-      case PROTECTED:
-	if (handle_mov_to_cr3_32(info, &dec_instr) == -1) {
-	  return -1;
-	}
-      case PROTECTED_PAE:
-	if (handle_mov_to_cr3_32pae(info, &dec_instr) == -1) {
-	  return -1;
-	}
-      case LONG:
-	if (handle_mov_to_cr3_64(info, &dec_instr) == -1) {
-	  return -1;
-	}
-      case LONG_32_COMPAT:
-	if (handle_mov_to_cr3_64compat(info, &dec_instr) == -1) {
+      
+      // If Paging is enabled in the guest then we need to change the shadow page tables
+      if (info->mem_mode == VIRTUAL_MEM) {
+	if (v3_activate_shadow_pt(info) == -1) {
+	  PrintError("Failed to activate 32 bit shadow page table\n");
 	  return -1;
 	}
-      default:
-	PrintError("Unhandled CPU mode: %d\n", info->cpu_mode);
-	return -1;
+      } 
+ 
+      PrintDebug("New Shadow CR3=%p; New Guest CR3=%p\n", 
+		 (void *)(addr_t)(info->ctrl_regs.cr3), 
+		 (void*)(addr_t)(info->shdw_pg_state.guest_cr3));
+      
+    } else if (info->shdw_pg_mode == NESTED_PAGING) {
+ 
+     // This is just a passthrough operation which we probably don't need here
+      if (info->cpu_mode == LONG) {
+	struct cr3_64 * new_cr3 = (struct cr3_64 *)(dec_instr.src_operand.operand);
+	struct cr3_64 * guest_cr3 = (struct cr3_64 *)&(info->ctrl_regs.cr3);
+	*guest_cr3 = *new_cr3;
+      } else {
+	struct cr3_32 * new_cr3 = (struct cr3_32 *)(dec_instr.src_operand.operand);
+	struct cr3_32 * guest_cr3 = (struct cr3_32 *)&(info->ctrl_regs.cr3);
+	*guest_cr3 = *new_cr3;
       }
+
     }
   } else {
     PrintError("Unhandled opcode in handle_cr3_write\n");
@@ -374,55 +346,6 @@ int v3_handle_cr3_write(struct guest_info * info) {
 
 
 
-
-
-
-
-static int handle_mov_to_cr3_32(struct guest_info * info, struct x86_instr * dec_instr) {
-  PrintDebug("CR3 at 0x%p\n", &(info->ctrl_regs.cr3));
-
-  if (info->shdw_pg_mode == SHADOW_PAGING) {
-    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->ctrl_regs.cr3);
-
-    
-    PrintDebug("Old Shadow CR3=%x; Old Guest CR3=%x\n", 
-	       *(uint_t*)shadow_cr3, *(uint_t*)guest_cr3);
-    
-
-    // Store the write value to virtualize CR3
-    *guest_cr3 = *new_cr3;    
-    
-    if (v3_activate_shadow_pt(info) == -1) {
-      PrintError("Failed to activate 32 bit shadow page table\n");
-      return -1;
-    }
-
-    PrintDebug("New Shadow CR3=%x; New Guest CR3=%x\n", 
-	       *(uint_t*)shadow_cr3, *(uint_t*)guest_cr3);    
-  }
-  return 0;
-}
-
-
-static int handle_mov_to_cr3_32pae(struct guest_info * info, struct x86_instr * dec_instr) {
-  PrintError("32 Bit PAE mode Mov to CR3 not implemented\n");
-  return -1;
-}
-
-static int handle_mov_to_cr3_64(struct guest_info * info, struct x86_instr * dec_instr) {
-  PrintError("Long mode Mov to CR3 not implemented\n");
-  return -1;
-}
-
-static int handle_mov_to_cr3_64compat(struct guest_info * info, struct x86_instr * dec_instr) {
-  PrintError("Long compatiblity mode move to CR3 not implemented\n");
-  return -1;
-}
-
-
-
 // first attempt = 156 lines
 // current = 36 lines
 int v3_handle_cr3_read(struct guest_info * info) {
@@ -436,30 +359,41 @@ int v3_handle_cr3_read(struct guest_info * info) {
     ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
   }
 
-  /* 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");
     return -1;
   }
 
-  if (v3_opcode_cmp(V3_OPCODE_MOVCR2, (const uchar_t *)(dec_instr.opcode)) == 0) {
-    PrintDebug("MOVCR32\n");
-    struct cr3_32 * dst_reg = (struct cr3_32 *)(dec_instr.dst_operand.operand);
-
-    PrintDebug("CR3 at 0x%p\n", &(info->ctrl_regs.cr3));
+  //  if (v3_opcode_cmp(V3_OPCODE_MOVCR2, (const uchar_t *)(dec_instr.opcode)) == 0) {
+  if (dec_instr.op_type == V3_OP_MOVCR2) {
+    PrintDebug("MOVCR32 (mode=%s)\n", v3_cpu_mode_to_str(info->cpu_mode));
 
     if (info->shdw_pg_mode == SHADOW_PAGING) {
-      *dst_reg = *(struct cr3_32 *)&(info->shdw_pg_state.guest_cr3);
-    } else {
-      *dst_reg = *(struct cr3_32 *)&(info->ctrl_regs.cr3);
+
+      if (info->cpu_mode == LONG) {
+	struct cr3_64 * dst_reg = (struct cr3_64 *)(dec_instr.dst_operand.operand);
+	struct cr3_64 * guest_cr3 = (struct cr3_64 *)&(info->shdw_pg_state.guest_cr3);
+	*dst_reg = *guest_cr3;
+      } else {
+	struct cr3_32 * dst_reg = (struct cr3_32 *)(dec_instr.dst_operand.operand);
+	struct cr3_32 * guest_cr3 = (struct cr3_32 *)&(info->shdw_pg_state.guest_cr3);
+	*dst_reg = *guest_cr3;
+      }
+
+    } else if (info->shdw_pg_mode == NESTED_PAGING) {
+
+      // This is just a passthrough operation which we probably don't need here
+      if (info->cpu_mode == LONG) {
+	struct cr3_64 * dst_reg = (struct cr3_64 *)(dec_instr.dst_operand.operand);
+	struct cr3_64 * guest_cr3 = (struct cr3_64 *)&(info->ctrl_regs.cr3);
+	*dst_reg = *guest_cr3;
+      } else {
+	struct cr3_32 * dst_reg = (struct cr3_32 *)(dec_instr.dst_operand.operand);
+	struct cr3_32 * guest_cr3 = (struct cr3_32 *)&(info->ctrl_regs.cr3);
+	*dst_reg = *guest_cr3;
+      }
     }
+
   } else {
     PrintError("Unhandled opcode in handle_cr3_read\n");
     return -1;
@@ -470,9 +404,12 @@ int v3_handle_cr3_read(struct guest_info * info) {
   return 0;
 }
 
+
+// We don't need to virtualize CR4, all we need is to detect the activation of PAE
 int v3_handle_cr4_read(struct guest_info * info) {
-  PrintError("CR4 Read not handled\n");
-  return -1;
+  //  PrintError("CR4 Read not handled\n");
+  // Do nothing...
+  return 0;
 }
 
 int v3_handle_cr4_write(struct guest_info * info) {
@@ -491,7 +428,8 @@ int v3_handle_cr4_write(struct guest_info * info) {
     return -1;
   }
 
-  if (v3_opcode_cmp(V3_OPCODE_MOV2CR, (const uchar_t *)(dec_instr.opcode)) != 0) {
+  //  if (v3_opcode_cmp(V3_OPCODE_MOV2CR, (const uchar_t *)(dec_instr.opcode)) != 0) {
+  if (dec_instr.op_type != V3_OP_MOV2CR) {
     PrintError("Invalid opcode in write to CR4\n");
     return -1;
   }