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

Timestamp:

Oct 8, 2019 8:26:49 AM (5 years ago)

Author:

vboxsync

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

133769

Message:

IOM,RTC,PCI: Make the port parameter in the I/O port callbacks relative to the start of the mapping rather than absolute. For absolute port numbers, use the IOM_IOPORT_F_ABS flag. bugref:9218

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IOMAll.cpp (modified) (10 diffs)
• VMMR0/IOMR0.cpp (modified) (2 diffs)
• VMMR3/IOM.cpp (modified) (2 diffs)
• include/IOMInternal.h (modified) (2 diffs)

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

@@ -104 +104 @@
          * Found an entry, get the data so we can leave the IOM lock.
          */
+        uint16_t const    fFlags        = pRegEntry->fFlags;
         PFNIOMIOPORTNEWIN pfnInCallback = pRegEntry->pfnInCallback;
         PPDMDEVINS        pDevIns       = pRegEntry->pDevIns;
@@ -130 +131 @@
         {
             STAM_PROFILE_START(&pStats->CTX_SUFF_Z(ProfIn), a);
-            rcStrict = pfnInCallback(pDevIns, pvUser, Port, pu32Value, (unsigned)cbValue);
+            rcStrict = pfnInCallback(pDevIns, pvUser, fFlags & IOM_IOPORT_F_ABS ? Port : offPort, pu32Value, (unsigned)cbValue);
             STAM_PROFILE_STOP(&pStats->CTX_SUFF_Z(ProfIn), a);
             PDMCritSectLeave(pDevIns->CTX_SUFF(pCritSectRo));
@@ -349 +350 @@
          * Found an entry, get the data so we can leave the IOM lock.
          */
+        uint16_t const          fFlags           = pRegEntry->fFlags;
         PFNIOMIOPORTNEWINSTRING pfnInStrCallback = pRegEntry->pfnInStrCallback;
         PFNIOMIOPORTNEWIN       pfnInCallback    = pRegEntry->pfnInCallback;
@@ -381 +383 @@
             {
                 STAM_PROFILE_START(&pStats->CTX_SUFF_Z(ProfIn), a);
-                rcStrict = pfnInStrCallback(pDevIns, pvUser, uPort, (uint8_t *)pvDst, pcTransfers, cb);
+                rcStrict = pfnInStrCallback(pDevIns, pvUser, fFlags & IOM_IOPORT_F_ABS ? uPort : offPort,
+                                            (uint8_t *)pvDst, pcTransfers, cb);
                 STAM_PROFILE_STOP(&pStats->CTX_SUFF_Z(ProfIn), a);
             }
@@ -396 +399 @@
                     uint32_t u32Value = 0;
                     STAM_PROFILE_START(&pStats->CTX_SUFF_Z(ProfIn), a);
-                    rcStrict = pfnInCallback(pDevIns, pvUser, uPort, &u32Value, cb);
+                    rcStrict = pfnInCallback(pDevIns, pvUser, fFlags & IOM_IOPORT_F_ABS ? uPort : offPort, &u32Value, cb);
                     STAM_PROFILE_STOP(&pStats->CTX_SUFF_Z(ProfIn), a);
                     if (rcStrict == VERR_IOM_IOPORT_UNUSED)
@@ -671 +674 @@
          * Found an entry, get the data so we can leave the IOM lock.
          */
+        uint16_t const     fFlags           = pRegEntry->fFlags;
         PFNIOMIOPORTNEWOUT pfnOutCallback   = pRegEntry->pfnOutCallback;
         PPDMDEVINS         pDevIns          = pRegEntry->pDevIns;
@@ -697 +701 @@
         {
             STAM_PROFILE_START(&pStats->CTX_SUFF_Z(ProfOut), a);
-            rcStrict = pfnOutCallback(pDevIns, pvUser, Port, u32Value, (unsigned)cbValue);
+            rcStrict = pfnOutCallback(pDevIns, pvUser, fFlags & IOM_IOPORT_F_ABS ? Port : offPort, u32Value, (unsigned)cbValue);
             STAM_PROFILE_STOP(&pStats->CTX_SUFF_Z(ProfOut), a);
 
@@ -892 +896 @@
          * Found an entry, get the data so we can leave the IOM lock.
          */
+        uint16_t const             fFlags            = pRegEntry->fFlags;
         PFNIOMIOPORTNEWOUTSTRING   pfnOutStrCallback = pRegEntry->pfnOutStrCallback;
         PFNIOMIOPORTNEWOUT         pfnOutCallback    = pRegEntry->pfnOutCallback;
@@ -924 +929 @@
             {
                 STAM_PROFILE_START(&pStats->CTX_SUFF_Z(ProfOut), a);
-                rcStrict = pfnOutStrCallback(pDevIns, pvUser, uPort, (uint8_t const *)pvSrc, pcTransfers, cb);
+                rcStrict = pfnOutStrCallback(pDevIns, pvUser, fFlags & IOM_IOPORT_F_ABS ? uPort : offPort,
+                                             (uint8_t const *)pvSrc, pcTransfers, cb);
                 STAM_PROFILE_STOP(&pStats->CTX_SUFF_Z(ProfOut), a);
             }
@@ -946 +952 @@
                     }
                     STAM_PROFILE_START(&pStats->CTX_SUFF_Z(ProfOut), a);
-                    rcStrict = pfnOutCallback(pDevIns, pvUser, uPort, u32Value, cb);
+                    rcStrict = pfnOutCallback(pDevIns, pvUser, fFlags & IOM_IOPORT_F_ABS ? uPort : offPort, u32Value, cb);
                     STAM_PROFILE_STOP(&pStats->CTX_SUFF_Z(ProfOut), a);
                     if (IOM_SUCCESS(rcStrict))

trunk/src/VBox/VMM/VMMR0/IOMR0.cpp

@@ -111 +111 @@
     AssertPtrNullReturn(pfnInStr, VERR_INVALID_POINTER);
 
+    uint16_t const fFlags = pGVM->iomr0.s.paIoPortRing3Regs[hIoPorts].fFlags;
     RTIOPORT const cPorts = pGVM->iomr0.s.paIoPortRing3Regs[hIoPorts].cPorts;
     AssertMsgReturn(cPorts > 0 && cPorts <= _8K, ("cPorts=%s\n", cPorts), VERR_IOM_INVALID_IOPORT_HANDLE);
@@ -124 +125 @@
     pGVM->iomr0.s.paIoPortRegs[hIoPorts].pfnInStrCallback   = pfnInStr;
     pGVM->iomr0.s.paIoPortRegs[hIoPorts].cPorts             = cPorts;
+    pGVM->iomr0.s.paIoPortRegs[hIoPorts].fFlags             = fFlags;
 #ifdef VBOX_WITH_STATISTICS
     uint16_t const idxStats = pGVM->iomr0.s.paIoPortRing3Regs[hIoPorts].idxStats;

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

@@ -471 +471 @@
 
     AssertMsgReturn(cPorts > 0 && cPorts <= _8K, ("cPorts=%s\n", cPorts), VERR_OUT_OF_RANGE);
-    AssertReturn(!fFlags, VERR_INVALID_FLAGS);
+    AssertReturn(!(fFlags & ~IOM_IOPORT_F_VALID_MASK), VERR_INVALID_FLAGS);
 
     AssertReturn(pfnOut || pfnIn || pfnOutStr || pfnInStr, VERR_INVALID_PARAMETER);
@@ -540 +540 @@
     pVM->iom.s.paIoPortRegs[idx].idxStats           = (uint16_t)idxStats;
     pVM->iom.s.paIoPortRegs[idx].fMapped            = false;
+    pVM->iom.s.paIoPortRegs[idx].fFlags             = (uint8_t)fFlags;
     pVM->iom.s.paIoPortRegs[idx].idxSelf            = idx;
 

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

@@ -180 +180 @@
     /** Same as the handle index. */
     uint16_t                            idxSelf;
+    /** IOM_IOPORT_F_XXX (copied from ring-3). */
+    uint16_t                            fFlags;
 } IOMIOPORTENTRYR0;
 /** Pointer to a ring-0 I/O port handle table entry. */
@@ -225 +227 @@
     /** Set if there is an raw-mode entry too. */
     bool                                fRawMode;
-    bool                                fUnused;
+    /** IOM_IOPORT_F_XXX */
+    uint8_t                             fFlags;
     /** Same as the handle index. */
     uint16_t                            idxSelf;