X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=05fd183b5e55ffb8ff185be054fad77b6661e7d1;hp=c9ef918a7a4676106cb444ebeefc39f377d02663;hb=60ad6a41c6d0ee08ed689e8505eb0c3df0c2a289;hpb=915d7c977583d5f376624216d30676d412a989a7 diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c index c9ef918..05fd183 100644 --- a/palacios/src/palacios/svm.c +++ b/palacios/src/palacios/svm.c @@ -39,6 +39,7 @@ #include #include +#include #ifdef V3_CONFIG_CHECKPOINT @@ -52,6 +53,13 @@ #include +#ifdef V3_CONFIG_MEM_TRACK +#include +#endif + +#ifdef V3_CONFIG_TM_FUNC +#include +#endif #ifndef V3_CONFIG_DEBUG_SVM #undef PrintDebug @@ -59,6 +67,7 @@ #endif + uint32_t v3_last_exit; // This is a global pointer to the host's VMCB @@ -74,7 +83,7 @@ extern int v3_svm_launch(vmcb_t * vmcb, struct v3_gprs * vm_regs, vmcb_t * host_ static vmcb_t * Allocate_VMCB() { vmcb_t * vmcb_page = NULL; - addr_t vmcb_pa = (addr_t)V3_AllocPages(1); + addr_t vmcb_pa = (addr_t)V3_AllocPages(1); // need not be shadow safe, not exposed to guest if ((void *)vmcb_pa == NULL) { PrintError(VM_NONE, VCORE_NONE, "Error allocating VMCB\n"); @@ -154,6 +163,10 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * core) { ctrl_area->exceptions.nmi = 1; */ + +#ifdef V3_CONFIG_TM_FUNC + v3_tm_set_excp_intercepts(ctrl_area); +#endif ctrl_area->instrs.NMI = 1; @@ -281,11 +294,13 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * core) { PrintDebug(core->vm_info, core, "Created\n"); core->ctrl_regs.cr0 |= 0x80000000; - core->ctrl_regs.cr3 = core->direct_map_pt; + + v3_activate_passthrough_pt(core); ctrl_area->cr_reads.cr0 = 1; ctrl_area->cr_writes.cr0 = 1; - //ctrl_area->cr_reads.cr4 = 1; + //intercept cr4 read so shadow pager can use PAE independently of guest + ctrl_area->cr_reads.cr4 = 1; ctrl_area->cr_writes.cr4 = 1; ctrl_area->cr_reads.cr3 = 1; ctrl_area->cr_writes.cr3 = 1; @@ -622,12 +637,17 @@ int v3_svm_enter(struct guest_info * info) { // Conditionally yield the CPU if the timeslice has expired v3_schedule(info); +#ifdef V3_CONFIG_MEM_TRACK + v3_mem_track_entry(info); +#endif + // Update timer devices after being in the VM before doing // IRQ updates, so that any interrupts they raise get seen // immediately. v3_advance_time(info, NULL); v3_update_timers(info); + // disable global interrupts for vm state transition v3_clgi(); @@ -666,6 +686,8 @@ int v3_svm_enter(struct guest_info * info) { guest_state->rip = info->rip; guest_state->rsp = info->vm_regs.rsp; + V3_FP_ENTRY_RESTORE(info); + #ifdef V3_CONFIG_SYMCALL if (info->sym_core_state.symcall_state.sym_call_active == 0) { update_irq_entry_state(info); @@ -674,6 +696,10 @@ int v3_svm_enter(struct guest_info * info) { update_irq_entry_state(info); #endif +#ifdef V3_CONFIG_TM_FUNC + v3_tm_check_intr_state(info, guest_ctrl, guest_state); +#endif + /* ** */ @@ -733,6 +759,8 @@ int v3_svm_enter(struct guest_info * info) { info->num_exits++; + V3_FP_EXIT_SAVE(info); + // Save Guest state from VMCB info->rip = guest_state->rip; info->vm_regs.rsp = guest_state->rsp; @@ -780,6 +808,7 @@ int v3_svm_enter(struct guest_info * info) { // reenable global interrupts after vm exit v3_stgi(); + // Conditionally yield the CPU if the timeslice has expired v3_schedule(info); @@ -789,6 +818,7 @@ int v3_svm_enter(struct guest_info * info) { v3_advance_time(info, NULL); v3_update_timers(info); + { int ret = v3_handle_svm_exit(info, exit_code, exit_info1, exit_info2); @@ -804,6 +834,10 @@ int v3_svm_enter(struct guest_info * info) { v3_handle_timeouts(info, guest_cycles); } +#ifdef V3_CONFIG_MEM_TRACK + v3_mem_track_exit(info); +#endif + return 0; } @@ -815,6 +849,18 @@ int v3_start_svm_guest(struct guest_info * info) { PrintDebug(info->vm_info, info, "Starting SVM core %u (on logical core %u)\n", info->vcpu_id, info->pcpu_id); + +#ifdef V3_CONFIG_HVM + if (v3_setup_hvm_hrt_core_for_boot(info)) { + PrintError(info->vm_info, info, "Failed to setup HRT core...\n"); + return -1; + } +#endif + + + + + while (1) { if (info->core_run_state == CORE_STOPPED) { @@ -823,7 +869,9 @@ int v3_start_svm_guest(struct guest_info * info) { info->core_run_state = CORE_RUNNING; } else { PrintDebug(info->vm_info, info, "SVM core %u (on %u): Waiting for core initialization\n", info->vcpu_id, info->pcpu_id); - + + V3_NO_WORK(info); + while (info->core_run_state == CORE_STOPPED) { if (info->vm_info->run_state == VM_STOPPED) { @@ -831,9 +879,12 @@ int v3_start_svm_guest(struct guest_info * info) { return 0; } - v3_yield(info,-1); + V3_STILL_NO_WORK(info); + //PrintDebug(info->vm_info, info, "SVM core %u: still waiting for INIT\n", info->vcpu_id); } + + V3_HAVE_WORK_AGAIN(info); PrintDebug(info->vm_info, info, "SVM core %u(on %u) initialized\n", info->vcpu_id, info->pcpu_id); @@ -859,7 +910,6 @@ int v3_start_svm_guest(struct guest_info * info) { info->core_run_state = CORE_STOPPED; break; } - #ifdef V3_CONFIG_PMU_TELEMETRY v3_pmu_telemetry_start(info); @@ -1042,7 +1092,7 @@ void v3_init_svm_cpu(int cpu_id) { V3_Print(VM_NONE, VCORE_NONE, "SVM Enabled\n"); // Setup the host state save area - host_vmcbs[cpu_id] = (addr_t)V3_AllocPages(4); + host_vmcbs[cpu_id] = (addr_t)V3_AllocPages(4); // need not be shadow-safe, not exposed to guest if (!host_vmcbs[cpu_id]) { PrintError(VM_NONE, VCORE_NONE, "Failed to allocate VMCB\n"); @@ -1287,7 +1337,7 @@ void Init_VMCB_pe(vmcb_t *vmcb, struct guest_info vm_info) { ctrl_area->instrs.IOIO_PROT = 1; - ctrl_area->IOPM_BASE_PA = (uint_t)V3_AllocPages(3); + ctrl_area->IOPM_BASE_PA = (uint_t)V3_AllocPages(3); // need not be shadow-safe, not exposed to guest if (!ctrl_area->IOPM_BASE_PA) { PrintError(core->vm_info, core, "Cannot allocate IO bitmap\n");