X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx.c;h=efc8e243eaddcb57fabf904a3138ef2378fd7207;hp=81d333edc9020a589f3b1f2a0cae24a56c6eecd8;hb=6541ca672276d841db22cc18a003303cf517ea89;hpb=cfcc5717f659b3ed2954f41cf363d3bceae8dc84

diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c
index 81d333e..efc8e24 100644
--- a/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@ -466,9 +466,11 @@ static int update_irq_exit_state(struct guest_info * info) {
 
 static int update_irq_entry_state(struct guest_info * info) {
     struct vmx_exit_idt_vec_info idt_vec_info;
+    struct vmcs_interrupt_state intr_state;
     struct vmx_data * vmx_info = (struct vmx_data *)(info->vmm_data);
 
     check_vmcs_read(VMCS_IDT_VECTOR_INFO, &(idt_vec_info.value));
+    check_vmcs_read(VMCS_GUEST_INT_STATE, &(intr_state));
 
     /* Check for pending exceptions to inject */
     if (v3_excp_pending(info)) {
@@ -492,13 +494,14 @@ static int update_irq_entry_state(struct guest_info * info) {
 
         int_info.valid = 1;
 #ifdef CONFIG_DEBUG_INTERRUPTS
-        PrintDebug("Injecting exception %d (EIP=%p)\n", int_info.vector, (void *)info->rip);
+        PrintDebug("Injecting exception %d (EIP=%p)\n", int_info.vector, (void *)(addr_t)info->rip);
 #endif
         check_vmcs_write(VMCS_ENTRY_INT_INFO, int_info.value);
 
         v3_injecting_excp(info, int_info.vector);
 
-    } else if (((struct rflags *)&(info->ctrl_regs.rflags))->intr == 1) {
+    } else if ((((struct rflags *)&(info->ctrl_regs.rflags))->intr == 1) && 
+	       (intr_state.val == 0)) {
        
         if ((info->intr_state.irq_started == 1) && (idt_vec_info.valid == 1)) {
 
@@ -533,7 +536,7 @@ static int update_irq_entry_state(struct guest_info * info) {
                     PrintDebug("Injecting Interrupt %d at exit %u(EIP=%p)\n", 
 			       info->intr_state.irq_vector, 
 			       (uint32_t)info->num_exits, 
-			       (void *)info->rip);
+			       (void *)(addr_t)info->rip);
 #endif
 
                     check_vmcs_write(VMCS_ENTRY_INT_INFO, ent_int.value);
@@ -587,6 +590,35 @@ static int update_irq_entry_state(struct guest_info * info) {
 }
 
 
+
+static struct vmx_exit_info exit_log[10];
+
+static void print_exit_log(struct guest_info * info) {
+    int cnt = info->num_exits % 10;
+    int i = 0;
+    
+
+    V3_Print("\nExit Log (%d total exits):\n", (uint32_t)info->num_exits);
+
+    for (i = 0; i < 10; i++) {
+	struct vmx_exit_info * tmp = &exit_log[cnt];
+
+	V3_Print("%d:\texit_reason = %p\n", i, (void *)(addr_t)tmp->exit_reason);
+	V3_Print("\texit_qual = %p\n", (void *)tmp->exit_qual);
+	V3_Print("\tint_info = %p\n", (void *)(addr_t)tmp->int_info);
+	V3_Print("\tint_err = %p\n", (void *)(addr_t)tmp->int_err);
+	V3_Print("\tinstr_info = %p\n", (void *)(addr_t)tmp->instr_info);
+
+	cnt--;
+
+	if (cnt == -1) {
+	    cnt = 9;
+	}
+
+    }
+
+}
+
 /* 
  * CAUTION and DANGER!!! 
  * 
@@ -620,6 +652,11 @@ int v3_vmx_enter(struct guest_info * info) {
     update_irq_entry_state(info);
 #endif
 
+    {
+	addr_t guest_cr3;
+	vmcs_read(VMCS_GUEST_CR3, &guest_cr3);
+	vmcs_write(VMCS_GUEST_CR3, guest_cr3);
+    }
 
     rdtscll(info->time_state.cached_host_tsc);
 
@@ -650,6 +687,8 @@ int v3_vmx_enter(struct guest_info * info) {
     /* Update guest state */
     v3_vmx_save_vmcs(info);
 
+    // info->cpl = info->segments.cs.selector & 0x3;
+
     info->mem_mode = v3_get_vm_mem_mode(info);
     info->cpu_mode = v3_get_vm_cpu_mode(info);
 
@@ -664,6 +703,8 @@ int v3_vmx_enter(struct guest_info * info) {
 
     //PrintDebug("VMX Exit taken, id-qual: %u-%lu\n", exit_info.exit_reason, exit_info.exit_qual);
 
+    exit_log[info->num_exits % 10] = exit_info;
+
 
 #ifdef CONFIG_SYMBIOTIC
     if (info->sym_state.sym_call_active == 0) {
@@ -699,6 +740,7 @@ int v3_start_vmx_guest(struct guest_info* info) {
     while (1) {
 	if (v3_vmx_enter(info) == -1) {
 	    v3_print_vmcs();
+	    print_exit_log(info);
 	    return -1;
 	}
 
@@ -752,7 +794,7 @@ void v3_init_vmx_cpu(int cpu_id) {
     uint64_t ret = 0;
 
     v3_get_msr(VMX_CR4_FIXED0_MSR,&(tmp_msr.hi),&(tmp_msr.lo));
-    
+#ifdef __V3_64BIT__
     __asm__ __volatile__ (
 			  "movq %%cr4, %%rbx;"
 			  "orq  $0x00002000, %%rbx;"
@@ -781,6 +823,38 @@ void v3_init_vmx_cpu(int cpu_id) {
 			  :
 			  : "%rbx"
 			  );
+#elif __V3_32BIT__
+    __asm__ __volatile__ (
+			  "movl %%cr4, %%ecx;"
+			  "orl  $0x00002000, %%ecx;"
+			  "movl %%ecx, %0;"
+			  : "=m"(ret) 
+			  :
+			  : "%ecx"
+			  );
+
+    if ((~ret & tmp_msr.value) == 0) {
+        __asm__ __volatile__ (
+			      "movl %0, %%cr4;"
+			      :
+			      : "q"(ret)
+			      );
+    } else {
+        PrintError("Invalid CR4 Settings!\n");
+        return;
+    }
+
+    __asm__ __volatile__ (
+			  "movl %%cr0, %%ecx; "
+			  "orl  $0x00000020,%%ecx; "
+			  "movl %%ecx, %%cr0;"
+			  :
+			  :
+			  : "%ecx"
+			  );
+
+#endif
+
     //
     // Should check and return Error here....