X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=4c4aa2cba1e420d56f9477a699f20c10ff15dbca;hp=1e96118e8c7c277e794d94a1cf0577373eaee6ef;hb=c06413341bf1dca02f22c0502fa5c2d1c2c11eab;hpb=6d57b915c82345c4dfb1897209f4778b4548bc31 diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c index 1e96118..4c4aa2c 100644 --- a/palacios/src/palacios/svm_handler.c +++ b/palacios/src/palacios/svm_handler.c @@ -24,16 +24,19 @@ #include #include #include -#include +#include #include #include #include #include #include -#include #include +#include #include +#ifdef CONFIG_TELEMETRY +#include +#endif int v3_handle_svm_exit(struct guest_info * info) { @@ -44,7 +47,6 @@ int v3_handle_svm_exit(struct guest_info * info) { guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data)); guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data)); - // Update the high level state info->rip = guest_state->rip; info->vm_regs.rsp = guest_state->rsp; @@ -52,7 +54,6 @@ int v3_handle_svm_exit(struct guest_info * info) { info->cpl = guest_state->cpl; - info->ctrl_regs.cr0 = guest_state->cr0; info->ctrl_regs.cr2 = guest_state->cr2; info->ctrl_regs.cr3 = guest_state->cr3; @@ -63,31 +64,29 @@ int v3_handle_svm_exit(struct guest_info * info) { info->ctrl_regs.rflags = guest_state->rflags; info->ctrl_regs.efer = guest_state->efer; - get_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments)); + v3_get_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments)); info->cpu_mode = v3_get_vm_cpu_mode(info); info->mem_mode = v3_get_vm_mem_mode(info); - exit_code = guest_ctrl->exit_code; - // PrintDebug("SVM Exit: %s (rip=%p) (info1=%p)\n", vmexit_code_to_str(exit_code), // (void *)(addr_t)info->rip, (void *)(addr_t)guest_ctrl->exit_info1); if ((info->intr_state.irq_pending == 1) && (guest_ctrl->guest_ctrl.V_IRQ == 0)) { -#ifdef DEBUG_INTERRUPTS +#ifdef CONFIG_DEBUG_INTERRUPTS PrintDebug("INTAK cycle completed for irq %d\n", info->intr_state.irq_vector); #endif info->intr_state.irq_started = 1; info->intr_state.irq_pending = 0; - v3_injecting_intr(info, info->intr_state.irq_vector, EXTERNAL_IRQ); + v3_injecting_intr(info, info->intr_state.irq_vector, V3_EXTERNAL_IRQ); } if ((info->intr_state.irq_started == 1) && (guest_ctrl->exit_int_info.valid == 0)) { -#ifdef DEBUG_INTERRUPTS +#ifdef CONFIG_DEBUG_INTERRUPTS PrintDebug("Interrupt %d taken by guest\n", info->intr_state.irq_vector); #endif @@ -95,58 +94,19 @@ int v3_handle_svm_exit(struct guest_info * info) { info->intr_state.irq_started = 0; } else { -#ifdef DEBUG_INTERRUPTS +#ifdef CONFIG_DEBUG_INTERRUPTS PrintDebug("EXIT INT INFO is set (vec=%d)\n", guest_ctrl->exit_int_info.vector); #endif } - - - // Disable printing io exits due to bochs debug messages - //if (!((exit_code == VMEXIT_IOIO) && ((ushort_t)(guest_ctrl->exit_info1 >> 16) == 0x402))) { - - - if ((0) && (exit_code <= VMEXIT_EXCP14)) { - uchar_t instr[32]; - int ret; - // Dump out the instr stream - - //PrintDebug("RIP: %x\n", guest_state->rip); - PrintDebug("\n\n\nRIP Linear: %p\n", (void *)get_addr_linear(info, info->rip, &(info->segments.cs))); - - v3_print_GPRs(info); - v3_print_ctrl_regs(info); - - - // OK, now we will read the instruction - // The only difference between PROTECTED and PROTECTED_PG is whether we read - // from guest_pa or guest_va - if (info->mem_mode == PHYSICAL_MEM) { - // The real rip address is actually a combination of the rip + CS base - ret = read_guest_pa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 32, instr); - } else { - ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 32, instr); - } - - - - if (ret != 32) { - // I think we should inject a GPF into the guest - PrintDebug("Could not read instruction (ret=%d)\n", ret); - } else { - PrintDebug("Instr Stream:\n"); - PrintTraceMemDump(instr, 32); - } +#ifdef CONFIG_TELEMETRY + if (info->enable_telemetry) { + v3_telemetry_start_exit(info); } +#endif - - if (info->enable_profiler) { - rdtscll(info->profiler.start_time); - } - - //PrintDebug("SVM Returned: Exit Code: %x\n",exit_code); switch (exit_code) { @@ -176,11 +136,11 @@ int v3_handle_svm_exit(struct guest_info * info) { return -1; } } - } break; } case VMEXIT_MSR: + if (guest_ctrl->exit_info1 == 0) { if (v3_handle_msr_read(info) == -1) { return -1; @@ -195,8 +155,16 @@ int v3_handle_svm_exit(struct guest_info * info) { } break; + + case VMEXIT_CPUID: + if (v3_handle_cpuid(info) == -1) { + PrintError("Error handling CPUID\n"); + return -1; + } + + break; case VMEXIT_CR0_WRITE: -#ifdef DEBUG_CTRL_REGS +#ifdef CONFIG_DEBUG_CTRL_REGS PrintDebug("CR0 Write\n"); #endif if (v3_handle_cr0_write(info) == -1) { @@ -204,7 +172,7 @@ int v3_handle_svm_exit(struct guest_info * info) { } break; case VMEXIT_CR0_READ: -#ifdef DEBUG_CTRL_REGS +#ifdef CONFIG_DEBUG_CTRL_REGS PrintDebug("CR0 Read\n"); #endif if (v3_handle_cr0_read(info) == -1) { @@ -212,7 +180,7 @@ int v3_handle_svm_exit(struct guest_info * info) { } break; case VMEXIT_CR3_WRITE: -#ifdef DEBUG_CTRL_REGS +#ifdef CONFIG_DEBUG_CTRL_REGS PrintDebug("CR3 Write\n"); #endif if (v3_handle_cr3_write(info) == -1) { @@ -220,7 +188,7 @@ int v3_handle_svm_exit(struct guest_info * info) { } break; case VMEXIT_CR3_READ: -#ifdef DEBUG_CTRL_REGS +#ifdef CONFIG_DEBUG_CTRL_REGS PrintDebug("CR3 Read\n"); #endif if (v3_handle_cr3_read(info) == -1) { @@ -228,7 +196,7 @@ int v3_handle_svm_exit(struct guest_info * info) { } break; case VMEXIT_CR4_WRITE: -#ifdef DEBUG_CTRL_REGS +#ifdef CONFIG_DEBUG_CTRL_REGS PrintDebug("CR4 Write\n"); #endif if (v3_handle_cr4_write(info) == -1) { @@ -236,7 +204,7 @@ int v3_handle_svm_exit(struct guest_info * info) { } break; case VMEXIT_CR4_READ: -#ifdef DEBUG_CTRL_REGS +#ifdef CONFIG_DEBUG_CTRL_REGS PrintDebug("CR4 Read\n"); #endif if (v3_handle_cr4_read(info) == -1) { @@ -246,7 +214,7 @@ int v3_handle_svm_exit(struct guest_info * info) { case VMEXIT_EXCP14: { addr_t fault_addr = guest_ctrl->exit_info2; pf_error_t * error_code = (pf_error_t *)&(guest_ctrl->exit_info1); -#ifdef DEBUG_SHADOW_PAGING +#ifdef CONFIG_DEBUG_SHADOW_PAGING PrintDebug("PageFault at %p (error=%d)\n", (void *)fault_addr, *(uint_t *)error_code); #endif @@ -276,7 +244,7 @@ int v3_handle_svm_exit(struct guest_info * info) { } case VMEXIT_INVLPG: if (info->shdw_pg_mode == SHADOW_PAGING) { -#ifdef DEBUG_SHADOW_PAGING +#ifdef CONFIG_DEBUG_SHADOW_PAGING PrintDebug("Invlpg\n"); #endif if (v3_handle_shadow_invlpg(info) == -1) { @@ -303,10 +271,10 @@ int v3_handle_svm_exit(struct guest_info * info) { // handle_svm_smi(info); // ignored for now break; case VMEXIT_HLT: -#ifdef DEBUG_HALT +#ifdef CONFIG_DEBUG_HALT PrintDebug("Guest halted\n"); #endif - if (v3_handle_svm_halt(info) == -1) { + if (v3_handle_halt(info) == -1) { return -1; } break; @@ -317,7 +285,7 @@ int v3_handle_svm_exit(struct guest_info * info) { } break; case VMEXIT_WBINVD: -#ifdef DEBUG_EMULATOR +#ifdef CONFIG_DEBUG_EMULATOR PrintDebug("WBINVD\n"); #endif if (v3_handle_svm_wbinvd(info) == -1) { @@ -364,12 +332,11 @@ int v3_handle_svm_exit(struct guest_info * info) { } // END OF SWITCH (EXIT_CODE) - - if (info->enable_profiler) { - rdtscll(info->profiler.end_time); - v3_profile_exit(info, exit_code); +#ifdef CONFIG_TELEMETRY + if (info->enable_telemetry) { + v3_telemetry_end_exit(info, exit_code); } - +#endif if (v3_excp_pending(info)) { @@ -380,7 +347,7 @@ int v3_handle_svm_exit(struct guest_info * info) { if (info->excp_state.excp_error_code_valid) { guest_ctrl->EVENTINJ.error_code = info->excp_state.excp_error_code; guest_ctrl->EVENTINJ.ev = 1; -#ifdef DEBUG_INTERRUPTS +#ifdef CONFIG_DEBUG_INTERRUPTS PrintDebug("Injecting exception %d with error code %x\n", excp, guest_ctrl->EVENTINJ.error_code); #endif } @@ -388,14 +355,14 @@ int v3_handle_svm_exit(struct guest_info * info) { guest_ctrl->EVENTINJ.vector = excp; guest_ctrl->EVENTINJ.valid = 1; -#ifdef DEBUG_INTERRUPTS +#ifdef CONFIG_DEBUG_INTERRUPTS PrintDebug("Injecting Exception %d (EIP=%p)\n", guest_ctrl->EVENTINJ.vector, (void *)(addr_t)info->rip); #endif v3_injecting_excp(info, excp); } else if (info->intr_state.irq_started == 1) { -#ifdef DEBUG_INTERRUPTS +#ifdef CONFIG_DEBUG_INTERRUPTS PrintDebug("IRQ pending from previous injection\n"); #endif guest_ctrl->guest_ctrl.V_IRQ = 1; @@ -403,21 +370,17 @@ int v3_handle_svm_exit(struct guest_info * info) { guest_ctrl->guest_ctrl.V_IGN_TPR = 1; guest_ctrl->guest_ctrl.V_INTR_PRIO = 0xf; - } else if (v3_intr_pending(info)) { + } else { + switch (v3_intr_pending(info)) { + case V3_EXTERNAL_IRQ: { + uint32_t irq = v3_get_intr(info); - switch (v3_get_intr_type(info)) { - case EXTERNAL_IRQ: { - uint_t irq = v3_get_intr_number(info); - - // check to see if ==-1 (non exists) - - guest_ctrl->guest_ctrl.V_IRQ = 1; guest_ctrl->guest_ctrl.V_INTR_VECTOR = irq; guest_ctrl->guest_ctrl.V_IGN_TPR = 1; guest_ctrl->guest_ctrl.V_INTR_PRIO = 0xf; -#ifdef DEBUG_INTERRUPTS +#ifdef CONFIG_DEBUG_INTERRUPTS PrintDebug("Injecting Interrupt %d (EIP=%p)\n", guest_ctrl->guest_ctrl.V_INTR_VECTOR, (void *)(addr_t)info->rip); @@ -425,27 +388,24 @@ int v3_handle_svm_exit(struct guest_info * info) { info->intr_state.irq_pending = 1; info->intr_state.irq_vector = irq; - + break; } - case NMI: + case V3_NMI: guest_ctrl->EVENTINJ.type = SVM_INJECTION_NMI; break; - case SOFTWARE_INTR: + case V3_SOFTWARE_INTR: guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR; break; - case VIRTUAL_INTR: - guest_ctrl->EVENTINJ.type = SVM_INJECTION_VIRTUAL_INTR; + case V3_VIRTUAL_IRQ: + guest_ctrl->EVENTINJ.type = SVM_INJECTION_IRQ; break; - - case INVALID_INTR: + + case V3_INVALID_INTR: default: - PrintError("Attempted to issue an invalid interrupt\n"); - return -1; + break; } - } else { - //PrintDebug("Not interrupts or exceptions pending\n"); } @@ -466,7 +426,7 @@ int v3_handle_svm_exit(struct guest_info * info) { guest_state->rsp = info->vm_regs.rsp; - set_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments)); + v3_set_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments)); if (exit_code == VMEXIT_INTR) { //PrintDebug("INTR ret IP = %x\n", guest_state->rip);