Changeset 90426 in vbox

Timestamp:

Jul 30, 2021 1:22:04 PM (4 years ago)

Author:

vboxsync

Message:

IOM: Be more careful checking the status of IOM_LOCK_SHARED(). bugref:6695

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IOMAll.cpp (modified) (4 diffs)
• IOMAllMmioNew.cpp (modified) (1 diff)

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

@@ -65 +65 @@
     /* For lookups we need to share lock IOM. */
     int rc2 = IOM_LOCK_SHARED(pVM);
-#ifndef IN_RING3
-    if (rc2 == VERR_SEM_BUSY)
+    if (RT_SUCCESS(rc2))
+    { /* likely */ }
+#ifndef IN_RING3
+    else if (rc2 == VERR_SEM_BUSY)
         return VINF_IOM_R3_IOPORT_READ;
 #endif
-    AssertRC(rc2);
+    else
+        AssertMsgFailedReturn(("rc2=%Rrc\n", rc2), rc2);
 
     /*
@@ -189 +192 @@
     /* For lookups we need to share lock IOM. */
     int rc2 = IOM_LOCK_SHARED(pVM);
-#ifndef IN_RING3
-    if (rc2 == VERR_SEM_BUSY)
+    if (RT_SUCCESS(rc2))
+    { /* likely */ }
+#ifndef IN_RING3
+    else if (rc2 == VERR_SEM_BUSY)
         return VINF_IOM_R3_IOPORT_READ;
 #endif
-    AssertRC(rc2);
+    else
+        AssertMsgFailedReturn(("rc2=%Rrc\n", rc2), rc2);
 
     const uint32_t cRequestedTransfers = *pcTransfers;
@@ -365 +371 @@
     /* For lookups we need to share lock IOM. */
     int rc2 = IOM_LOCK_SHARED(pVM);
-#ifndef IN_RING3
-    if (rc2 == VERR_SEM_BUSY)
+    if (RT_SUCCESS(rc2))
+    { /* likely */ }
+#ifndef IN_RING3
+    else if (rc2 == VERR_SEM_BUSY)
         return iomIOPortRing3WritePending(pVCpu, Port, u32Value, cbValue);
 #endif
-    AssertRC(rc2);
+    else
+        AssertMsgFailedReturn(("rc2=%Rrc\n", rc2), rc2);
 
     /*
@@ -475 +484 @@
     /* Take the IOM lock before performing any device I/O. */
     int rc2 = IOM_LOCK_SHARED(pVM);
-#ifndef IN_RING3
-    if (rc2 == VERR_SEM_BUSY)
+    if (RT_SUCCESS(rc2))
+    { /* likely */ }
+#ifndef IN_RING3
+    else if (rc2 == VERR_SEM_BUSY)
         return VINF_IOM_R3_IOPORT_WRITE;
 #endif
-    AssertRC(rc2);
+    else
+        AssertMsgFailedReturn(("rc2=%Rrc\n", rc2), rc2);
 
     const uint32_t cRequestedTransfers = *pcTransfers;

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

@@ -1021 +1021 @@
  * @returns VBox status code.  This API may return VINF_SUCCESS even if no
  *          remapping is made.
+ * @retval  VERR_SEM_BUSY in ring-0 if we cannot get the IOM lock.
  *
  * @param   pVM             The cross context VM structure.