X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=e67a7020c418c6de835769cc5685f46237848d84;hb=fa7a42a55338e5fa49ec760b367225ca752df4fd;hp=83f76283b35933f40395705bfa00cc1e81157724;hpb=56447cc42b250554dc3e49dd805d198a0e9a256c;p=palacios.git diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c index 83f7628..e67a702 100644 --- a/palacios/src/palacios/svm_handler.c +++ b/palacios/src/palacios/svm_handler.c @@ -1,9 +1,10 @@ #include #include #include -#include +#include #include #include +#include #include @@ -38,10 +39,41 @@ int handle_svm_exit(struct guest_info * info) { // Disable printing io exits due to bochs debug messages - if (!((exit_code == VMEXIT_IOIO) && ((ushort_t)(guest_ctrl->exit_info1 >> 16) == 0x402))) { + //if (!((exit_code == VMEXIT_IOIO) && ((ushort_t)(guest_ctrl->exit_info1 >> 16) == 0x402))) { - PrintDebug("SVM Returned: Exit Code: %x \t\t(tsc=%ul)\n",exit_code, (uint_t)info->time_state.guest_tsc); + + PrintDebug("SVM Returned: Exit Code: 0x%x \t\t(tsc=%ul)\n",exit_code, (uint_t)info->time_state.guest_tsc); + + if (exit_code < 0x4f) { + char instr[32]; + int ret; + // Dump out the instr stream + + //PrintDebug("RIP: %x\n", guest_state->rip); + PrintDebug("RIP Linear: %x\n", get_addr_linear(info, info->rip, &(info->segments.cs))); + + // 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); + } } + + + // } // PrintDebugVMCB((vmcb_t*)(info->vmm_data)); @@ -106,17 +138,22 @@ int handle_svm_exit(struct guest_info * info) { PrintDebug("PageFault at %x (error=%d)\n", fault_addr, *error_code); - if (info->page_mode == SHADOW_PAGING) { + if (info->shdw_pg_mode == SHADOW_PAGING) { if (handle_shadow_pagefault(info, fault_addr, *error_code) == -1) { return -1; } } else { + PrintDebug("Page fault in un implemented paging mode\n"); + return -1; } + } else if (exit_code == VMEXIT_NPF) { + PrintDebug("Currently unhandled Nested Page Fault\n"); + return -1; } else if (exit_code == VMEXIT_INVLPG) { - if (info->page_mode == SHADOW_PAGING) { + if (info->shdw_pg_mode == SHADOW_PAGING) { PrintDebug("Invlpg\n"); if (handle_shadow_invlpg(info) == -1) { return -1; @@ -131,9 +168,15 @@ int handle_svm_exit(struct guest_info * info) { // handle_svm_intr(info); + } else if (exit_code == VMEXIT_SMI) { + + // handle_svm_smi(info); // ignored for now + } else if (exit_code == VMEXIT_HLT) { PrintDebug("Guest halted\n"); - return -1; + if (handle_svm_halt(info) == -1) { + return -1; + } } else { addr_t rip_addr; char buf[15]; @@ -158,8 +201,18 @@ int handle_svm_exit(struct guest_info * info) { - if (guest_pa_to_host_pa(info, guest_state->rip, &host_addr) == -1) { - PrintDebug("Could not translate guest_state->rip to host address\n"); + if (info->mem_mode == PHYSICAL_MEM) { + if (guest_pa_to_host_pa(info, guest_state->rip, &host_addr) == -1) { + PrintDebug("Could not translate guest_state->rip to host address\n"); + return -1; + } + } else if (info->mem_mode == VIRTUAL_MEM) { + if (guest_va_to_host_pa(info, guest_state->rip, &host_addr) == -1) { + PrintDebug("Could not translate guest_state->rip to host address\n"); + return -1; + } + } else { + PrintDebug("Invalid memory mode\n"); return -1; } @@ -169,7 +222,11 @@ int handle_svm_exit(struct guest_info * info) { PrintDebug("Reading from 0x%x in guest\n", rip_addr); - read_guest_pa_memory(info, rip_addr, 15, buf); + if (info->mem_mode == PHYSICAL_MEM) { + read_guest_pa_memory(info, rip_addr, 15, buf); + } else { + read_guest_va_memory(info, rip_addr, 15, buf); + } PrintTraceMemDump(buf, 15); @@ -197,6 +254,8 @@ int handle_svm_exit(struct guest_info * info) { guest_ctrl->guest_ctrl.V_IGN_TPR = 1; guest_ctrl->guest_ctrl.V_INTR_PRIO = 0xf; + PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->guest_ctrl.V_INTR_VECTOR, info->rip); + injecting_intr(info, irq, EXTERNAL_IRQ); break; @@ -213,17 +272,20 @@ int handle_svm_exit(struct guest_info * info) { if (info->intr_state.excp_error_code) { guest_ctrl->EVENTINJ.error_code = info->intr_state.excp_error_code; guest_ctrl->EVENTINJ.ev = 1; + PrintDebug("Injecting error code %x\n", guest_ctrl->EVENTINJ.error_code); } guest_ctrl->EVENTINJ.vector = excp; + guest_ctrl->EVENTINJ.valid = 1; + PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->EVENTINJ.vector, info->rip); injecting_intr(info, excp, EXCEPTION); break; } - case SOFTWARE: + case SOFTWARE_INTR: guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR; break; - case VIRTUAL: + case VIRTUAL_INTR: guest_ctrl->EVENTINJ.type = SVM_INJECTION_VIRTUAL_INTR; break; @@ -233,7 +295,6 @@ int handle_svm_exit(struct guest_info * info) { return -1; } - PrintDebug("Injecting Interrupt %d (EIP=%x)\n", guest_ctrl->EVENTINJ.vector, info->rip); } @@ -255,7 +316,7 @@ int handle_svm_exit(struct guest_info * info) { set_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments)); if (exit_code == VMEXIT_INTR) { - PrintDebug("INTR ret IP = %x\n", guest_state->rip); + //PrintDebug("INTR ret IP = %x\n", guest_state->rip); } return 0;