X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_ctrl_regs.c;h=4c84e2edde63100e63fec866fa342f34cfb17b01;hb=1f9fa9cd9662a600f49a3b12fcc02fd2ffca93c8;hp=1afb255243109f5897cd7f541d2399384a6e0c5b;hpb=14fa18cc54571eaa7aaa0f7d55677bdb4dad81a6;p=palacios.git

diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c
index 1afb255..4c84e2e 100644
--- a/palacios/src/palacios/vmm_ctrl_regs.c
+++ b/palacios/src/palacios/vmm_ctrl_regs.c
@@ -24,8 +24,9 @@
 #include <palacios/vm_guest_mem.h>
 #include <palacios/vmm_ctrl_regs.h>
 #include <palacios/vmm_direct_paging.h>
+#include <palacios/svm.h>
 
-#ifndef CONFIG_DEBUG_CTRL_REGS
+#ifndef V3_CONFIG_DEBUG_CTRL_REGS
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -107,13 +108,18 @@ static int handle_mov_to_cr0(struct guest_info * info, struct x86_instr * dec_in
     *guest_cr0 = *new_cr0;
     
     // This value must always be set to 1 
-    guest_cr0->et = 1;    
+    guest_cr0->et = 1;
     
     // Set the shadow register to catch non-virtualized flags
     *shadow_cr0 = *guest_cr0;
     
     // Paging is always enabled
-    shadow_cr0->pg = 1;  
+    shadow_cr0->pg = 1;
+
+    if (guest_cr0->pg == 0) {
+	// If paging is not enabled by the guest, then we always enable write-protect to catch memory hooks
+	shadow_cr0->wp = 1;
+    }
     
     // Was there a paging transition
     // Meaning we need to change the page tables
@@ -560,14 +566,116 @@ int v3_handle_efer_write(struct guest_info * core, uint_t msr, struct v3_msr src
     
     PrintDebug("EFER Write\n");
     PrintDebug("EFER Write Values: HI=%x LO=%x\n", src.hi, src.lo);
+
     //PrintDebug("Old EFER=%p\n", (void *)*(addr_t*)(shadow_efer));
     
     // We virtualize the guests efer to hide the SVME and LMA bits
     guest_efer->value = src.value;
     
+    if (core->shdw_pg_mode == SHADOW_PAGING) {
+	// Enable/Disable Syscall
+	shadow_efer->sce = src.value & 0x1;
+    } else if (core->shdw_pg_mode == NESTED_PAGING) {
+	*(uint64_t *)shadow_efer = src.value;
+	shadow_efer->svme = 1;
+    }
+    return 0;
+}
+
+
+/* KCH: all of the star handlers are for syscall interposition */
+int v3_handle_star_read(struct guest_info * core, uint_t msr, struct v3_msr * dst, void * priv_data) {
+
+#ifdef CONFIG_DEBUG_SYSCALL_HIJACK
+    PrintDebug("STAR Read\n");
+#endif
+
+    return 0;
+}
+
+
+int v3_handle_star_write(struct guest_info * core, uint_t msr, struct v3_msr src, void * priv_data) {
+    
+#ifdef V3_CONFIG_DEBUG_SYSCALL_HIJACK
+    PrintDebug("STAR Write\n");
+#endif
+    return 0;
+}
+
+
+int v3_handle_lstar_read(struct guest_info * core, uint_t msr, struct v3_msr * dst, void * priv_data) {
+
+#ifdef V3_CONFIG_DEBUG_SYSCALL_HIJACK
+    PrintDebug("LSTAR Read\n");
+#endif
+    return 0;
+}
+
+
+int v3_handle_lstar_write(struct guest_info * core, uint_t msr, struct v3_msr src, void * priv_data) {
+    
+#ifdef V3_CONFIG_DEBUG_SYSCALL_HIJACK
+    ulong_t entry = ((ulong_t)src.hi << 32) | (ulong_t)src.lo;
+    PrintDebug("LSTAR Write\n");
+    PrintDebug("\tKernel syscall entry point: 0x%lx\n", entry);
+#endif
+    
+    return 0;
+}
+
+
+int v3_handle_cstar_read(struct guest_info * core, uint_t msr, struct v3_msr * dst, void * priv_data) {
+
+#ifdef V3_CONFIG_DEBUG_SYSCALL_HIJACK
+    PrintDebug("CSTAR Read\n");
+#endif
+    return 0;
+}
+
+
+int v3_handle_cstar_write(struct guest_info * core, uint_t msr, struct v3_msr src, void * priv_data) {
     
-    // Enable/Disable Syscall
-    shadow_efer->sce = src.value & 0x1;
+#ifdef V3_CONFIG_DEBUG_SYSCALL_HIJACK
+    PrintDebug("CSTAR Write\n");
+#endif
+    return 0;
+}
+
+int v3_handle_seeip_read(struct guest_info * core, uint_t msr, struct v3_msr * dst, void * priv_data) {
+    /* we don't care about reads */
+    return 0;
+}
+
+int v3_handle_seeip_write(struct guest_info * core, uint_t msr, struct v3_msr src, void * priv_data) {
+#ifdef V3_CONFIG_DEBUG_SYSALL_HIJACK
+    PrintDebug("SYSENTER_EIP Write\n");
+#endif
+    return 0;
+}
+
+
+int v3_handle_vm_cr_read(struct guest_info * core, uint_t msr, struct v3_msr * dst, void * priv_data) {
+    /* tell the guest that the BIOS disabled SVM, that way it doesn't get 
+     * confused by the fact that CPUID reports SVM as available but it still
+     * cannot be used 
+     */
+    dst->value = SVM_VM_CR_MSR_lock | SVM_VM_CR_MSR_svmdis;
+    PrintDebug("VM_CR Read HI=%x LO=%x\n", dst->hi, dst->lo);
+    return 0;
+}
+
+int v3_handle_vm_cr_write(struct guest_info * core, uint_t msr, struct v3_msr src, void * priv_data) {
+    PrintDebug("VM_CR Write\n");
+    PrintDebug("VM_CR Write Values: HI=%x LO=%x\n", src.hi, src.lo);
+
+    /* writes to LOCK and SVMDIS are silently ignored (according to the spec), 
+     * other writes indicate the guest wants to use some feature we haven't
+     * implemented
+     */
+    if (src.value & ~(SVM_VM_CR_MSR_lock | SVM_VM_CR_MSR_svmdis)) {
+	PrintDebug("VM_CR write sets unsupported bits: HI=%x LO=%x\n", src.hi, src.lo);
+	return -1;
+    }
     
     return 0;
 }