Loads ID_AA64MMFR1_EL1 (#980)

src/core/src/vmm/hv/aarch64.rs

@@ -5,6 +5,8 @@ use bitfield_struct::bitfield;
 pub struct CpuFeats {
     /// Raw value of `ID_AA64MMFR0_EL1`.
     pub mmfr0: Mmfr0,
+    /// Raw value of `ID_AA64MMFR1_EL1`.
+    pub mmfr1: Mmfr1,
 }
 
 /// Represents a value of `PSTATE`.
@@ -23,6 +25,8 @@ pub struct Pstate {
 }
 
 /// Represents a value of `ID_AA64MMFR0_EL1`.
+///
+/// All documentation copied from Arm Architecture Reference Manual for A-profile architecture.
 #[bitfield(u64)]
 pub struct Mmfr0 {
     /// Physical Address range supported.
@@ -188,3 +192,251 @@ pub struct Mmfr0 {
     #[bits(4)]
     pub ecv: u8,
 }
+
+/// Represents a value of `ID_AA64MMFR1_EL1`.
+///
+/// All documentation copied from Arm Architecture Reference Manual for A-profile architecture.
+#[bitfield(u64)]
+pub struct Mmfr1 {
+    /// Hardware updates to Access flag and Dirty state in translation tables.
+    ///
+    /// - `0b0000`: Hardware update of the Access flag and dirty state are not supported.
+    /// - `0b0001`: Support for hardware update of the Access flag for Block and Page descriptors.
+    /// - `0b0010`: As `0b0001`, and adds support for hardware update of the Access flag for Block
+    ///   and Page descriptors. Hardware update of dirty state is supported.
+    /// - `0b0011`: As `0b0010`, and adds support for hardware update of the Access flag for Table
+    ///   descriptors.
+    ///
+    /// All other values are reserved.
+    ///
+    /// FEAT_HAFDBS implements the functionality identified by the values `0b0001` and `0b0010`.
+    ///
+    /// FEAT_HAFT implements the functionality identified by the value `0b0011`.
+    #[bits(4)]
+    pub hafdbs: u8,
+    /// Number of VMID bits.
+    ///
+    /// - `0b0000`: 8 bits
+    /// - `0b0010`: 16 bits
+    ///
+    /// All other values are reserved.
+    ///
+    /// FEAT_VMID16 implements the functionality identified by the value `0b0010`.
+    ///
+    /// From Armv8.1, the permitted values are `0b0000` and `0b0010`.
+    #[bits(4)]
+    pub vmid_bits: u8,
+    /// Virtualization Host Extensions.
+    ///
+    /// - `0b0000`: Virtualization Host Extensions not supported.
+    /// - `0b0001`: Virtualization Host Extensions supported.
+    ///
+    /// All other values are reserved.
+    ///
+    /// FEAT_VHE implements the functionality identified by the value `0b0001`.
+    ///
+    /// From Armv8.1, the only permitted value is `0b0001`.
+    #[bits(4)]
+    pub vh: u8,
+    /// Hierarchical Permission Disables. Indicates support for disabling hierarchical controls in
+    /// translation tables.
+    ///
+    /// - `0b0000`: Disabling of hierarchical controls not supported.
+    /// - `0b0001`: Disabling of hierarchical controls supported with the TCR_EL1.{HPD1, HPD0},
+    ///   TCR_EL2.HPD or TCR_EL2.{HPD1, HPD0}, and TCR_EL3.HPD bits.
+    /// - `0b0010`: As for value `0b0001`, and adds possible hardware allocation of bits[62:59] of
+    ///   the Translation table descriptors from the final lookup level for `IMPLEMENTATION DEFINED`
+    ///   use.
+    ///
+    /// All other values are reserved.
+    ///
+    /// FEAT_HPDS implements the functionality identified by the value `0b0001`.
+    ///
+    /// FEAT_HPDS2 implements the functionality identified by the value `0b0010`.
+    ///
+    /// From Armv8.1, the value `0b0000` is not permitted.
+    #[bits(4)]
+    pub hpds: u8,
+    /// LORegions. Indicates support for LORegions.
+    ///
+    /// - `0b0000`: LORegions not supported.
+    /// - `0b0001`: LORegions supported.
+    ///
+    /// All other values are reserved.
+    ///
+    /// FEAT_LOR implements the functionality identified by the value `0b0001`.
+    ///
+    /// From Armv8.1, the only permitted value is `0b0001`.
+    #[bits(4)]
+    pub lo: u8,
+    /// Privileged Access Never. Indicates support for the PAN bit in PSTATE, SPSR_EL1, SPSR_EL2,
+    /// SPSR_EL3, and DSPSR_EL0.
+    ///
+    /// - `0b0000`: PAN not supported.
+    /// - `0b0001`: PAN supported.
+    /// - `0b0010`: PAN supported and AT S1E1RP and AT S1E1WP instructions supported.
+    /// - `0b0011`: PAN supported, AT S1E1RP and AT S1E1WP instructions supported, and
+    ///   SCTLR_EL1.EPAN and SCTLR_EL2.EPAN bits supported.
+    ///
+    /// All other values are reserved.
+    ///
+    /// FEAT_PAN implements the functionality identified by the value `0b0001`.
+    ///
+    /// FEAT_PAN2 implements the functionality added by the value `0b0010`.
+    ///
+    /// FEAT_PAN3 implements the functionality added by the value `0b0011`.
+    ///
+    /// In Armv8.1, the permitted values are `0b0001`, `0b0010`, and `0b0011`.
+    ///
+    /// From Armv8.2, the permitted values are `0b0010` and `0b0011`.
+    ///
+    /// From Armv8.7, the only permitted value is `0b0011`.
+    #[bits(4)]
+    pub pan: u8,
+    /// ***When FEAT_RAS is implemented:***
+    ///
+    /// Describes whether the PE can generate SError exceptions from speculative reads of memory,
+    /// including speculative instruction fetches.
+    ///
+    /// - `0b0000`: The PE never generates an SError exception due to an External abort on a
+    ///   speculative read.
+    /// - `0b0001`: The PE might generate an SError exception due to an External abort on a
+    ///   speculative read.
+    ///
+    /// All other values are reserved.
+    ///
+    /// ***Otherwise:***
+    ///
+    /// Reserved, `RES0`.
+    #[bits(4)]
+    pub spec_sei: u8,
+    /// Indicates support for execute-never control distinction by Exception level at stage 2.
+    ///
+    /// - `0b0000`: Distinction between EL0 and EL1 execute-never control at stage 2 not supported.
+    /// - `0b0001`: Distinction between EL0 and EL1 execute-never control at stage 2 supported.
+    ///
+    /// All other values are reserved.
+    ///
+    /// FEAT_XNX implements the functionality identified by the value `0b0001`.
+    ///
+    /// From Armv8.2, the only permitted value is `0b0001`.
+    #[bits(4)]
+    pub xnx: u8,
+    /// Indicates support for the configurable delayed trapping of WFE.
+    ///
+    /// - `0b0000`: Configurable delayed trapping of WFE is not supported.
+    /// - `0b0001`: Configurable delayed trapping of WFE is supported.
+    ///
+    /// All other values are reserved.
+    ///
+    /// FEAT_TWED implements the functionality identified by the value `0b0001`.
+    ///
+    /// From Armv8.6, the permitted values are `0b0000` and `0b0001`.
+    #[bits(4)]
+    pub twed: u8,
+    /// Indicates support for Enhanced Translation Synchronization.
+    ///
+    /// - `0b0000`: Enhanced Translation Synchronization is not supported.
+    /// - `0b0001`: Enhanced Translation Synchronization is not supported.
+    /// - `0b0010`: Enhanced Translation Synchronization is supported.
+    ///
+    /// All other values are reserved.
+    ///
+    /// FEAT_ETS2 implements the functionality identified by the value `0b0010`.
+    ///
+    /// From Armv8.8, the values `0b0000` and `0b0001` are not permitted.
+    #[bits(4)]
+    pub ets: u8,
+    /// Indicates support for HCRX_EL2 and its associated EL3 trap.
+    ///
+    /// - `0b0000`: HCRX_EL2 and its associated EL3 trap are not supported.
+    /// - `0b0001`: HCRX_EL2 and its associated EL3 trap are supported.
+    ///
+    /// All other values are reserved.
+    ///
+    /// FEAT_HCX implements the functionality identified by the value `0b0001`.
+    ///
+    /// From Armv8.7, if EL2 is implemented, the only permitted value is `0b0001`.
+    #[bits(4)]
+    pub hcx: u8,
+    /// Indicates support for FPCR.{AH, FIZ, NEP}.
+    ///
+    /// - `0b0000`: The FPCR.{AH, FIZ, NEP} fields are not supported.
+    /// - `0b0001`: The FPCR.{AH, FIZ, NEP} fields are supported.
+    ///
+    /// All other values are reserved.
+    ///
+    /// FEAT_AFP implements the functionality identified by the value `0b0001`.
+    ///
+    /// From Armv8.7, if Advanced SIMD and floating-point is implemented, the only permitted value
+    /// is `0b0001`.
+    #[bits(4)]
+    pub afp: u8,
+    /// Indicates support for intermediate caching of translation table walks.
+    ///
+    /// - `0b0000`: The intermediate caching of translation table walks might include non-coherent
+    ///   physical translation caches.
+    /// - `0b0001`: The intermediate caching of translation table walks does not include
+    ///   non-coherent physical translation caches.
+    ///
+    /// All other values are reserved.
+    ///
+    /// Non-coherent physical translation caches are non-coherent caches of previous valid
+    /// translation table entries since the last completed relevant TLBI applicable to the PE, where
+    /// either:
+    ///
+    /// - The caching is indexed by the physical address of the location holding the translation
+    ///   table entry.
+    /// - The caching is used for stage 1 translations and is indexed by the intermediate physical
+    ///   address of the location holding the translation table entry.
+    ///
+    /// FEAT_nTLBPA implements the functionality identified by the value `0b0001`.
+    ///
+    /// From Armv8.0, the permitted values are `0b0000` and `0b0001`.
+    #[bits(4)]
+    pub n_tlbpa: u8,
+    /// Indicates whether SCTLR_EL1.TIDCP and SCTLR_EL2.TIDCP are implemented in AArch64 state.
+    ///
+    /// - `0b0000`: SCTLR_EL1.TIDCP and SCTLR_EL2.TIDCP bits are not implemented and are `RES0`.
+    /// - `0b0001`: SCTLR_EL1.TIDCP bit is implemented. If EL2 is implemented, SCTLR_EL2.TIDCP bit
+    ///   is implemented.
+    ///
+    /// All other values are reserved.
+    ///
+    /// FEAT_TIDCP1 implements the functionality identified by the value `0b0001`.
+    ///
+    /// From Armv8.8, the only permitted value is `0b0001`.
+    #[bits(4)]
+    pub tidcp1: u8,
+    /// Indicates support for cache maintenance instruction permission.
+    ///
+    /// - `0b0000`: SCTLR_EL1.CMOW, SCTLR_EL2.CMOW, and HCRX_EL2.CMOW bits are not implemented.
+    /// - `0b0001`: SCTLR_EL1.CMOW is implemented. If EL2 is implemented, SCTLR_EL2.CMOW and
+    ///   HCRX_EL2.CMOW bits are implemented.
+    ///
+    /// All other values are reserved.
+    ///
+    /// FEAT_CMOW implements the functionality identified by the value `0b0001`.
+    ///
+    /// From Armv8.8, the only permitted value is `0b0001`.
+    #[bits(4)]
+    pub cmow: u8,
+    /// Indicates support for restrictions on branch history speculation around exceptions.
+    ///
+    /// - `0b0000`: The implementation does not disclose whether the branch history information
+    ///   created in a context before an exception to a higher Exception level using AArch64 can be
+    ///   used by code before that exception to exploitatively control the execution of any indirect
+    ///   branches in code in a different context after the exception.
+    /// - `0b0001`: The branch history information created in a context before an exception to a
+    ///   higher Exception level using AArch64 cannot be used by code before that exception to
+    ///   exploitatively control the execution of any indirect branches in code in a different
+    ///   context after the exception.
+    ///
+    /// All other values are reserved.
+    ///
+    /// FEAT_ECBHB implements the functionality identified by the value `0b0001`.
+    ///
+    /// From Armv8.9, the value `0b0000` is not permitted.
+    #[bits(4)]
+    pub ecbhb: u8,
+}

src/core/src/vmm/hv/macos/mod.rs

@@ -90,14 +90,21 @@ impl Hypervisor for Hvf {
 
     #[cfg(target_arch = "aarch64")]
     fn cpu_features(&mut self) -> Result<CpuFeats, Self::CpuErr> {
-        use hv_sys::hv_feature_reg_t_HV_FEATURE_REG_ID_AA64MMFR0_EL1 as HV_FEATURE_REG_ID_AA64MMFR0_EL1;
+        use hv_sys::{
+            hv_feature_reg_t_HV_FEATURE_REG_ID_AA64MMFR0_EL1 as HV_FEATURE_REG_ID_AA64MMFR0_EL1,
+            hv_feature_reg_t_HV_FEATURE_REG_ID_AA64MMFR1_EL1 as HV_FEATURE_REG_ID_AA64MMFR1_EL1,
+        };
 
         let mmfr0 = self
             .read_feature_reg(HV_FEATURE_REG_ID_AA64MMFR0_EL1)
             .map_err(HvfCpuError::ReadMmfr0Failed)?;
+        let mmfr1 = self
+            .read_feature_reg(HV_FEATURE_REG_ID_AA64MMFR1_EL1)
+            .map_err(HvfCpuError::ReadMmfr1Failed)?;
 
         Ok(CpuFeats {
             mmfr0: mmfr0.into(),
+            mmfr1: mmfr1.into(),
         })
     }
 
@@ -150,6 +157,10 @@ pub enum HvfCpuError {
     #[cfg(target_arch = "aarch64")]
     #[error("couldn't read ID_AA64MMFR0_EL1 ({0:#x})")]
     ReadMmfr0Failed(NonZero<hv_return_t>),
+
+    #[cfg(target_arch = "aarch64")]
+    #[error("couldn't read ID_AA64MMFR1_EL1 ({0:#x})")]
+    ReadMmfr1Failed(NonZero<hv_return_t>),
 }
 
 #[cfg(target_arch = "aarch64")]