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

Timestamp:

May 4, 2007 6:21:26 PM (18 years ago)

Author:

vboxsync

Message:

Documented port I/O status code and fixed places where we didn't handle them correctly. (part 3)

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (3 diffs)
• HWVMXR0.cpp (modified) (5 diffs)

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

@@ -1190 +1190 @@
     }
 
-    /** @note We'll get a #GP if the IO instruction isn't allowed (IOPL or TSS bitmap); no need to double check. */
+    /* Note: We'll get a #GP if the IO instruction isn't allowed (IOPL or TSS bitmap); no need to double check. */
     case SVM_EXIT_IOIO:              /* I/O instruction. */
     {
@@ -1260 +1260 @@
                 STAM_COUNTER_INC(&pVM->hwaccm.s.StatExitIORead);
                 rc = IOMIOPortRead(pVM, IoExitInfo.n.u16Port, &u32Val, uIOSize);
-                if (rc == VINF_SUCCESS)
+                if (    rc == VINF_SUCCESS
+                    ||  (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST))
                 {
                     /* Write back to the EAX register. */
@@ -1268 +1269 @@
             }
         }
-        if (rc == VINF_SUCCESS)
+        if (    rc == VINF_SUCCESS
+            ||  (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST))
         {
             /* Update EIP and continue execution. */
             pCtx->eip = pVMCB->ctrl.u64ExitInfo2;      /* RIP/EIP of the next instruction is saved in EXITINFO2. */
-            STAM_PROFILE_ADV_STOP(&pVM->hwaccm.s.StatExit, x);
-            goto ResumeExecution;
-        }
-        Assert(rc == VINF_IOM_HC_IOPORT_READ || rc == VINF_IOM_HC_IOPORT_WRITE);
-        rc = (IoExitInfo.n.u1Type == 0) ? VINF_IOM_HC_IOPORT_WRITE : VINF_IOM_HC_IOPORT_READ;
+            if (RT_LIKELY(rc == VINF_SUCCESS))
+            {
+                STAM_PROFILE_ADV_STOP(&pVM->hwaccm.s.StatExit, x);
+                goto ResumeExecution;
+            }
+            Log2(("EM status from IO at %VGv %x size %d: %Vrc\n", pCtx->eip, IoExitInfo.n.u16Port, uIOSize, rc));
+            break;
+        }
+#ifdef VBOX_STRICT
+        if (rc == VINF_IOM_HC_IOPORT_READ)
+            Assert(IoExitInfo.n.u1Type != 0);
+        else if (rc == VINF_IOM_HC_IOPORT_WRITE)
+            Assert(IoExitInfo.n.u1Type == 0);
+        else
+            AssertMsg(VBOX_FAILURE(rc) || rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_EM_RESCHEDULE_REM, ("%Vrc\n", rc));
+#endif 
         Log2(("Failed IO at %VGv %x size %d\n", pCtx->eip, IoExitInfo.n.u16Port, uIOSize));
         break;

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

@@ -1565 +1565 @@
         if (RT_UNLIKELY(uIOWidth == 2 || uIOWidth >= 4))
         {
-            rc = VINF_IOM_HC_IOPORT_READWRITE;
+            rc = fIOWrite ? VINF_IOM_HC_IOPORT_WRITE : VINF_IOM_HC_IOPORT_READ;
             break;
         }
@@ -1609 +1609 @@
                 STAM_COUNTER_INC(&pVM->hwaccm.s.StatExitIORead);
                 rc = IOMIOPortRead(pVM, uPort, &u32Val, cbSize);
-                if (rc == VINF_SUCCESS)
+                if (    rc == VINF_SUCCESS
+                    ||  (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST))
                 {
                     /* Write back to the EAX register. */
@@ -1616 +1617 @@
             }
         }
-        if (rc == VINF_SUCCESS)
+        if (    rc == VINF_SUCCESS
+            ||  (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST))
         {
             /* Update EIP and continue execution. */
             pCtx->eip += cbInstr;
-            STAM_PROFILE_ADV_STOP(&pVM->hwaccm.s.StatExit, x);
-            goto ResumeExecution;
-        }
-        Assert(rc == VINF_IOM_HC_IOPORT_READ || rc == VINF_IOM_HC_IOPORT_WRITE);
-        rc = (fIOWrite) ? VINF_IOM_HC_IOPORT_WRITE : VINF_IOM_HC_IOPORT_READ;
-
+            if (RT_LIKELY(rc == VINF_SUCCESS))
+            {
+                STAM_PROFILE_ADV_STOP(&pVM->hwaccm.s.StatExit, x);
+                goto ResumeExecution;
+            }
+            break;
+        }
+#ifdef VBOX_STRICT
+        if (rc == VINF_IOM_HC_IOPORT_READ)
+            Assert(!fIOWrite);
+        else if (rc == VINF_IOM_HC_IOPORT_WRITE)
+            Assert(fIOWrite);
+        else
+            AssertMsg(VBOX_FAILURE(rc) || rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_EM_RESCHEDULE_REM, ("%Vrc\n", rc));
+#endif
         break;
     }
@@ -1634 +1645 @@
     }
 
-    /** Note: the guest state isn't entirely synced back at this stage. */
+    /* Note: the guest state isn't entirely synced back at this stage. */
 
     /* Investigate why there was a VM-exit. (part 2) */
@@ -1705 +1716 @@
     case VMX_EXIT_PORT_IO:              /* 30 I/O instruction. */
         /* already handled above */
-        AssertMsg(rc == VINF_PGM_CHANGE_MODE || rc == VINF_EM_RAW_INTERRUPT || rc == VINF_EM_RAW_EMULATE_INSTR || rc == VINF_PGM_SYNC_CR3 || rc == VINF_IOM_HC_IOPORT_READ || rc == VINF_IOM_HC_IOPORT_WRITE || rc == VINF_IOM_HC_IOPORT_READWRITE, ("rc = %d\n", rc));
+        AssertMsg(rc == VINF_PGM_CHANGE_MODE || rc == VINF_EM_RAW_INTERRUPT || rc == VINF_EM_RAW_EMULATE_INSTR || rc == VINF_PGM_SYNC_CR3 || rc == VINF_IOM_HC_IOPORT_READ || rc == VINF_IOM_HC_IOPORT_WRITE
+                  || rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_EM_RESCHEDULE_REM, ("rc = %d\n", rc));
         break;