Changeset 51333 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

May 22, 2014 4:42:22 AM (11 years ago)

Author:

vboxsync

Message:

VMM/GIM: Hyper-V provider, work-in-progress.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllMsrs.cpp (modified) (4 diffs)
• GIMAll.cpp (modified) (3 diffs)
• GIMAllHv.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp

@@ -24 +24 @@
 #include <VBox/vmm/hm.h>
 #include <VBox/vmm/tm.h>
+#include <VBox/vmm/gim.h>
 #include "CPUMInternal.h"
 #include <VBox/vmm/vm.h>
@@ -4388 +4389 @@
 }
 
+
+
+/*
+ * GIM MSRs.
+ * GIM MSRs.
+ * GIM MSRs.
+ */
+
+
+/** @callback_method_impl{FNCPUMRDMSR} */
+static DECLCALLBACK(int) cpumMsrRd_Gim(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t *puValue)
+{
+    return GIMReadMsr(pVCpu, idMsr, pRange, puValue);
+}
+
+
+/** @callback_method_impl{FNCPUMWRMSR} */
+static DECLCALLBACK(int) cpumMsrWr_Gim(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t uValue, uint64_t uRawValue)
+{
+    return GIMWriteMsr(pVCpu, idMsr, pRange, uValue, uRawValue);
+}
 
 
@@ -4646 +4668 @@
     cpumMsrRd_AmdFam10hIbsCtl,
     cpumMsrRd_AmdFam14hIbsBrTarget,
+
+    cpumMsrRd_Gim
 };
 
@@ -4860 +4884 @@
     cpumMsrWr_AmdFam10hIbsCtl,
     cpumMsrWr_AmdFam14hIbsBrTarget,
+
+    cpumMsrWr_Gim
 };
 

trunk/src/VBox/VMM/VMMAll/GIMAll.cpp

@@ -22 +22 @@
 #define LOG_GROUP LOG_GROUP_GIM
 #include "GIMInternal.h"
+#include <VBox/err.h>
 #include <VBox/vmm/vm.h>
 
+/* Include all the providers. */
+#include "GIMHvInternal.h"
+#include "GIMMinimalInternal.h"
 
+
+/**
+ * Checks whether GIM is being used by this VM.
+ *
+ * @retval  @c true if used.
+ * @retval  @c false if no GIM provider ("none") is used.
+ *
+ * @param   pVM       Pointer to the VM.
+ * @internal
+ */
 VMMDECL(bool) GIMIsEnabled(PVM pVM)
 {
@@ -31 +45 @@
 
 
+/**
+ * Implements a GIM hypercall with the provider configured for the VM.
+ *
+ * @returns VBox status code.
+ * @param   pVCpu       Pointer to the VMCPU.
+ * @param   pCtx        Pointer to the guest-CPU context.
+ */
 VMM_INT_DECL(int) GIMHypercall(PVMCPU pVCpu, PCPUMCTX pCtx)
 {
@@ -37 +58 @@
     VMCPU_ASSERT_EMT(pVCpu);
 
-    return pVM->gim.s.CTX_SUFF(pfnHypercall)(pVCpu, pCtx);
+    switch (pVM->gim.s.enmProviderId)
+    {
+        case GIMPROVIDERID_HYPERV:
+            return GIMHvHypercall(pVCpu, pCtx);
+
+        default:
+            AssertMsgFailed(("GIMHypercall: for unknown provider %u\n", pVM->gim.s.enmProviderId));
+            return VERR_INTERNAL_ERROR_5; /** @todo Define and use VERR_GIM_HYPERCALL_UNEXPECTED */;
+    }
 }
 
+
+/**
+ * Invokes the read-MSR handler for the GIM provider configured for the VM.
+ *
+ * @returns VBox status code.
+ * @param   pVCpu       Pointer to the VMCPU.
+ * @param   idMsr       The MSR to read.
+ * @param   pRange      The range this MSR belongs to.
+ * @param   puValue     Where to store the MSR value read.
+ */
+VMM_INT_DECL(int) GIMReadMsr(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t *puValue)
+{
+    PVM pVM = pVCpu->CTX_SUFF(pVM);
+    Assert(GIMIsEnabled(pVM));
+    VMCPU_ASSERT_EMT(pVCpu);
+
+    switch (pVM->gim.s.enmProviderId)
+    {
+        case GIMPROVIDERID_HYPERV:
+            return GIMHvReadMsr(pVCpu, idMsr, pRange, puValue);
+
+        default:
+            AssertMsgFailed(("GIMReadMsr: for unknown provider %u idMsr=%#RX32 -> #GP(0)", pVM->gim.s.enmProviderId, idMsr));
+            return VERR_CPUM_RAISE_GP_0;
+    }
+}
+
+
+/**
+ * Invokes the write-MSR handler for the GIM provider configured for the VM.
+ *
+ * @returns VBox status code.
+ * @param   pVCpu       Pointer to the VMCPU.
+ * @param   idMsr       The MSR to write.
+ * @param   pRange      The range this MSR belongs to.
+ * @param   uValue      The value to set, ignored bits masked.
+ * @param   uRawValue   The raw value with the ignored bits not masked.
+ */
+VMM_INT_DECL(int) GIMWriteMsr(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t uValue, uint64_t uRawValue)
+{
+    PVM pVM = pVCpu->CTX_SUFF(pVM);
+    Assert(GIMIsEnabled(pVM));
+    VMCPU_ASSERT_EMT(pVCpu);
+
+    switch (pVM->gim.s.enmProviderId)
+    {
+        case GIMPROVIDERID_HYPERV:
+            return GIMHvWriteMsr(pVCpu, idMsr, pRange, uValue, uRawValue);
+
+        default:
+            AssertMsgFailed(("GIMWriteMsr: for unknown provider %u idMsr=%#RX32 -> #GP(0)", pVM->gim.s.enmProviderId, idMsr));
+            return VERR_CPUM_RAISE_GP_0;
+    }
+}
+

trunk/src/VBox/VMM/VMMAll/GIMAllHv.cpp

@@ -30 +30 @@
 }
 
+
+DECLEXPORT(int) GIMHvReadMsr(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t *puValue)
+{
+    return VINF_SUCCESS;
+}
+
+
+DECLEXPORT(int) GIMHvWriteMsr(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t uValue, uint64_t uRawValue)
+{
+    return VINF_SUCCESS;
+}
+