Changeset 90198 in vbox for trunk/src/VBox

Timestamp:

Jul 14, 2021 10:44:42 PM (4 years ago)

Author:

vboxsync

Message:

DevPS2: The queue header member pszDesc is ring-3 only and must be wrapped in R3STRING when logging or it'll trigger SMAP panics.

Location:

trunk/src/VBox/Devices/Input

Files:

• DevPS2.cpp (modified) (5 diffs)
• DevPS2.h (modified) (1 diff)
• DevPS2K.cpp (modified) (1 diff)
• DevPS2M.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Input/DevPS2.cpp

@@ -731 +731 @@
 {
     Assert(cElements > 0);
-    LogFlowFunc(("Clearing %s queue %p\n", pQHdr->pszDesc, pQHdr));
+    LogFlowFunc(("Clearing %s queue %p\n", R3STRING(pQHdr->pszDescR3), pQHdr));
     pQHdr->wpos  = pQHdr->rpos = pQHdr->rpos % cElements;
     pQHdr->cUsed = 0;
@@ -764 +764 @@
         pQHdr->cUsed = cUsed + 1;
 
-        LogRelFlowFunc(("inserted %#04x into %s queue %p\n", bValue, pQHdr->pszDesc, pQHdr));
+        LogRelFlowFunc(("inserted %#04x into %s queue %p\n", bValue, R3STRING(pQHdr->pszDescR3), pQHdr));
     }
     else
     {
         Assert(cUsed == cElements);
-        LogRelFlowFunc(("%s queue %p full (%zu entries)\n", pQHdr->pszDesc, pQHdr, cElements));
+        LogRelFlowFunc(("%s queue %p full (%zu entries)\n", R3STRING(pQHdr->pszDescR3), pQHdr, cElements));
     }
 }
@@ -804 +804 @@
         pQHdr->cUsed = cUsed - 1;
 
-        LogFlowFunc(("removed 0x%02X from %s queue %p\n", *pbValue, pQHdr->pszDesc, pQHdr));
+        LogFlowFunc(("removed 0x%02X from %s queue %p\n", *pbValue, R3STRING(pQHdr->pszDescR3), pQHdr));
         rc = VINF_SUCCESS;
     }
     else
     {
-        LogFlowFunc(("%s queue %p empty\n", pQHdr->pszDesc, pQHdr));
+        LogFlowFunc(("%s queue %p empty\n", R3STRING(pQHdr->pszDescR3), pQHdr));
         rc = VINF_TRY_AGAIN;
     }
@@ -835 +835 @@
     pHlp->pfnSSMPutU32(pSSM, cItems);
 
-    LogFlow(("Storing %u items from %s queue %p\n", cItems, pQHdr->pszDesc, pQHdr));
+    LogFlow(("Storing %u items from %s queue %p\n", cItems, pQHdr->pszDescR3, pQHdr));
 
     /* Save queue data - only the bytes actually used (typically zero). */
@@ -860 +860 @@
     AssertRCReturn(rc, rc);
 
-    LogFlow(("Loading %u items to %s queue %p\n", cUsed, pQHdr->pszDesc, pQHdr));
+    LogFlow(("Loading %u items to %s queue %p\n", cUsed, pQHdr->pszDescR3, pQHdr));
 
     AssertMsgReturn(cUsed <= cElements, ("Saved size=%u, actual=%zu\n", cUsed, cElements),

trunk/src/VBox/Devices/Input/DevPS2.h

@@ -34 +34 @@
 typedef struct PS2QHDR
 {
-    uint32_t volatile   rpos;
-    uint32_t volatile   wpos;
-    uint32_t volatile   cUsed;
-    uint32_t            uPadding;
-    const char          *pszDesc;
+    uint32_t volatile       rpos;
+    uint32_t volatile       wpos;
+    uint32_t volatile       cUsed;
+    uint32_t                uPadding;
+    R3PTRTYPE(const char *) pszDescR3;
 } PS2QHDR;
 /** Pointer to a queue header. */

trunk/src/VBox/Devices/Input/DevPS2K.cpp

@@ -1473 +1473 @@
     pThisCC->Keyboard.IPort.pfnPutEventHid    = ps2kR3KeyboardPort_PutEventHid;
 
-    pThis->cmdQ.Hdr.pszDesc = "Kbd Cmd";
-    pThis->keyQ.Hdr.pszDesc = "Kbd Key";
+    pThis->cmdQ.Hdr.pszDescR3 = "Kbd Cmd";
+    pThis->keyQ.Hdr.pszDescR3 = "Kbd Key";
 
     /*

trunk/src/VBox/Devices/Input/DevPS2M.cpp

@@ -1062 +1062 @@
     LogFlowFunc(("\n"));
 
-    pThis->cmdQ.Hdr.pszDesc = "Aux Cmd";
-    pThis->evtQ.Hdr.pszDesc = "Aux Evt";
+    pThis->cmdQ.Hdr.pszDescR3 = "Aux Cmd";
+    pThis->evtQ.Hdr.pszDescR3 = "Aux Evt";
 
 #ifdef RT_STRICT
@@ -1127 +1127 @@
     This.u8State = AUX_STATE_ENABLED;
     This.fThrottleActive = true;
-    This.cmdQ.Hdr.pszDesc = "Test Aux Cmd";
-    This.evtQ.Hdr.pszDesc = "Test Aux Evt";
+    This.cmdQ.Hdr.pszDescR3 = "Test Aux Cmd";
+    This.evtQ.Hdr.pszDescR3 = "Test Aux Evt";
     /* Certain Windows touch pad drivers report a double tap as a press, then
      * a release-press-release all within a single 10ms interval.  Simulate