Changeset 57158 in vbox

Timestamp:

Aug 3, 2015 1:47:44 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

101904

Message:

VMM/GIM: Add support for Hyper-V guest-crash reporting. Better logging for Guest-OS identity MSR.

Location:

trunk

Files:

• include/VBox/vmm/vm.h (modified) (2 diffs)
• src/VBox/VMM/VMMAll/GIMAllHv.cpp (modified) (5 diffs)
• src/VBox/VMM/VMMR3/GIMHv.cpp (modified) (2 diffs)
• src/VBox/VMM/include/GIMHvInternal.h (modified) (2 diffs)

trunk/include/VBox/vmm/vm.h ¶

@@ -1146 +1146 @@
         struct GIM s;
 #endif
-        uint8_t     padding[256];        /* multiple of 64 */
+        uint8_t     padding[320];        /* multiple of 64 */
     } gim;
 
@@ -1171 +1171 @@
 
     /** Padding for aligning the cpu array on a page boundary. */
-    uint8_t         abAlignment2[94];
+    uint8_t         abAlignment2[30];
 
     /* ---- end small stuff ---- */

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

@@ -79 +79 @@
 
 /**
+ * Gets the descriptive OS ID variant as identified via the
+ * MSR_GIM_HV_GUEST_OS_ID MSR.
+ *
+ * @returns The name.
+ * @param   uGuestOsIdMsr     The MSR_GIM_HV_GUEST_OS_ID MSR.
+ */
+static const char *gimHvGetGuestOsIdVariantName(uint64_t uGuestOsIdMsr)
+{
+    /* Refer the Hyper-V spec, section 3.6 "Reporting the Guest OS Identity". */
+    uint32_t uVendor = MSR_GIM_HV_GUEST_OS_ID_VENDOR(uGuestOsIdMsr);
+    if (uVendor == 1 /* Microsoft */)
+    {
+        uint32_t uOsVariant = MSR_GIM_HV_GUEST_OS_ID_OS_VARIANT(uGuestOsIdMsr);
+        switch (uOsVariant)
+        {
+            case 0:  return "Undefined";
+            case 1:  return "MS-DOS";
+            case 2:  return "Windows 3.x";
+            case 3:  return "Windows 9x";
+            case 4:  return "Windows NT or derivative";
+            case 5:  return "Windows CE";
+            default: return "Unknown";
+        }
+    }
+    return "Unknown";
+}
+
+
+/**
  * MSR read handler for Hyper-V.
  *
@@ -151 +180 @@
             *puValue = 0;
             return VINF_SUCCESS;
+
+        case MSR_GIM_HV_CRASH_CTL:
+            *puValue = pHv->uCrashCtl;
+            return VINF_SUCCESS;
+
+        case MSR_GIM_HV_CRASH_P0: *puValue = pHv->uCrashP0;   return VINF_SUCCESS;
+        case MSR_GIM_HV_CRASH_P1: *puValue = pHv->uCrashP1;   return VINF_SUCCESS;
+        case MSR_GIM_HV_CRASH_P2: *puValue = pHv->uCrashP2;   return VINF_SUCCESS;
+        case MSR_GIM_HV_CRASH_P3: *puValue = pHv->uCrashP3;   return VINF_SUCCESS;
+        case MSR_GIM_HV_CRASH_P4: *puValue = pHv->uCrashP4;   return VINF_SUCCESS;
 
         default:
@@ -211 +250 @@
                 pHv->u64HypercallMsr &= ~MSR_GIM_HV_HYPERCALL_ENABLE_BIT;
             }
+            else
+            {
+                LogRel(("GIM: HyperV: Guest OS reported ID %#RX64\n", uRawValue));
+                LogRel(("GIM: HyperV: Open-source=%RTbool Vendor=%#x OS=%#x (%s) Major=%u Minor=%u ServicePack=%u Build=%u\n",
+                        MSR_GIM_HV_GUEST_OS_ID_IS_OPENSOURCE(uRawValue),   MSR_GIM_HV_GUEST_OS_ID_VENDOR(uRawValue),
+                        MSR_GIM_HV_GUEST_OS_ID_OS_VARIANT(uRawValue),      gimHvGetGuestOsIdVariantName(uRawValue),
+                        MSR_GIM_HV_GUEST_OS_ID_MAJOR_VERSION(uRawValue),   MSR_GIM_HV_GUEST_OS_ID_MINOR_VERSION(uRawValue),
+                        MSR_GIM_HV_GUEST_OS_ID_SERVICE_VERSION(uRawValue), MSR_GIM_HV_GUEST_OS_ID_BUILD(uRawValue)));
+            }
             pHv->u64GuestOsIdMsr = uRawValue;
             return VINF_SUCCESS;
@@ -298 +346 @@
             if (MSR_GIM_HV_RESET_IS_SET(uRawValue))
             {
-                LogRel(("GIM: HyperV: Reset initiated through MSR.\n"));
+                LogRel(("GIM: HyperV: Reset initiated through MSR\n"));
                 int rc = PDMDevHlpVMReset(pVM->gim.s.pDevInsR3);
                 AssertRC(rc);
@@ -306 +354 @@
 #endif /* IN_RING3 */
         }
+
+        case MSR_GIM_HV_CRASH_CTL:
+        {
+#ifndef IN_RING3
+            return VINF_CPUM_R3_MSR_WRITE;
+#else
+            if (uRawValue & MSR_GIM_HV_CRASH_CTL_NOTIFY_BIT)
+            {
+                LogRel(("GIM: HyperV: Guest indicates a fatal condition! P0=%#RX64 P1=%#RX64 P2=%#RX64 P3=%#RX64 P4=%#RX64\n",
+                        pHv->uCrashP0, pHv->uCrashP1, pHv->uCrashP2, pHv->uCrashP3, pHv->uCrashP4));
+            }
+            return VINF_SUCCESS;
+#endif
+        }
+
+        case MSR_GIM_HV_CRASH_P0:  pHv->uCrashP0 = uRawValue;  return VINF_SUCCESS;
+        case MSR_GIM_HV_CRASH_P1:  pHv->uCrashP1 = uRawValue;  return VINF_SUCCESS;
+        case MSR_GIM_HV_CRASH_P2:  pHv->uCrashP2 = uRawValue;  return VINF_SUCCESS;
+        case MSR_GIM_HV_CRASH_P3:  pHv->uCrashP3 = uRawValue;  return VINF_SUCCESS;
+        case MSR_GIM_HV_CRASH_P4:  pHv->uCrashP4 = uRawValue;  return VINF_SUCCESS;
 
         case MSR_GIM_HV_TIME_REF_COUNT:     /* Read-only MSRs. */

trunk/src/VBox/VMM/VMMR3/GIMHv.cpp ¶

@@ -117 +117 @@
 
         /* Miscellaneous features. */
-        pHv->uMiscFeat = GIM_HV_MISC_FEAT_TIMER_FREQ;
+        pHv->uMiscFeat = GIM_HV_MISC_FEAT_TIMER_FREQ
+                       | GIM_HV_MISC_FEAT_GUEST_CRASH_MSRS;
 
         /* Hypervisor recommendations to the guest. */
@@ -227 +228 @@
     }
 
+    /*
+     * Setup non-zero MSRs.
+     */
+    if (pHv->uMiscFeat & GIM_HV_MISC_FEAT_GUEST_CRASH_MSRS)
+        pHv->uCrashCtl = MSR_GIM_HV_CRASH_CTL_NOTIFY_BIT;
+
     return VINF_SUCCESS;
 }

trunk/src/VBox/VMM/include/GIMHvInternal.h ¶

@@ -421 +421 @@
 /** @} */
 
+/** @name Hyper-V MSR - Guest crash control (MSR_GIM_HV_CRASH_CTL).
+ * @{
+ */
+/** The Crash Notify bit. */
+#define MSR_GIM_HV_CRASH_CTL_NOTIFY_BIT           RT_BIT_64(63)
+/** @} */
+
+/** @name Hyper-V MSR - Guest OS ID (MSR_GIM_HV_GUEST_OS_ID).
+ * @{
+ */
+/** An open-source operating system. */
+#define MSR_GIM_HV_GUEST_OS_ID_IS_OPENSOURCE(a)   RT_BOOL((a) & RT_BIT_64(63))
+/** Vendor ID. */
+#define MSR_GIM_HV_GUEST_OS_ID_VENDOR(a)          (((a) >> 48) & 0xfff)
+/** Guest OS variant, depending on the vendor ID.  */
+#define MSR_GIM_HV_GUEST_OS_ID_OS_VARIANT(a)      (((a) >> 40) & 0xff)
+/** Guest OS major version. */
+#define MSR_GIM_HV_GUEST_OS_ID_MAJOR_VERSION(a)   (((a) >> 32) & 0xff)
+/** Guest OS minor version. */
+#define MSR_GIM_HV_GUEST_OS_ID_MINOR_VERSION(a)   (((a) >> 24) & 0xff)
+/** Guest OS service version (e.g. service pack number in case of Windows). */
+#define MSR_GIM_HV_GUEST_OS_ID_SERVICE_VERSION(a) (((a) >> 16) & 0xff)
+/** Guest OS build number. */
+#define MSR_GIM_HV_GUEST_OS_ID_BUILD(a)           ((a) & 0xffff)
+/** @} */
+
 /** Hyper-V page size.  */
 #define GIM_HV_PAGE_SIZE                          0x1000
@@ -483 +509 @@
     /** @} */
 
+    /** @name Guest Crash MSRs.
+     *  @{
+     */
+    /** Guest crash control MSR. */
+    uint64_t                    uCrashCtl;
+    /** Guest crash parameter 0 MSR. */
+    uint64_t                    uCrashP0;
+    /** Guest crash parameter 1 MSR. */
+    uint64_t                    uCrashP1;
+    /** Guest crash parameter 2 MSR. */
+    uint64_t                    uCrashP2;
+    /** Guest crash parameter 3 MSR. */
+    uint64_t                    uCrashP3;
+    /** Guest crash parameter 4 MSR. */
+    uint64_t                    uCrashP4;
+    /** @} */
+
     /** Per-VM R0 Spinlock for protecting EMT writes to the TSC page. */
     RTSPINLOCK                  hSpinlockR0;