Basic HRT startup for HVM, plus assorted cleanup

[palacios.git] / palacios / src / palacios / vm_guest.c

diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c
index 365fc62..d325e6b 100644 (file)
--- a/palacios/src/palacios/vm_guest.c
+++ b/palacios/src/palacios/vm_guest.c
@@ -33,23 +33,28 @@
 #include <palacios/vmm_barrier.h>
 #include <palacios/vmm_debug.h>
 
+#ifdef V3_CONFIG_MEM_TRACK
+#include <palacios/vmm_mem_track.h>
+#endif
+
 
 v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info) {
     struct cr0_32 * cr0;
     struct efer_64 * efer;
-    struct cr4_32 * cr4 = (struct cr4_32 *)&(info->ctrl_regs.cr4);
     struct v3_segment * cs = &(info->segments.cs);
-
+    struct cr4_32 * cr4;
 
     if (info->shdw_pg_mode == SHADOW_PAGING) {
        cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0);
        efer = (struct efer_64 *)&(info->shdw_pg_state.guest_efer);
+        cr4 = (struct cr4_32 *)&(info->shdw_pg_state.guest_cr4);
     } else if (info->shdw_pg_mode == NESTED_PAGING) {
        cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0);
        efer = (struct efer_64 *)&(info->ctrl_regs.efer);
+        cr4 = (struct cr4_32 *)&(info->ctrl_regs.cr4);
     } else {
-       PrintError("Invalid Paging Mode...\n");
-       V3_ASSERT(0);
+        PrintError(info->vm_info, info, "Invalid Paging Mode...\n");
+       V3_ASSERT(info->vm_info, info, 0);
        return -1;
     }
 
@@ -82,8 +87,8 @@ uint_t v3_get_addr_width(struct guest_info * info) {
        cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0);
        efer = (struct efer_64 *)&(info->ctrl_regs.efer);
     } else {
-       PrintError("Invalid Paging Mode...\n");
-       V3_ASSERT(0);
+        PrintError(info->vm_info, info, "Invalid Paging Mode...\n");
+       V3_ASSERT(info->vm_info, info, 0);
        return -1;
     }
 
@@ -136,8 +141,8 @@ v3_mem_mode_t v3_get_vm_mem_mode(struct guest_info * info) {
     } else if (info->shdw_pg_mode == NESTED_PAGING) {
        cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0);
     } else {
-       PrintError("Invalid Paging Mode...\n");
-       V3_ASSERT(0);
+       PrintError(info->vm_info, info, "Invalid Paging Mode...\n");
+       V3_ASSERT(info->vm_info, info, 0);
        return -1;
     }
 
@@ -174,7 +179,7 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat
     extern v3_cpu_arch_t v3_mach_type;
     int cpu_valid = 0;
 
-    V3_Print("************** Guest State ************\n");
+    V3_Print(core->vm_info, core, "************** Guest State ************\n");
     v3_print_guest_state(core);
     
     // init SVM/VMX
@@ -191,7 +196,7 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat
     }
 #endif
     if (!cpu_valid) {
-       PrintError("Invalid CPU Type 0x%x\n", v3_mach_type);
+       PrintError(core->vm_info, core, "Invalid CPU Type 0x%x\n", v3_mach_type);
        return -1;
     }
     
@@ -211,24 +216,25 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat
 #include <palacios/vmx.h>
 #include <palacios/vmx_io.h>
 #include <palacios/vmx_msr.h>
+#include <palacios/vmx_exits.h>
 #endif
 
 
 int v3_init_vm(struct v3_vm_info * vm) {
     extern v3_cpu_arch_t v3_mach_type;
 
-
+    v3_init_events(vm);
 
 #ifdef V3_CONFIG_TELEMETRY
     v3_init_telemetry(vm);
 #endif
 
+    v3_init_exit_hooks(vm);
     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_exit_hooks(vm);
 
     v3_init_intr_routers(vm);
     v3_init_ext_manager(vm);
@@ -237,17 +243,30 @@ int v3_init_vm(struct v3_vm_info * vm) {
 
     // Initialize the memory map
     if (v3_init_mem_map(vm) == -1) {
-       PrintError("Could not initialize shadow map\n");
+        PrintError(vm, VCORE_NONE, "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");
+        PrintError(vm, VCORE_NONE, "VM initialization error in shadow implementaion\n");
+       return -1;
+    }
+
+    if (v3_init_passthrough_paging(vm) == -1) {
+        PrintError(vm, VCORE_NONE, "VM initialization error in passthrough paging\n");
+       return -1;
+    }
+
+    if (v3_init_nested_paging(vm) == -1) {
+        PrintError(vm, VCORE_NONE, "VM initialization error in nested paging\n");
        return -1;
     }
 
+#ifdef V3_CONFIG_MEM_TRACK
+    v3_mem_track_init(vm);
+#endif
 
     v3_init_time_vm(vm);
 
@@ -277,16 +296,17 @@ int v3_init_vm(struct v3_vm_info * vm) {
        case V3_VMX_EPT_UG_CPU:
            v3_init_vmx_io_map(vm);
            v3_init_vmx_msr_map(vm);
+           v3_init_vmx_exits(vm);
            break;
 #endif
        default:
-           PrintError("Invalid CPU Type 0x%x\n", v3_mach_type);
+           PrintError(vm, VCORE_NONE, "Invalid CPU Type 0x%x\n", v3_mach_type);
            return -1;
     }
     
     v3_register_hypercall(vm, GUEST_INFO_HCALL, info_hcall, NULL);
 
-    V3_Print("GUEST_INFO_HCALL=%x\n", GUEST_INFO_HCALL);
+    V3_Print(vm, VCORE_NONE, "GUEST_INFO_HCALL=%x\n", GUEST_INFO_HCALL);
 
     return 0;
 }
@@ -298,6 +318,9 @@ int v3_free_vm_internal(struct v3_vm_info * vm) {
     v3_remove_hypercall(vm, GUEST_INFO_HCALL);
 
 
+#ifdef V3_CONFIG_HVM
+    v3_deinit_hvm_vm(vm);
+#endif
 
 #ifdef V3_CONFIG_SYMBIOTIC
     v3_deinit_symbiotic_vm(vm);
@@ -321,7 +344,7 @@ int v3_free_vm_internal(struct v3_vm_info * vm) {
            break;
 #endif
        default:
-           PrintError("Invalid CPU Type 0x%x\n", v3_mach_type);
+           PrintError(vm, VCORE_NONE, "Invalid CPU Type 0x%x\n", v3_mach_type);
            return -1;
     }
 
@@ -330,8 +353,15 @@ int v3_free_vm_internal(struct v3_vm_info * vm) {
     v3_deinit_time_vm(vm);
 
     v3_deinit_mem_hooks(vm);
+
+#ifdef V3_CONFIG_SWAPPING
+    v3_deinit_swapping_vm(vm);
+#endif
+
     v3_delete_mem_map(vm);
     v3_deinit_shdw_impl(vm);
+    v3_deinit_passthrough_paging(vm);
+    v3_deinit_nested_paging(vm);
 
     v3_deinit_ext_manager(vm);
     v3_deinit_intr_routers(vm);
@@ -351,6 +381,14 @@ int v3_free_vm_internal(struct v3_vm_info * vm) {
 #endif
 
 
+    v3_deinit_events(vm);
+
+#ifdef V3_CONFIG_MEM_TRACK
+    v3_mem_track_deinit(vm);
+#endif
+
+    v3_fw_cfg_deinit(vm);
+
 
     return 0;
 }
@@ -370,7 +408,11 @@ int v3_init_core(struct guest_info * core) {
 #endif
 
     if (core->shdw_pg_mode == SHADOW_PAGING) {
+        v3_init_passthrough_paging_core(core);
        v3_init_shdw_pg_state(core);
+    } else {
+        //done later due to SVM/VMX differences 
+        //v3_init_nested_paging_core(core);
     }
 
     v3_init_time_core(core);
@@ -392,7 +434,7 @@ int v3_init_core(struct guest_info * core) {
        case V3_SVM_CPU:
        case V3_SVM_REV3_CPU:
            if (v3_init_svm_vmcb(core, vm->vm_class) == -1) {
-               PrintError("Error in SVM initialization\n");
+               PrintError(vm, core, "Error in SVM initialization\n");
                return -1;
            }
            break;
@@ -402,13 +444,13 @@ int v3_init_core(struct guest_info * core) {
        case V3_VMX_EPT_CPU:
        case V3_VMX_EPT_UG_CPU:
            if (v3_init_vmx_vmcs(core, vm->vm_class) == -1) {
-               PrintError("Error in VMX initialization\n");
+               PrintError(vm, core, "Error in VMX initialization\n");
                return -1;
            }
            break;
 #endif
        default:
-           PrintError("Invalid CPU Type 0x%x\n", v3_mach_type);
+            PrintError(vm, core, "Invalid CPU Type 0x%x\n", v3_mach_type);
            return -1;
     }
     
@@ -428,6 +470,10 @@ int v3_free_core(struct guest_info * core) {
     v3_deinit_symbiotic_core(core);
 #endif
 
+#ifdef V3_CONFIG_HVM
+    v3_deinit_hvm_core(core);
+#endif
+
     v3_deinit_decoder(core);
 
     v3_deinit_intr_controllers(core);
@@ -435,6 +481,9 @@ int v3_free_core(struct guest_info * core) {
 
     if (core->shdw_pg_mode == SHADOW_PAGING) {
        v3_deinit_shdw_pg_state(core);
+        v3_deinit_passthrough_paging_core(core);
+   } else {
+        v3_deinit_nested_paging_core(core);
     }
 
     v3_free_passthrough_pts(core);
@@ -443,12 +492,13 @@ int v3_free_core(struct guest_info * core) {
     v3_deinit_core_telemetry(core);
 #endif
 
+
     switch (v3_mach_type) {
 #ifdef V3_CONFIG_SVM
        case V3_SVM_CPU:
        case V3_SVM_REV3_CPU:
            if (v3_deinit_svm_vmcb(core) == -1) {
-               PrintError("Error in SVM initialization\n");
+               PrintError(VM_NONE,VCORE_NONE, "Error in SVM deinitialization\n");
                return -1;
            }
            break;
@@ -458,13 +508,13 @@ int v3_free_core(struct guest_info * core) {
        case V3_VMX_EPT_CPU:
        case V3_VMX_EPT_UG_CPU:
            if (v3_deinit_vmx_vmcs(core) == -1) {
-               PrintError("Error in VMX initialization\n");
+               PrintError(VM_NONE, VCORE_NONE, "Error in VMX initialization\n");
                return -1;
            }
            break;
 #endif
        default:
-           PrintError("Invalid CPU Type 0x%x\n", v3_mach_type);
+           PrintError(core->vm_info, core, "Invalid CPU Type 0x%x\n", v3_mach_type);
            return -1;
     }