Changeset 101234 in vbox for trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin-armv8.cpp

Timestamp:

Sep 22, 2023 9:06:14 AM (16 months ago)

Author:

vboxsync

Message:

VMM/NEMR3Native-darwin-armv8.cpp: Need to sync the ID registers upon first guest code exec call or overrides from loading a saved state are not accounted for, bugref:10390

File:

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

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

@@ -836 +836 @@
         return VMSetError(pVM, VERR_NEM_VM_CREATE_FAILED, RT_SRC_POS,
                           "Setting MPIDR_EL1 failed on vCPU %u: %#x (%Rrc)", idCpu, hrc, nemR3DarwinHvSts2Rc(hrc));
-
-    /*
-     * The guest ID registers are populated after the call to CPUMR3PopulateFeaturesByIdRegisters() so
-     * query the guest ID registers now and sync them to the vCPU once as they are constant during guest lifetime.
-     */
-    static const struct
-    {
-        const char       *pszIdReg;
-        hv_sys_reg_t     enmHvReg;
-        uint32_t         offIdStruct;
-    } s_aSysIdRegs[] =
-    {
-#define ID_SYS_REG_CREATE(a_IdReg, a_CpumIdReg) { #a_IdReg, HV_SYS_REG_##a_IdReg,     RT_UOFFSETOF(CPUMIDREGS, a_CpumIdReg) }
-        ID_SYS_REG_CREATE(ID_AA64DFR0_EL1,  u64RegIdAa64Dfr0El1),
-        ID_SYS_REG_CREATE(ID_AA64DFR1_EL1,  u64RegIdAa64Dfr1El1),
-        ID_SYS_REG_CREATE(ID_AA64ISAR0_EL1, u64RegIdAa64Isar0El1),
-        ID_SYS_REG_CREATE(ID_AA64ISAR1_EL1, u64RegIdAa64Isar1El1),
-        ID_SYS_REG_CREATE(ID_AA64MMFR0_EL1, u64RegIdAa64Mmfr0El1),
-        ID_SYS_REG_CREATE(ID_AA64MMFR1_EL1, u64RegIdAa64Mmfr1El1),
-        ID_SYS_REG_CREATE(ID_AA64MMFR2_EL1, u64RegIdAa64Mmfr2El1),
-        ID_SYS_REG_CREATE(ID_AA64PFR0_EL1,  u64RegIdAa64Pfr0El1),
-        ID_SYS_REG_CREATE(ID_AA64PFR1_EL1,  u64RegIdAa64Pfr1El1),
-#undef ID_SYS_REG_CREATE
-    };
-
-    PCCPUMIDREGS pIdRegsGst = NULL;
-    int rc = CPUMR3QueryGuestIdRegs(pVM, &pIdRegsGst);
-    AssertRCReturn(rc, rc);
-
-    for (uint32_t i = 0; i < RT_ELEMENTS(s_aSysIdRegs); i++)
-    {
-        uint64_t *pu64 = (uint64_t *)((uint8_t *)pIdRegsGst + s_aSysIdRegs[i].offIdStruct);
-        hrc = hv_vcpu_set_sys_reg(pVCpu->nem.s.hVCpu, s_aSysIdRegs[i].enmHvReg, *pu64);
-        if (hrc != HV_SUCCESS)
-            return VMSetError(pVM, VERR_NEM_VM_CREATE_FAILED, RT_SRC_POS,
-                              "Setting %s failed on vCPU %u: %#x (%Rrc)", s_aSysIdRegs[i].pszIdReg, idCpu, hrc, nemR3DarwinHvSts2Rc(hrc));
-    }
 
     return VINF_SUCCESS;
@@ -1640 +1603 @@
     AssertReturn(NEMR3CanExecuteGuest(pVM, pVCpu), VERR_NEM_IPE_9);
 
+    if (RT_UNLIKELY(!pVCpu->nem.s.fIdRegsSynced))
+    {
+        /*
+         * Sync the guest ID registers which are per VM once (they are readonly and stay constant during VM lifetime).
+         * Need to do it here and not during the init because loading a saved state might change the ID registers from what
+         * done in the call to CPUMR3PopulateFeaturesByIdRegisters().
+         */
+        static const struct
+        {
+            const char       *pszIdReg;
+            hv_sys_reg_t     enmHvReg;
+            uint32_t         offIdStruct;
+        } s_aSysIdRegs[] =
+        {
+#define ID_SYS_REG_CREATE(a_IdReg, a_CpumIdReg) { #a_IdReg, HV_SYS_REG_##a_IdReg,     RT_UOFFSETOF(CPUMIDREGS, a_CpumIdReg) }
+            ID_SYS_REG_CREATE(ID_AA64DFR0_EL1,  u64RegIdAa64Dfr0El1),
+            ID_SYS_REG_CREATE(ID_AA64DFR1_EL1,  u64RegIdAa64Dfr1El1),
+            ID_SYS_REG_CREATE(ID_AA64ISAR0_EL1, u64RegIdAa64Isar0El1),
+            ID_SYS_REG_CREATE(ID_AA64ISAR1_EL1, u64RegIdAa64Isar1El1),
+            ID_SYS_REG_CREATE(ID_AA64MMFR0_EL1, u64RegIdAa64Mmfr0El1),
+            ID_SYS_REG_CREATE(ID_AA64MMFR1_EL1, u64RegIdAa64Mmfr1El1),
+            ID_SYS_REG_CREATE(ID_AA64MMFR2_EL1, u64RegIdAa64Mmfr2El1),
+            ID_SYS_REG_CREATE(ID_AA64PFR0_EL1,  u64RegIdAa64Pfr0El1),
+            ID_SYS_REG_CREATE(ID_AA64PFR1_EL1,  u64RegIdAa64Pfr1El1),
+#undef ID_SYS_REG_CREATE
+        };
+
+        PCCPUMIDREGS pIdRegsGst = NULL;
+        int rc = CPUMR3QueryGuestIdRegs(pVM, &pIdRegsGst);
+        AssertRCReturn(rc, rc);
+
+        for (uint32_t i = 0; i < RT_ELEMENTS(s_aSysIdRegs); i++)
+        {
+            uint64_t *pu64 = (uint64_t *)((uint8_t *)pIdRegsGst + s_aSysIdRegs[i].offIdStruct);
+            hv_return_t hrc = hv_vcpu_set_sys_reg(pVCpu->nem.s.hVCpu, s_aSysIdRegs[i].enmHvReg, *pu64);
+            if (hrc != HV_SUCCESS)
+                return VMSetError(pVM, VERR_NEM_SET_REGISTERS_FAILED, RT_SRC_POS,
+                                  "Setting %s failed on vCPU %u: %#x (%Rrc)", s_aSysIdRegs[i].pszIdReg, pVCpu->idCpu, hrc, nemR3DarwinHvSts2Rc(hrc));
+        }
+
+        pVCpu->nem.s.fIdRegsSynced = true;
+    }
+
     /*
      * Try switch to NEM runloop state.