Changeset 100724 in vbox for trunk

Timestamp:

Jul 28, 2023 8:17:21 AM (21 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

158583

Message:

VMM/ARM: Add PAuth key system registers in the vCPU state, bugref:10387, bugref:10390

Location:

trunk

Files:

• include/VBox/vmm/cpumctx-armv8.h (modified) (5 diffs)
• src/VBox/VMM/VMMR3/NEMR3Native-darwin-armv8.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/cpumctx-armv8.h

@@ -119 +119 @@
 #ifndef VBOX_FOR_DTRACE_LIB
 AssertCompileSize(CPUMCTXSYSREG, 8);
+#endif
 
 
@@ -137 +138 @@
 /** Pointer to a const debug register state. */
 typedef const CPUMCTXSYSREGDBG *PCCPUMCTXSYSREGDBG;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(CPUMCTXSYSREGDBG, 16);
+#endif
+
+
+/**
+ * A pointer authentication key register state (low and high), these are held together
+ * because they will be accessed together very often and thus minimizes
+ * stress on the cache.
+ */
+typedef struct CPUMCTXSYSREGPAKEY
+{
+    /** The low key register. */
+    CPUMCTXSYSREG   Low;
+    /** The high key register. */
+    CPUMCTXSYSREG   High;
+} CPUMCTXSYSREGPAKEY;
+/** Pointer to a pointer authentication key register state. */
+typedef CPUMCTXSYSREGPAKEY *PCPUMCTXSYSREGPAKEY;
+/** Pointer to a const pointer authentication key register state. */
+typedef const CPUMCTXSYSREGPAKEY *PCCPUMCTXSYSREGPAKEY;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(CPUMCTXSYSREGPAKEY, 16);
 #endif
 
@@ -167 +191 @@
     /** The VBAR_EL1 register. */
     CPUMCTXSYSREG       VBar;
-    /** Breakpoint registers, DBGB{C,V}<n>_EL1. */
+    /** Breakpoint registers, DBGB{C,V}n_EL1. */
     CPUMCTXSYSREGDBG    aBp[16];
-    /** Watchpoint registers, DBGW{C,V}<n>_EL1. */
+    /** Watchpoint registers, DBGW{C,V}n_EL1. */
     CPUMCTXSYSREGDBG    aWp[16];
+    /** APDA key register state. */
+    CPUMCTXSYSREGPAKEY  Apda;
+    /** APDB key register state. */
+    CPUMCTXSYSREGPAKEY  Apdb;
+    /** APGA key register state. */
+    CPUMCTXSYSREGPAKEY  Apga;
+    /** APIA key register state. */
+    CPUMCTXSYSREGPAKEY  Apia;
+    /** APIB key register state. */
+    CPUMCTXSYSREGPAKEY  Apib;
 
     /** Floating point control register. */
@@ -194 +228 @@
     uint64_t            CntvCValEl0;
 
-    uint64_t            au64Padding2[6];
+    uint64_t            au64Padding2[4];
 } CPUMCTX;
 
@@ -257 +291 @@
 /** Debug system registers are kept externally. */
 #define CPUMCTX_EXTRN_SYSREG_DEBUG              UINT64_C(0x0000000000010000)
+/** PAuth key system registers are kept externally. */
+#define CPUMCTX_EXTRN_SYSREG_PAUTH_KEYS         UINT64_C(0x0000000000020000)
 /** Various system registers (rarely accessed) are kept externally. */
-#define CPUMCTX_EXTRN_SYSREG_MISC               UINT64_C(0x0000000000020000)
+#define CPUMCTX_EXTRN_SYSREG_MISC               UINT64_C(0x0000000000040000)
 
 /** Mask of bits the keepers can use for state tracking. */

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

@@ -219 +219 @@
     CPUM_DBGREG_EMIT(W, 15)
 #undef CPUM_DBGREG_EMIT
+};
+/** PAuth key system registers. */
+static const struct
+{
+    hv_sys_reg_t        enmHvReg;
+    uint32_t            offCpumCtx;
+} s_aCpumPAuthKeyRegs[] =
+{
+    { HV_SYS_REG_APDAKEYLO_EL1, RT_UOFFSETOF(CPUMCTX, Apda.Low.u64)  },
+    { HV_SYS_REG_APDAKEYHI_EL1, RT_UOFFSETOF(CPUMCTX, Apda.High.u64) },
+    { HV_SYS_REG_APDBKEYLO_EL1, RT_UOFFSETOF(CPUMCTX, Apdb.Low.u64)  },
+    { HV_SYS_REG_APDBKEYHI_EL1, RT_UOFFSETOF(CPUMCTX, Apdb.High.u64) },
+    { HV_SYS_REG_APGAKEYLO_EL1, RT_UOFFSETOF(CPUMCTX, Apga.Low.u64)  },
+    { HV_SYS_REG_APGAKEYHI_EL1, RT_UOFFSETOF(CPUMCTX, Apga.High.u64) },
+    { HV_SYS_REG_APIAKEYLO_EL1, RT_UOFFSETOF(CPUMCTX, Apia.Low.u64)  },
+    { HV_SYS_REG_APIAKEYHI_EL1, RT_UOFFSETOF(CPUMCTX, Apia.High.u64) },
+    { HV_SYS_REG_APIBKEYLO_EL1, RT_UOFFSETOF(CPUMCTX, Apib.Low.u64)  },
+    { HV_SYS_REG_APIBKEYHI_EL1, RT_UOFFSETOF(CPUMCTX, Apib.High.u64) }
 };
 /** System registers. */
@@ -569 +587 @@
 
     if (   hrc == HV_SUCCESS
+        && (fWhat & CPUMCTX_EXTRN_SYSREG_PAUTH_KEYS))
+    {
+        /* Debug registers. */
+        for (uint32_t i = 0; i < RT_ELEMENTS(s_aCpumPAuthKeyRegs); i++)
+        {
+            uint64_t *pu64 = (uint64_t *)((uint8_t *)&pVCpu->cpum.GstCtx + s_aCpumPAuthKeyRegs[i].offCpumCtx);
+            hrc |= hv_vcpu_get_sys_reg(pVCpu->nem.s.hVCpu, s_aCpumPAuthKeyRegs[i].enmHvReg, pu64);
+        }
+    }
+
+    if (   hrc == HV_SUCCESS
         && (fWhat & (CPUMCTX_EXTRN_SPSR | CPUMCTX_EXTRN_ELR | CPUMCTX_EXTRN_SP | CPUMCTX_EXTRN_SCTLR_TCR_TTBR | CPUMCTX_EXTRN_SYSREG_MISC)))
     {
@@ -645 +674 @@
             uint64_t *pu64 = (uint64_t *)((uint8_t *)&pVCpu->cpum.GstCtx + s_aCpumDbgRegs[i].offCpumCtx);
             hrc |= hv_vcpu_set_sys_reg(pVCpu->nem.s.hVCpu, s_aCpumDbgRegs[i].enmHvReg, *pu64);
+        }
+    }
+
+    if (   hrc == HV_SUCCESS
+        && !(pVCpu->cpum.GstCtx.fExtrn & CPUMCTX_EXTRN_SYSREG_PAUTH_KEYS))
+    {
+        /* Debug registers. */
+        for (uint32_t i = 0; i < RT_ELEMENTS(s_aCpumPAuthKeyRegs); i++)
+        {
+            uint64_t *pu64 = (uint64_t *)((uint8_t *)&pVCpu->cpum.GstCtx + s_aCpumPAuthKeyRegs[i].offCpumCtx);
+            hrc |= hv_vcpu_set_sys_reg(pVCpu->nem.s.hVCpu, s_aCpumPAuthKeyRegs[i].enmHvReg, *pu64);
         }
     }