Changeset 92129 in vbox

Timestamp:

Oct 28, 2021 9:41:23 AM (3 years ago)

Author:

vboxsync

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

147948

Message:

VMM/PGM,NEM: RAM registration notification must return a u2State value too. bugref:10122

Location:

trunk

Files:

• include/VBox/vmm/nem.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/NEMR3Native-win.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/PGMPhys.cpp (modified) (1 diff)

trunk/include/VBox/vmm/nem.h

@@ -62 +62 @@
 VMMR3_INT_DECL(void) NEMR3NotifyFF(PVM pVM, PVMCPU pVCpu, uint32_t fFlags);
 
-VMMR3_INT_DECL(int)  NEMR3NotifyPhysRamRegister(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, void *pvR3);
+VMMR3_INT_DECL(int)  NEMR3NotifyPhysRamRegister(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, void *pvR3, uint8_t *pu2State);
 VMMR3_INT_DECL(int)  NEMR3NotifyPhysMmioExMapEarly(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, uint32_t fFlags,
                                                    void *pvRam, void *pvMmio2, uint8_t *pu2State);

trunk/src/VBox/VMM/VMMR3/NEMR3Native-win.cpp

@@ -1972 +1972 @@
 
 
-VMMR3_INT_DECL(int) NEMR3NotifyPhysRamRegister(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, void *pvR3)
+VMMR3_INT_DECL(int) NEMR3NotifyPhysRamRegister(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, void *pvR3, uint8_t *pu2State)
 {
     Log5(("NEMR3NotifyPhysRamRegister: %RGp LB %RGp, pvR3=%p\n", GCPhys, cb, pvR3));
+    *pu2State = UINT8_MAX;
 #if !defined(NEM_WIN_USE_HYPERCALLS_FOR_PAGES) && defined(VBOX_WITH_PGM_NEM_MODE)
     if (pvR3)
@@ -1981 +1982 @@
                                      WHvMapGpaRangeFlagRead | WHvMapGpaRangeFlagWrite | WHvMapGpaRangeFlagExecute);
         if (SUCCEEDED(hrc))
-        { /* likely */ }
+            *pu2State = NEM_WIN_PAGE_STATE_WRITABLE;
         else
         {

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

@@ -1761 +1761 @@
     if (VM_IS_NEM_ENABLED(pVM))
     {
-        int rc = NEMR3NotifyPhysRamRegister(pVM, GCPhys, pNew->cb, pNew->pvR3);
-        if (RT_FAILURE(rc))
+        uint8_t u2State = UINT8_MAX;
+        int rc = NEMR3NotifyPhysRamRegister(pVM, GCPhys, pNew->cb, pNew->pvR3, &u2State);
+        if (RT_SUCCESS(rc))
+        {
+            if (u2State != UINT8_MAX)
+                pgmPhysSetNemStateForPages(&pNew->aPages[0], cPages, u2State);
+        }
+        else
             pgmR3PhysUnlinkRamRange2(pVM, pNew, pPrev);
         return rc;