Changeset 104911 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 13, 2024 10:33:27 AM (8 months ago)

Author:

vboxsync

Message:

VMM/GIM: bugref:10703 Fix/re-implemented Hyper-V paravirt HvExtCallGetBootZeroedMemory hypercall to suit the latest (and actually used) Windows Hyper-V spec.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/GIMHv.cpp (modified) (1 diff)
• include/GIMHvInternal.h (modified) (2 diffs)

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

@@ -2233 +2233 @@
      * Perform the hypercall.
      */
-/** @todo r=bird: This is *nothing* like the microsoft description (2024-05-28).
- * https://learn.microsoft.com/en-us/virtualization/hyper-v-on-windows/tlfs/hypercalls/hvextcallgetbootzeroedmemory
- *
- * It describes this as returning pages known to be all zeros at the time this
- * hypercall is made.  What we return instead is a is a single entry:
- *      GIMHVEXTGETBOOTZEROMEM::GCPhysStart = 0;
- *      GIMHVEXTGETBOOTZEROMEM::cPages      = SUM(PGMRAMRANGE.cb) >> GIM_HV_PAGE_SHIFT;
- *
- * This isn't right for any VM configuration, given that VGA & MMIO & ROM memory
- * starts at 0xa0000 and contains pages that aren't zero.  For VM configurations
- * with more than 3GB (or 2) of memory, it doesn't take into account the RAM hole
- * below 4G.
- *
- * A much better approach for VMs with large configs, but still not really correct,
- * would be to find the highest RAM address (non-MMIO, non-MMIO2, non-ROM) and
- * convert it to a page count and assign that to cPages.
- *
- * A slight improvement would be to report two or three ranges:
- *      [0] = 0x00000-0xa0000,
- *      [1] = 1MB - RamHole,
- *      [2] = 4GB - EndOfRam;
- *
- * The best would be to implement this directly PGM, as the number of mapped RAM
- * ranges doesn't need to be constant during the call if other VCPUs are
- * enabling/disabling devices and such.
- */
-    uint32_t const cRanges = PGMR3PhysGetRamRangeCount(pVM);
-    pOut->cPages = 0;
-    for (uint32_t iRange = 0; iRange < cRanges; iRange++)
-    {
-        RTGCPHYS GCPhysStart;
-        RTGCPHYS GCPhysEnd;
-        int rc = PGMR3PhysGetRange(pVM, iRange, &GCPhysStart, &GCPhysEnd, NULL /* pszDesc */, NULL /* fIsMmio */);
-        if (RT_FAILURE(rc))
+    AssertCompileMembersSameSizeAndOffset(PGMPHYSRANGES, cRanges, GIMHVEXTGETBOOTZEROMEM, cRanges);
+    AssertCompileMembersAtSameOffset(PGMPHYSRANGES,      aRanges, GIMHVEXTGETBOOTZEROMEM, aRanges);
+    AssertCompileMembersSameSizeAndOffset(PGMPHYSRANGE, GCPhysStart, GIMHVEXTMEMRANGE, GCPhysStart);
+    AssertCompileMembersSameSizeAndOffset(PGMPHYSRANGE, cPages,      GIMHVEXTMEMRANGE, cPages);
+    AssertCompile(RT_ELEMENTS(pOut->aRanges) == GIM_HV_MAX_BOOT_ZEROED_MEM_RANGES);
+
+    int rcHv;
+    int rc = PGMR3PhysGetRamBootZeroedRanges(pVM, (PPGMPHYSRANGES)pOut, RT_ELEMENTS(pOut->aRanges));
+    if (   RT_SUCCESS(rc)
+        || rc == VERR_BUFFER_OVERFLOW)
+    {
+        /*
+         * Update the guest memory with result.
+         */
+        rc = PGMPhysSimpleWriteGCPhys(pVM, pHv->GCPhysHypercallOut, pHv->pbHypercallOut, sizeof(GIMHVEXTGETBOOTZEROMEM));
+        if (RT_SUCCESS(rc))
         {
-            LogRelMax(10, ("GIM: HyperV: HvHypercallExtGetBootZeroedMem: PGMR3PhysGetRange failed for iRange(%u) rc=%Rrc\n",
-                           iRange, rc));
-            *prcHv = GIM_HV_STATUS_OPERATION_DENIED;
-            return rc;
+            LogRel(("GIM: HyperV: Queried boot zeroed guest memory as %u ranges\n", pOut->cRanges));
+            for (uint32_t i = 0; i < pOut->cRanges; i++)
+                LogRel(("GIM: HyperV: RAM range [%u] from %#RGp to %#RGp (%u pages, %' Rhcb)\n", i, pOut->aRanges[i].GCPhysStart,
+                        pOut->aRanges[i].GCPhysStart + pOut->aRanges[i].cPages * GUEST_PAGE_SIZE - 1, pOut->aRanges[i].cPages,
+                        pOut->aRanges[i].cPages * GUEST_PAGE_SIZE));
+            rcHv = GIM_HV_STATUS_SUCCESS;
         }
-
-        RTGCPHYS const cbRange = RT_ALIGN(GCPhysEnd - GCPhysStart + 1, GUEST_PAGE_SIZE);
-        pOut->cPages += cbRange >> GIM_HV_PAGE_SHIFT;
-        if (iRange == 0)
-            pOut->GCPhysStart = GCPhysStart;
-    }
-
-    /*
-     * Update the guest memory with result.
-     */
-    int rcHv;
-    int rc = PGMPhysSimpleWriteGCPhys(pVM, pHv->GCPhysHypercallOut, pHv->pbHypercallOut, sizeof(GIMHVEXTGETBOOTZEROMEM));
-    if (RT_SUCCESS(rc))
-    {
-        LogRel(("GIM: HyperV: Queried boot zeroed guest memory range (starting at %#RGp spanning %u pages) at %#RGp\n",
-                pOut->GCPhysStart, pOut->cPages, pHv->GCPhysHypercallOut));
-        rcHv = GIM_HV_STATUS_SUCCESS;
+        else
+        {
+            LogRelMax(10, ("GIM: HyperV: HvHypercallExtGetBootZeroedMem hypercall failed to update guest memory. rc=%Rrc\n", rc));
+            rcHv = GIM_HV_STATUS_OPERATION_DENIED;
+            rc   = VERR_GIM_HYPERCALL_MEMORY_WRITE_FAILED;
+        }
     }
     else
     {
+        LogRelMax(10, ("GIM: HyperV: HvHypercallExtGetBootZeroedMem failed. rc=%Rrc\n", rc));
         rcHv = GIM_HV_STATUS_OPERATION_DENIED;
-        LogRelMax(10, ("GIM: HyperV: HvHypercallExtGetBootZeroedMem failed to update guest memory. rc=%Rrc\n", rc));
-        rc = VERR_GIM_HYPERCALL_MEMORY_WRITE_FAILED;
+        rc   = VERR_GIM_HYPERCALL_FAILED;
     }
 

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

@@ -562 +562 @@
                                                    | MSR_GIM_HV_STIMER_SINTX)
 /** @} */
+
+
+/** Hyper-V page size.  */
+#define GIM_HV_PAGE_SIZE                          4096
+/** Hyper-V page shift. */
+#define GIM_HV_PAGE_SHIFT                         12
+
+/** Microsoft Hyper-V vendor signature. */
+#define GIM_HV_VENDOR_MICROSOFT                   "Microsoft Hv"
 
 /**
@@ -1081 +1090 @@
 
 /**
- * HvExtCallGetBootZeroedMemory hypercall output.
- */
-typedef struct GIMHVEXTGETBOOTZEROMEM
+ * Hyper-V memory range for HvExtCallGetBootZeroedMemory.
+ */
+typedef struct GIMHVEXTMEMRANGE
 {
     RTGCPHYS GCPhysStart;
     uint64_t cPages;
+} GIMHVEXTMEMRANGE;
+
+/** Maximum number of zeroed memory ranges supported by Hyper-V. */
+#define GIM_HV_MAX_BOOT_ZEROED_MEM_RANGES         255
+
+/**
+ * HvExtCallGetBootZeroedMemory hypercall output.
+ */
+typedef struct GIMHVEXTGETBOOTZEROMEM
+{
+    uint64_t            cRanges;
+    GIMHVEXTMEMRANGE    aRanges[GIM_HV_MAX_BOOT_ZEROED_MEM_RANGES];
 } GIMHVEXTGETBOOTZEROMEM;
 /** Pointer to a HvExtCallGetBootZeroedMemory output struct. */
 typedef GIMHVEXTGETBOOTZEROMEM *PGIMHVEXTGETBOOTZEROMEM;
-AssertCompileSize(GIMHVEXTGETBOOTZEROMEM, 16);
-/** @} */
-
-
-/** Hyper-V page size.  */
-#define GIM_HV_PAGE_SIZE                          4096
-/** Hyper-V page shift. */
-#define GIM_HV_PAGE_SHIFT                         12
-
-/** Microsoft Hyper-V vendor signature. */
-#define GIM_HV_VENDOR_MICROSOFT                   "Microsoft Hv"
+/** Pointer to a const HvExtCallGetBootZeroedMemory output struct. */
+typedef GIMHVEXTGETBOOTZEROMEM const *PCGIMHVEXTGETBOOTZEROMEM;
+AssertCompileSize(GIMHVEXTGETBOOTZEROMEM, 4088);
+AssertCompile(sizeof(GIMHVEXTGETBOOTZEROMEM) <= GIM_HV_PAGE_SIZE);
+/** @} */
+
 
 /**