Changeset 70977 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Feb 12, 2018 8:45:31 PM (7 years ago)

Author:

vboxsync

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

120824

Message:

NEM: Working on PGM notifications. bugref:9044

Location:

trunk/src/VBox/VMM/include

Files:

• NEMInternal.h (modified) (1 diff)
• PGMInline.h (modified) (3 diffs)
• PGMInternal.h (modified) (5 diffs)

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

@@ -116 +116 @@
 void    nemR3NativeResetCpu(PVMCPU pVCpu);
 int     nemR3NativeNotifyPhysRamRegister(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb);
-int     nemR3NativeNotifyPhysMmioExMap(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, uint32_t fFlags);
+int     nemR3NativeNotifyPhysMmioExMap(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, uint32_t fFlags, void *pvMmio2);
 int     nemR3NativeNotifyPhysMmioExUnmap(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, uint32_t fFlags);
-int     nemR3NativeNotifyPhysRomRegisterEarly(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, uint32_t fFlags);
-int     nemR3NativeNotifyPhysRomRegisterLate(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, uint32_t fFlags);
+int     nemR3NativeNotifyPhysRomRegisterEarly(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, uint32_t fFlags);
+int     nemR3NativeNotifyPhysRomRegisterLate(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS cb, uint32_t fFlags);
 void    nemR3NativeNotifySetA20(PVMCPU pVCpu, bool fEnabled);
+/* NEMHCNotifyXxxx for ring-3: */
+void    nemR3NativeNotifyHandlerPhysicalRegister(PVM pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhys, RTGCPHYS cb);
+void    nemR3NativeNotifyHandlerPhysicalDeregister(PVM pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhys, RTGCPHYS cb,
+                                                   int fRestoreAsRAM, bool fRestoreAsRAM2);
+void    nemR3NativeNotifyHandlerPhysicalModify(PVM pVM, PGMPHYSHANDLERKIND enmKind, RTGCPHYS GCPhysOld,
+                                               RTGCPHYS GCPhysNew, RTGCPHYS cb, bool fRestoreAsRAM);
+int     nemR3NativeNotifyPhysPageAllocated(PVM pVM, RTGCPHYS GCPhys, RTHCPHYS HCPhys, uint32_t fPageProt,
+                                           PGMPAGETYPE enmType, uint8_t *pu2State);
+void    nemR3NativeNotifyPhysPageProtChanged(PVM pVM, RTGCPHYS GCPhys, RTHCPHYS HCPhys, uint32_t fPageProt,
+                                             PGMPAGETYPE enmType, uint8_t *pu2State);
+void    nemR3NativeNotifyPhysPageChanged(PVM pVM, RTGCPHYS GCPhys, RTHCPHYS HCPhysPrev, RTHCPHYS HCPhysNew, uint32_t fPageProt,
+                                         PGMPAGETYPE enmType, uint8_t *pu2State);
 #endif
 

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

@@ -33 +33 @@
 #include <VBox/vmm/gmm.h>
 #include <VBox/vmm/hm.h>
+#ifndef IN_RC
+# include <VBox/vmm/nem.h>
+#endif
 #include <iprt/asm.h>
 #include <iprt/assert.h>
@@ -514 +517 @@
 }
 
+
+/**
+ * Calculates NEM page protection flags.
+ */
+DECL_FORCE_INLINE(uint32_t) pgmPhysPageCalcNemProtection(PPGMPAGE pPage, PGMPAGETYPE enmType)
+{
+    /*
+     * Deal with potentially writable pages first.
+     */
+    if (PGMPAGETYPE_IS_RWX(enmType))
+    {
+        if (!PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage))
+        {
+            if (PGM_PAGE_IS_ALLOCATED(pPage))
+                return NEM_PAGE_PROT_READ | NEM_PAGE_PROT_EXECUTE | NEM_PAGE_PROT_WRITE;
+            return NEM_PAGE_PROT_READ | NEM_PAGE_PROT_EXECUTE;
+        }
+        if (!PGM_PAGE_HAS_ACTIVE_ALL_HANDLERS(pPage))
+            return NEM_PAGE_PROT_READ | NEM_PAGE_PROT_EXECUTE;
+    }
+    /*
+     * Potentially readable & executable pages.
+     */
+    else if (   PGMPAGETYPE_IS_ROX(enmType)
+             && !PGM_PAGE_HAS_ACTIVE_ALL_HANDLERS(pPage))
+        return NEM_PAGE_PROT_READ | NEM_PAGE_PROT_EXECUTE;
+
+    /*
+     * The rest is needs special access handling.
+     */
+    return NEM_PAGE_PROT_NONE;
+}
+
 #endif /* !IN_RC */
 
@@ -546 +582 @@
             Assert(PGM_PAGE_GET_PDE_TYPE(pFirstPage) == PGM_PAGE_PDE_TYPE_PDE_DISABLED);
     }
+
+#ifndef IN_RC
+    /* Tell NEM. */
+    if (VM_IS_NEM_ENABLED(pVM))
+    {
+        uint8_t     u2State = PGM_PAGE_GET_NEM_STATE(pPage);
+        PGMPAGETYPE enmType = (PGMPAGETYPE)PGM_PAGE_GET_TYPE(pPage);
+        NEMHCNotifyPhysPageProtChanged(pVM, GCPhysPage, PGM_PAGE_GET_HCPHYS(pPage),
+                                       pgmPhysPageCalcNemProtection(pPage, enmType), enmType, &u2State);
+        PGM_PAGE_SET_NEM_STATE(pPage, u2State);
+    }
+#endif
 }
 

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

@@ -785 +785 @@
 
 
-/** @name Page type predicates.
- * @{ */
-#define PGMPAGETYPE_IS_READABLE(type)   ( (type) <= PGMPAGETYPE_ROM )
-#define PGMPAGETYPE_IS_WRITEABLE(type)  ( (type) <= PGMPAGETYPE_ROM_SHADOW )
-#define PGMPAGETYPE_IS_RWX(type)        ( (type) <= PGMPAGETYPE_ROM_SHADOW )
-#define PGMPAGETYPE_IS_ROX(type)        ( (type) == PGMPAGETYPE_ROM )
-#define PGMPAGETYPE_IS_NP(type)         ( (type) == PGMPAGETYPE_MMIO )
-/** @} */
-
-
 /**
  * A Physical Guest Page tracking structure.
@@ -823 +813 @@
         /** 9:8   - The physical handler state (PGM_PAGE_HNDL_VIRT_STATE_*). */
         uint64_t    u2HandlerVirtStateY : 2;
-        /** 11:10 - Unused. */
-        uint64_t    u2Unused1           : 2;
+        /** 11:10 - NEM state bits. */
+        uint64_t    u2NemStateY         : 2;
         /** 12:48 - The host physical frame number (shift left to get the
          *  address). */
@@ -1426 +1416 @@
  */
 #define PGM_PAGE_INC_WRITE_LOCKS(a_pPage)       do { ++(a_pPage)->s.cWriteLocksY; } while (0)
+
+
+/** Gets the NEM state.
+ * @returns NEM state value (two bits).
+ * @param   a_pPage     Pointer to the physical guest page tracking structure.
+ */
+#define PGM_PAGE_GET_NEM_STATE(a_pPage)         ((a_pPage)->s.u2NemStateY)
+
+/** Sets the NEM state.
+ * @param   a_pPage     Pointer to the physical guest page tracking structure.
+ * @param   a_u2State   The NEM state value (specific to NEM impl.).
+ */
+#define PGM_PAGE_SET_NEM_STATE(a_pPage, a_u2State) \
+    do { Assert((a_u2State) < 4); (a_pPage)->s.u2NemStateY = (a_u2State); } while (0)
 
 
@@ -4217 +4221 @@
 int             pgmPhysPageLoadIntoTlb(PVM pVM, RTGCPHYS GCPhys);
 int             pgmPhysPageLoadIntoTlbWithPage(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys);
-void            pgmPhysPageMakeWriteMonitoredWritable(PVM pVM, PPGMPAGE pPage);
+void            pgmPhysPageMakeWriteMonitoredWritable(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys);
 int             pgmPhysPageMakeWritable(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys);
 int             pgmPhysPageMakeWritableAndMap(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys, void **ppv);
@@ -4235 +4239 @@
 DECLEXPORT(FNPGMRZPHYSPFHANDLER)    pgmPhysRomWritePfHandler;
 #endif
-int             pgmPhysFreePage(PVM pVM, PGMMFREEPAGESREQ pReq, uint32_t *pcPendingPages, PPGMPAGE pPage, RTGCPHYS GCPhys);
+int             pgmPhysFreePage(PVM pVM, PGMMFREEPAGESREQ pReq, uint32_t *pcPendingPages, PPGMPAGE pPage, RTGCPHYS GCPhys,
+                                PGMPAGETYPE enmNewType);
 void            pgmPhysInvalidRamRangeTlbs(PVM pVM);
 void            pgmPhysInvalidatePageMapTLB(PVM pVM);