X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=fe22f0b10441f8f63da69dab807aed5b49714ffc;hb=cd3edffa0e451af761b9dcee021ca06ebb301345;hp=44673cb0403337e7ff68160bbb35637a92499da5;hpb=28cfe68985ef4360c9bd7428a19c222b295e9d85;p=palacios.git diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c index 44673cb..fe22f0b 100644 --- a/palacios/src/palacios/vm_guest.c +++ b/palacios/src/palacios/vm_guest.c @@ -28,7 +28,7 @@ #include #include #include - +#include v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info) { @@ -160,8 +160,7 @@ const uchar_t * v3_mem_mode_to_str(v3_mem_mode_t mode) { } -void v3_print_segments(struct guest_info * info) { - struct v3_segments * segs = &(info->segments); +void v3_print_segments(struct v3_segments * segs) { int i = 0; struct v3_segment * seg_ptr; @@ -199,7 +198,7 @@ int v3_translate_segment(struct guest_info * info, uint16_t selector, struct v3_ return -1; } - if (guest_va_to_host_va(info, gdt->base, &gdt_addr) == -1) { + if (v3_gva_to_hva(info, gdt->base, &gdt_addr) == -1) { PrintError("Unable to translate GDT address\n"); return -1; } @@ -267,7 +266,7 @@ void v3_print_guest_state(struct guest_info * info) { V3_Print("NumExits: %u\n", (uint32_t)info->num_exits); - v3_print_segments(info); + v3_print_segments(&(info->segments)); v3_print_ctrl_regs(info); if (info->shdw_pg_mode == SHADOW_PAGING) { @@ -279,6 +278,8 @@ void v3_print_guest_state(struct guest_info * info) { } v3_print_GPRs(info); + v3_print_mem_map(info->vm_info); + v3_print_stack(info); } @@ -295,12 +296,12 @@ void v3_print_stack(struct guest_info * info) { V3_Print("Stack at %p:\n", (void *)linear_addr); if (info->mem_mode == PHYSICAL_MEM) { - if (guest_pa_to_host_va(info, linear_addr, &host_addr) == -1) { + if (v3_gpa_to_hva(info, linear_addr, &host_addr) == -1) { PrintError("Could not translate Stack address\n"); return; } } else if (info->mem_mode == VIRTUAL_MEM) { - if (guest_va_to_host_va(info, linear_addr, &host_addr) == -1) { + if (v3_gva_to_hva(info, linear_addr, &host_addr) == -1) { PrintError("Could not translate Virtual Stack address\n"); return; } @@ -311,7 +312,7 @@ void v3_print_stack(struct guest_info * info) { // We start i at one because the current stack pointer points to an unused stack element for (i = 0; i <= 24; i++) { if (cpu_mode == LONG) { - V3_Print("\t%p\n", (void *)*(uint64_t *)(host_addr + (i * 8))); + V3_Print("\t%p\n", (void *)*(addr_t *)(host_addr + (i * 8))); } else if (cpu_mode == REAL) { V3_Print("Don't currently handle 16 bit stacks... \n"); } else { @@ -358,3 +359,170 @@ void v3_print_GPRs(struct guest_info * info) { } #endif + + +#include +#include +static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_data) { + v3_cpu_arch_t cpu_type = v3_get_cpu_type(v3_get_cpu_id()); + int cpu_valid = 0; + + v3_print_guest_state(core); + + // init SVM/VMX +#ifdef CONFIG_SVM + if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) { + cpu_valid = 1; + PrintDebugVMCB((vmcb_t *)(core->vmm_data)); + } +#endif +#ifdef CONFIG_VMX + if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) { + cpu_valid = 1; + v3_print_vmcs(); + } +#endif + if (!cpu_valid) { + PrintError("Invalid CPU Type 0x%x\n", cpu_type); + return -1; + } + + + return 0; +} + + +#ifdef CONFIG_SVM +#include +#include +#include +#endif + +#ifdef CONFIG_VMX +#include +#include +#include +#endif + + +int v3_init_vm(struct v3_vm_info * vm) { + v3_cpu_arch_t cpu_type = v3_get_cpu_type(v3_get_cpu_id()); + int cpu_valid = 0; + + if (v3_get_foreground_vm() == NULL) { + v3_set_foreground_vm(vm); + } + +#ifdef CONFIG_TELEMETRY + v3_init_telemetry(vm); +#endif + + v3_init_hypercall_map(vm); + v3_init_io_map(vm); + v3_init_msr_map(vm); + v3_init_cpuid_map(vm); + v3_init_host_events(vm); + v3_init_intr_routers(vm); + + // Initialize the memory map + if (v3_init_mem_map(vm) == -1) { + PrintError("Could not initialize shadow map\n"); + return -1; + } + + v3_init_mem_hooks(vm); + + if (v3_init_shdw_impl(vm) == -1) { + PrintError("VM initialization error in shadow implementaion\n"); + return -1; + } + + + +#ifdef CONFIG_SYMBIOTIC + v3_init_symbiotic_vm(vm); +#endif + + v3_init_dev_mgr(vm); + + + // init SVM/VMX +#ifdef CONFIG_SVM + if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) { + v3_init_svm_io_map(vm); + v3_init_svm_msr_map(vm); + cpu_valid = 1; + } +#endif +#ifdef CONFIG_VMX + if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) { + v3_init_vmx_io_map(vm); + v3_init_vmx_msr_map(vm); + cpu_valid = 1; + } +#endif + if (!cpu_valid) { + PrintError("Invalid CPU Type 0x%x\n", cpu_type); + return -1; + } + + v3_register_hypercall(vm, GUEST_INFO_HCALL, info_hcall, NULL); + + V3_Print("GUEST_INFO_HCALL=%x\n", GUEST_INFO_HCALL); + + return 0; +} + +int v3_init_core(struct guest_info * core) { + v3_cpu_arch_t cpu_type = v3_get_cpu_type(v3_get_cpu_id()); + int cpu_valid = 0; + struct v3_vm_info * vm = core->vm_info; + + /* + * Initialize the subsystem data strutures + */ +#ifdef CONFIG_TELEMETRY + v3_init_core_telemetry(core); +#endif + + if (core->shdw_pg_mode == SHADOW_PAGING) { + v3_init_shdw_pg_state(core); + } + + v3_init_time(core); + v3_init_intr_controllers(core); + v3_init_exception_state(core); + + v3_init_decoder(core); + + +#ifdef CONFIG_SYMBIOTIC + v3_init_symbiotic_core(core); +#endif + + // init SVM/VMX +#ifdef CONFIG_SVM + if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) { + if (v3_init_svm_vmcb(core, vm->vm_class) == -1) { + PrintError("Error in SVM initialization\n"); + return -1; + } + cpu_valid = 1; + } +#endif +#ifdef CONFIG_VMX + if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) { + if (v3_init_vmx_vmcs(core, vm->vm_class) == -1) { + PrintError("Error in VMX initialization\n"); + return -1; + } + cpu_valid = 1; + } +#endif + if (!cpu_valid) { + PrintError("Invalid CPU Type 0x%x\n", cpu_type); + return -1; + } + + return 0; +}