X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=97af190fe5f6354b277d25c3b5502ec7dec50f8c;hb=f2ce51f30bbaf99f5ab6cc229e2503a2624f5525;hp=536f7dae5a12c14e92bde87e40e27c9fcfc0808e;hpb=4290e5f20a4ea5e5f32cb8228ac4d7446dc1021b;p=palacios.git diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index 536f7da..97af190 100644 --- a/palacios/src/palacios/vmm.c +++ b/palacios/src/palacios/vmm.c @@ -24,6 +24,7 @@ #include #include #include +#include #ifdef CONFIG_SVM #include @@ -32,37 +33,26 @@ #include #endif +#ifdef CONFIG_VNET +#include +#endif + v3_cpu_arch_t v3_cpu_types[CONFIG_MAX_CPUS]; struct v3_os_hooks * os_hooks = NULL; +int v3_dbg_enable = 0; -static struct guest_info * allocate_guest() { - void * info = V3_Malloc(sizeof(struct guest_info)); - memset(info, 0, sizeof(struct guest_info)); - return info; -} - - -struct vmm_init_arg { - int cpu_id; - struct v3_ctrl_ops * vmm_ops; -}; static void init_cpu(void * arg) { - struct vmm_init_arg * vmm_arg = (struct vmm_init_arg *)arg; - int cpu_id = vmm_arg->cpu_id; - struct v3_ctrl_ops * vmm_ops = vmm_arg->vmm_ops; + uint32_t cpu_id = (uint32_t)(addr_t)arg; #ifdef CONFIG_SVM if (v3_is_svm_capable()) { PrintDebug("Machine is SVM Capable\n"); v3_init_svm_cpu(cpu_id); - if (cpu_id == 0) { - v3_init_svm_hooks(vmm_ops); - } } else #endif #ifdef CONFIG_VMX @@ -70,9 +60,6 @@ static void init_cpu(void * arg) { PrintDebug("Machine is VMX Capable\n"); v3_init_vmx_cpu(cpu_id); - if (cpu_id == 0) { - v3_init_vmx_hooks(vmm_ops); - } } else #endif { @@ -82,10 +69,10 @@ static void init_cpu(void * arg) { -void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops, int num_cpus) { +void Init_V3(struct v3_os_hooks * hooks, int num_cpus) { int i; - struct vmm_init_arg arg; - arg.vmm_ops = vmm_ops; + + V3_Print("V3 Print statement to fix a Kitten page fault bug\n"); // Set global variables. os_hooks = hooks; @@ -97,28 +84,84 @@ void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops, int num_c // Register all the possible device types v3_init_devices(); + // Register all shadow paging handlers + V3_init_shdw_paging(); -#ifdef INSTRUMENT_VMM + +#ifdef CONFIG_SYMMOD + V3_init_symmod(); +#endif + +#ifdef CONFIG_INSTRUMENT_VMM v3_init_instrumentation(); #endif - vmm_ops->allocate_guest = &allocate_guest; +#ifdef CONFIG_VNET + V3_init_vnet(); +#endif if ((hooks) && (hooks->call_on_cpu)) { for (i = 0; i < num_cpus; i++) { - arg.cpu_id = i; V3_Print("Initializing VMM extensions on cpu %d\n", i); - hooks->call_on_cpu(i, &init_cpu, &arg); + hooks->call_on_cpu(i, &init_cpu, (void *)(addr_t)i); } } +} + + +v3_cpu_arch_t v3_get_cpu_type(int cpu_id) { + return v3_cpu_types[cpu_id]; +} +struct v3_vm_info * v3_create_vm(void * cfg) { + struct v3_vm_info * vm = v3_config_guest(cfg); + + if (vm == NULL) { + PrintError("Could not configure guest\n"); + return NULL; + } + + return vm; } +int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { + int i = 0; + V3_Print("V3 -- Starting VM\n"); + + + for (i = 0; i < vm->num_cores; i++) { + struct guest_info * info = &(vm->cores[i]); + + /* GRUESOM HACK... */ + // vm->cpu_id = v3_get_cpu_id(); + + switch (v3_cpu_types[info->cpu_id]) { +#ifdef CONFIG_SVM + case V3_SVM_CPU: + case V3_SVM_REV3_CPU: + return v3_start_svm_guest(info); + break; +#endif +#if CONFIG_VMX + case V3_VMX_CPU: + case V3_VMX_EPT_CPU: + return v3_start_vmx_guest(info); + break; +#endif + default: + PrintError("Attemping to enter a guest on an invalid CPU\n"); + return -1; + } + } + + return 0; +} + #ifdef __V3_32BIT__ @@ -159,11 +202,12 @@ v3_cpu_mode_t v3_get_host_cpu_mode() { } while (0) \ + void v3_yield_cond(struct guest_info * info) { uint64_t cur_cycle; rdtscll(cur_cycle); - if (cur_cycle > (info->yield_start_cycle + info->yield_cycle_period)) { + if (cur_cycle > (info->yield_start_cycle + info->vm_info->yield_cycle_period)) { /* PrintDebug("Conditional Yield (cur_cyle=%p, start_cycle=%p, period=%p)\n", @@ -174,6 +218,7 @@ void v3_yield_cond(struct guest_info * info) { } } + /* * unconditional cpu yield * if the yielding thread is a guest context, the guest quantum is reset on resumption @@ -189,12 +234,42 @@ void v3_yield(struct guest_info * info) { -void v3_interrupt_cpu(struct guest_info * info, int logical_cpu) { + +void v3_print_cond(const char * fmt, ...) { + if (v3_dbg_enable == 1) { + char buf[2048]; + va_list ap; + + va_start(ap, fmt); + vsnprintf(buf, 2048, fmt, ap); + va_end(ap); + + V3_Print("%s", buf); + } +} + + + + +void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu) { extern struct v3_os_hooks * os_hooks; if ((os_hooks) && (os_hooks)->interrupt_cpu) { - (os_hooks)->interrupt_cpu(info, logical_cpu); + (os_hooks)->interrupt_cpu(vm, logical_cpu); + } +} + + + +unsigned int v3_get_cpu_id() { + extern struct v3_os_hooks * os_hooks; + unsigned int ret = (unsigned int)-1; + + if ((os_hooks) && (os_hooks)->get_cpu) { + ret = os_hooks->get_cpu(); } + + return ret; } @@ -204,19 +279,17 @@ int v3_vm_enter(struct guest_info * info) { #ifdef CONFIG_SVM case V3_SVM_CPU: case V3_SVM_REV3_CPU: - v3_svm_enter(info); + return v3_svm_enter(info); break; #endif -#if CONFIG_VMX && 0 +#if CONFIG_VMX case V3_VMX_CPU: case V3_VMX_EPT_CPU: - v3_vmx_enter(info); + return v3_vmx_enter(info); break; #endif default: PrintError("Attemping to enter a guest on an invalid CPU\n"); return -1; } - - return 0; }