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

Timestamp:

May 22, 2023 10:36:30 AM (21 months ago)

Author:

vboxsync

Message:

VMM/NEMR3Native-darwin-armv8: Workaround for WFI/WFE leading to a guest hang currently and set the interrupt pending state properly for IRQ and FIQ interrupts, bugref:10390

File:

• trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin-armv8.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin-armv8.cpp

@@ -1023 +1023 @@
             return nemR3DarwinHandleExitExceptionTrappedHvcInsn(pVM, pVCpu, uIss);
         case ARMV8_ESR_EL2_EC_TRAPPED_WFX:
-            return VINF_EM_HALT;
+            return VINF_SUCCESS; /** @todo VINF_EM_HALT; We don't get notified about the vTimer if halting here currently leading to a guest hang...*/
         case ARMV8_ESR_EL2_EC_UNKNOWN:
         default:
@@ -1137 +1137 @@
 
     /* Set the pending interrupt state. */
-    if (VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_INTERRUPT_IRQ | VMCPU_FF_INTERRUPT_FIQ))
-    {
-        hv_return_t hrc = HV_SUCCESS;
-
-        if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_IRQ))
-        {
-            hrc = hv_vcpu_set_pending_interrupt(pVCpu->nem.s.hVCpu, HV_INTERRUPT_TYPE_IRQ, true);
-            AssertReturn(hrc == HV_SUCCESS, VERR_NEM_IPE_9);
+    hv_return_t hrc = HV_SUCCESS;
+    if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_IRQ))
+    {
+        hrc = hv_vcpu_set_pending_interrupt(pVCpu->nem.s.hVCpu, HV_INTERRUPT_TYPE_IRQ, true);
+        AssertReturn(hrc == HV_SUCCESS, VERR_NEM_IPE_9);
 #ifdef LOG_ENABLED
-            fIrq = true;
+        fIrq = true;
 #endif
-        }
-
-        if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_FIQ))
-        {
-            hrc = hv_vcpu_set_pending_interrupt(pVCpu->nem.s.hVCpu, HV_INTERRUPT_TYPE_FIQ, true);
-            AssertReturn(hrc == HV_SUCCESS, VERR_NEM_IPE_9);
+    }
+    else
+    {
+        hrc = hv_vcpu_set_pending_interrupt(pVCpu->nem.s.hVCpu, HV_INTERRUPT_TYPE_IRQ, false);
+        AssertReturn(hrc == HV_SUCCESS, VERR_NEM_IPE_9);
+    }
+
+    if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_FIQ))
+    {
+        hrc = hv_vcpu_set_pending_interrupt(pVCpu->nem.s.hVCpu, HV_INTERRUPT_TYPE_FIQ, true);
+        AssertReturn(hrc == HV_SUCCESS, VERR_NEM_IPE_9);
 #ifdef LOG_ENABLED
-            fFiq = true;
+        fFiq = true;
 #endif
-        }
     }
     else
     {
-        hv_return_t hrc = hv_vcpu_set_pending_interrupt(pVCpu->nem.s.hVCpu, HV_INTERRUPT_TYPE_IRQ, false);
-        AssertReturn(hrc == HV_SUCCESS, VERR_NEM_IPE_9);
-
         hrc = hv_vcpu_set_pending_interrupt(pVCpu->nem.s.hVCpu, HV_INTERRUPT_TYPE_FIQ, false);
         AssertReturn(hrc == HV_SUCCESS, VERR_NEM_IPE_9);