Changeset 22461 in vbox for trunk

Timestamp:

Aug 26, 2009 9:50:17 AM (15 years ago)

Author:

vboxsync

Message:

DevPS2: Protect the internal device state with a PDM critsect.

File:

• trunk/src/VBox/Devices/Input/DevPS2.cpp (modified) (11 diffs)

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

@@ -230 +230 @@
     /** Pointer to the device instance. */
     PPDMDEVINSR0                pDevInsR0;
+    /** Critical section protecting the state. */
+    PDMCRITSECT                 CritSect;
     /**
      * Keyboard port - LUN#0.
@@ -288 +290 @@
     {
         s->status |= KBD_STAT_OBF;
-        if ((s->mode & KBD_MODE_KBD_INT) && !(s->mode & KBD_MODE_DISABLE_KBD))
+        if ((s->mode & KBD_MODE_KBD_INT) /*&& !(s->mode & KBD_MODE_DISABLE_KBD)*/)
             irq1_level = 1;
     }
@@ -1298 +1300 @@
     if (cb == 1)
     {
-        *pu32 = kbd_read_data(PDMINS_2_DATA(pDevIns, KBDState *), Port);
-        Log2(("kbdIOPortDataRead: Port=%#x cb=%d *pu32=%#x\n", Port, cb, *pu32));
-        return VINF_SUCCESS;
+        KBDState *pThis = PDMINS_2_DATA(pDevIns, KBDState *);
+        int rc = PDMCritSectEnter(&pThis->CritSect, VINF_IOM_HC_IOPORT_READ);
+        if (RT_LIKELY(rc == VINF_SUCCESS))
+        {
+            *pu32 = kbd_read_data(pThis, Port);
+            PDMCritSectLeave(&pThis->CritSect);
+            Log2(("kbdIOPortDataRead: Port=%#x cb=%d *pu32=%#x\n", Port, cb, *pu32));
+        }
+        return rc;
     }
     AssertMsgFailed(("Port=%#x cb=%d\n", Port, cb));
@@ -1323 +1331 @@
     if (cb == 1)
     {
-        rc = kbd_write_data(PDMINS_2_DATA(pDevIns, KBDState *), Port, u32);
-        Log2(("kbdIOPortDataWrite: Port=%#x cb=%d u32=%#x\n", Port, cb, u32));
+        KBDState *pThis = PDMINS_2_DATA(pDevIns, KBDState *);
+        rc = PDMCritSectEnter(&pThis->CritSect, VINF_IOM_HC_IOPORT_WRITE);
+        if (RT_LIKELY(rc == VINF_SUCCESS))
+        {
+            rc = kbd_write_data(pThis, Port, u32);
+            PDMCritSectLeave(&pThis->CritSect);
+            Log2(("kbdIOPortDataWrite: Port=%#x cb=%d u32=%#x\n", Port, cb, u32));
+        }
     }
     else
@@ -1347 +1361 @@
     if (cb == 1)
     {
-        *pu32 = kbd_read_status(PDMINS_2_DATA(pDevIns, KBDState *), Port);
-        Log2(("kbdIOPortStatusRead: Port=%#x cb=%d -> *pu32=%#x\n", Port, cb, *pu32));
-        return VINF_SUCCESS;
+        KBDState *pThis = PDMINS_2_DATA(pDevIns, KBDState *);
+        int rc = PDMCritSectEnter(&pThis->CritSect, VINF_IOM_HC_IOPORT_READ);
+        if (RT_LIKELY(rc == VINF_SUCCESS))
+        {
+            *pu32 = kbd_read_status(pThis, Port);
+            PDMCritSectLeave(&pThis->CritSect);
+            Log2(("kbdIOPortStatusRead: Port=%#x cb=%d -> *pu32=%#x\n", Port, cb, *pu32));
+        }
+        return rc;
     }
     AssertMsgFailed(("Port=%#x cb=%d\n", Port, cb));
@@ -1368 +1388 @@
 PDMBOTHCBDECL(int) kbdIOPortCommandWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
+    int rc = VINF_SUCCESS;
     NOREF(pvUser);
     if (cb == 1)
     {
-        int rc = kbd_write_command(PDMINS_2_DATA(pDevIns, KBDState *), Port, u32);
-        Log2(("kbdIOPortCommandWrite: Port=%#x cb=%d u32=%#x rc=%Rrc\n", Port, cb, u32, rc));
-        return rc;
-    }
-    AssertMsgFailed(("Port=%#x cb=%d\n", Port, cb));
-    return VINF_SUCCESS;
+        KBDState *pThis = PDMINS_2_DATA(pDevIns, KBDState *);
+        rc = PDMCritSectEnter(&pThis->CritSect, VINF_IOM_HC_IOPORT_WRITE);
+        if (RT_LIKELY(rc == VINF_SUCCESS))
+        {
+            rc = kbd_write_command(pThis, Port, u32);
+            PDMCritSectLeave(&pThis->CritSect);
+            Log2(("kbdIOPortCommandWrite: Port=%#x cb=%d u32=%#x rc=%Rrc\n", Port, cb, u32, rc));
+        }
+    }
+    else
+        AssertMsgFailed(("Port=%#x cb=%d\n", Port, cb));
+    return rc;
 }
 
@@ -1460 +1487 @@
 {
     KBDState *pThis = IKEYBOARDPORT_2_KBDSTATE(pInterface);
+    int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
+    AssertReleaseRC(rc);
     pc_kbd_put_keycode(pThis, u8KeyCode);
+    PDMCritSectLeave(&pThis->CritSect);
     return VINF_SUCCESS;
 }
@@ -1508 +1538 @@
 {
     KBDState *pThis = IMOUSEPORT_2_KBDSTATE(pInterface);
+    int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
+    AssertReleaseRC(rc);
     pc_kbd_mouse_event(pThis, i32DeltaX, i32DeltaY, i32DeltaZ, fButtonStates);
+    PDMCritSectLeave(&pThis->CritSect);
     return VINF_SUCCESS;
 }
@@ -1646 +1679 @@
 }
 
+/**
+ * Destruct a device instance for a VM.
+ *
+ * @returns VBox status.
+ * @param   pDevIns     The device instance data.
+ */
+static DECLCALLBACK(int) kbdDestruct(PPDMDEVINS pDevIns)
+{
+    KBDState   *pThis = PDMINS_2_DATA(pDevIns, KBDState *);
+    PDMR3CritSectDelete(&pThis->CritSect);
+
+    return VINF_SUCCESS;
+}
 
 /**
@@ -1693 +1739 @@
     pThis->Mouse.Base.pfnQueryInterface     = kbdMouseQueryInterface;
     pThis->Mouse.Port.pfnPutEvent           = kbdMousePutEvent;
+
+    /*
+     * Initialize the critical section.
+     */
+    char szName[24];
+    RTStrPrintf(szName, sizeof(szName), "PS2KM#%d", iInstance);
+    rc = PDMDevHlpCritSectInit(pDevIns, &pThis->CritSect, szName);
+    if (RT_FAILURE(rc))
+        return rc;
 
     /*
@@ -1774 +1829 @@
     kbdConstruct,
     /* pfnDestruct */
-    NULL,
+    kbdDestruct,
     /* pfnRelocate */
     kdbRelocate,