X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=5319f9040100d38300d82a312a17803e2d44e6aa;hb=f88a692d094459f0326c5c891df5ea81b5476ba6;hp=f366a762e4654f12ae61e1646c921a89ea647f73;hpb=a7b07dc7f3bd9c28b0fbfb3c685a306326d56e76;p=palacios.git

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index f366a76..5319f90 100644
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -1,4 +1,3 @@
-
 /* 
  * This file is part of the Palacios Virtual Machine Monitor developed
  * by the V3VEE Project with funding from the United States National 
@@ -36,6 +35,11 @@
 #include <palacios/svm_msr.h>
 
 #include <palacios/vmm_rbtree.h>
+#include <palacios/vmm_barrier.h>
+
+#ifdef V3_CONFIG_CHECKPOINT
+#include <palacios/vmm_checkpoint.h>
+#endif
 
 #include <palacios/vmm_direct_paging.h>
 
@@ -86,11 +90,12 @@ static int v3_svm_handle_efer_write(struct guest_info * core, uint_t msr, struct
     int status;
 
     // Call arch-independent handler
-    if ((status = v3_handle_efer_write(core, msr, src, priv_data)) != 0)
+    if ((status = v3_handle_efer_write(core, msr, src, priv_data)) != 0) {
 	return status;
+    }
 
     // SVM-specific code
-    if (core->shdw_pg_mode == NESTED_PAGING) {
+    {
 	// Ensure that hardware visible EFER.SVME bit is set (SVM Enable)
 	struct efer_64 * hw_efer = (struct efer_64 *)&(core->ctrl_regs.efer);
 	hw_efer->svme = 1;
@@ -337,6 +342,68 @@ int v3_deinit_svm_vmcb(struct guest_info * core) {
 }
 
 
+#ifdef V3_CONFIG_CHECKPOINT
+int v3_svm_save_core(struct guest_info * core, void * ctx){
+
+    v3_chkpt_save(ctx, "vmcb_data", PAGE_SIZE, core->vmm_data);
+
+    return 0;
+}
+
+int v3_svm_load_core(struct guest_info * core, void * chkpt_ctx){
+    struct cr0_32 * shadow_cr0;
+    vmcb_saved_state_t * guest_state; 
+    vmcb_ctrl_t * guest_ctrl;
+
+
+
+    if (v3_chkpt_load(chkpt_ctx, "vmcb_data", PAGE_SIZE, core->vmm_data) == -1){
+	return -1;
+    }
+
+    guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t *)(core->vmm_data));
+    guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t *)(core->vmm_data));
+
+	
+    core->rip = guest_state->rip;
+    core->vm_regs.rsp = guest_state->rsp;
+    core->vm_regs.rax = guest_state->rax;
+
+    core->cpl = guest_state->cpl;
+
+    core->ctrl_regs.cr0 = guest_state->cr0;
+    core->ctrl_regs.cr2 = guest_state->cr2;
+    core->ctrl_regs.cr4 = guest_state->cr4;
+    core->dbg_regs.dr6 = guest_state->dr6;
+    core->dbg_regs.dr7 = guest_state->dr7;
+    core->ctrl_regs.cr8 = guest_ctrl->guest_ctrl.V_TPR;
+    core->ctrl_regs.rflags = guest_state->rflags;
+    core->ctrl_regs.efer = guest_state->efer;
+
+		
+    shadow_cr0 = (struct cr0_32 *)&(core->ctrl_regs.cr0);
+
+
+    if (core->shdw_pg_mode == SHADOW_PAGING) {
+	if (v3_get_vm_mem_mode(core) == VIRTUAL_MEM) {
+	    if (v3_activate_shadow_pt(core) == -1) {
+		PrintError("Failed to activate shadow page tables\n");
+		return -1;
+	    }
+	} else {
+	    if (v3_activate_passthrough_pt(core) == -1) {
+		PrintError("Failed to activate passthrough page tables\n");
+		return -1;
+	    }
+	}
+    }
+
+
+    v3_get_vmcb_segments((vmcb_t *)(core->vmm_data), &(core->segments));
+    return 0;
+}
+#endif
+
 static int update_irq_exit_state(struct guest_info * info) {
     vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
 
@@ -543,7 +610,8 @@ int v3_svm_enter(struct guest_info * info) {
 #endif
 
     v3_time_enter_vm(info);
-    guest_ctrl->TSC_OFFSET = v3_tsc_host_offset(&info->time_state);
+    // guest_ctrl->TSC_OFFSET = v3_tsc_host_offset(&info->time_state);
+
 
     //V3_Print("Calling v3_svm_launch\n");
 
@@ -632,6 +700,9 @@ int v3_start_svm_guest(struct guest_info * info) {
 	}
 
 	PrintDebug("SVM core %u(on %u) initialized\n", info->vcpu_id, info->pcpu_id);
+
+	// We'll be paranoid about race conditions here
+	v3_wait_at_barrier(info);
     } 
 
     PrintDebug("SVM core %u(on %u): I am starting at CS=0x%x (base=0x%p, limit=0x%x),  RIP=0x%p\n", 
@@ -691,6 +762,8 @@ int v3_start_svm_guest(struct guest_info * info) {
 	    break;
 	}
 
+	v3_wait_at_barrier(info);
+
 
 	if (info->vm_info->run_state == VM_STOPPED) {
 	    info->core_run_state = CORE_STOPPED;