X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=a781fe317fe801ac9261f321f7145eeaf5a45598;hb=9a9c14099c09e9ed86d8ac2f73f7406d0ac8a90b;hp=03a99f5ab4e0fed261c5d07560493babff889284;hpb=3de2fb2103ceb8bb1837aa1432a18ff976880dbc;p=palacios.releases.git

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 03a99f5..a781fe3 100644
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -36,6 +36,8 @@
 #include <palacios/svm_msr.h>
 
 #include <palacios/vmm_rbtree.h>
+#include <palacios/vmm_barrier.h>
+
 
 #include <palacios/vmm_direct_paging.h>
 
@@ -81,6 +83,24 @@ static vmcb_t * Allocate_VMCB() {
 }
 
 
+static int v3_svm_handle_efer_write(struct guest_info * core, uint_t msr, struct v3_msr src, void * priv_data)
+{
+    int status;
+
+    // Call arch-independent handler
+    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;
+    }
+
+    return 0;
+}
+
 
 static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * core) {
     vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA(vmcb);
@@ -221,7 +241,7 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * core) {
 
     v3_hook_msr(core->vm_info, EFER_MSR, 
 		&v3_handle_efer_read,
-		&v3_handle_efer_write, 
+		&v3_svm_handle_efer_write, 
 		core);
 
     if (core->shdw_pg_mode == SHADOW_PAGING) {
@@ -425,6 +445,18 @@ static int update_irq_entry_state(struct guest_info * info) {
 		break;
 	    case V3_SOFTWARE_INTR:
 		guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR;
+
+#ifdef V3_CONFIG_DEBUG_INTERRUPTS
+		PrintDebug("Injecting software interrupt --  type: %d, vector: %d\n", 
+			   SVM_INJECTION_SOFT_INTR, info->intr_core_state.swintr_vector);
+#endif
+		guest_ctrl->EVENTINJ.vector = info->intr_core_state.swintr_vector;
+		guest_ctrl->EVENTINJ.valid = 1;
+            
+		/* reset swintr state */
+		info->intr_core_state.swintr_posted = 0;
+		info->intr_core_state.swintr_vector = 0;
+		
 		break;
 	    case V3_VIRTUAL_IRQ:
 		guest_ctrl->EVENTINJ.type = SVM_INJECTION_IRQ;
@@ -577,10 +609,6 @@ int v3_svm_enter(struct guest_info * info) {
 	    PrintError("  last Exit was %d (exit code=0x%llx)\n", v3_last_exit, (uint64_t) exit_code);
 	    return -1;
 	}
-    if (v3_handle_svm_exit(info, exit_code, exit_info1, exit_info2) != 0) {
-	PrintError("Error in SVM exit handler\n");
-	PrintError("  last exit was %d\n", v3_last_exit);
-	return -1;
     }
 
 
@@ -665,6 +693,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;
@@ -764,11 +794,11 @@ int v3_is_svm_capable() {
 
 static int has_svm_nested_paging() {
     uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0;
-
+    
     v3_cpuid(CPUID_SVM_REV_AND_FEATURE_IDS, &eax, &ebx, &ecx, &edx);
-
+    
     //PrintDebug("CPUID_EXT_FEATURE_IDS_edx=0x%x\n", edx);
-
+    
     if ((edx & CPUID_SVM_REV_AND_FEATURE_IDS_edx_np) == 0) {
 	V3_Print("SVM Nested Paging not supported\n");
 	return 0;
@@ -776,8 +806,8 @@ static int has_svm_nested_paging() {
 	V3_Print("SVM Nested Paging supported\n");
 	return 1;
     }
-}
-
+ }
+ 
 
 
 void v3_init_svm_cpu(int cpu_id) {