target/arm: Implement MTE3
PATCH 1/1 target/arm: Implement MTE3
MTE3 introduces an asymmetric tag checking mode, in which loads are checked synchronously and stores are checked asynchronously. Add support for it.
--- target/arm/cpu64.c | 2 +- target/arm/mte_helper.c | 83 ++++++++++++++++++++++++++--------------- 2 files changed, 53 insertions(+), 32 deletions(-)
target/arm/cpu64.c +1 -1
@@ -683,7 +683,7 @@ static void aarch64_max_initfn(Object *obj)* during realize if the board provides no tag memory, much like * we do for EL2 with the virtualization=on property. */ - t =FIELD_DP64 (t,ID_AA64PFR1 ,MTE ,2 ); + t =FIELD_DP64 (t,ID_AA64PFR1 ,MTE ,3 ); cpu->isar.id_aa64pfr1 = t; t = cpu->isar.id_aa64mmfr0;
target/arm/mte_helper.c +52 -31
109 lines not on this page · raw message
Signature · 1 line
2.32.0.272.g935e593368-goog
Quoted 58 lines · Peter Collingbourne
MTE3 introduces an asymmetric tag checking mode, in which loads are checked synchronously and stores are checked asynchronously. Add support for it.
Signed-off-by Peter Collingbourne <[email protected]>--- target/arm/cpu64.c | 2 +- target/arm/mte_helper.c | 83 ++++++++++++++++++++++++++--------------- 2 files changed, 53 insertions(+), 32 deletions(-)target/arm/cpu64.c +1
-1@@ -683,7 +683,7 @@ static void aarch64_max_initfn(Object *obj)* during realize if the board provides no tag memory, much like * we do for EL2 with the virtualization=on property. */ - t =FIELD_DP64 (t,ID_AA64PFR1 ,MTE ,2 ); + t =FIELD_DP64 (t,ID_AA64PFR1 ,MTE ,3 ); cpu->isar.id_aa64pfr1 = t; t = cpu->isar.id_aa64mmfr0;target/arm/mte_helper.c +27
-0@@ -538,13 +538,51 @@ void HELPER(stzgm_tags)(CPUARMState *env, uint64_t ptr, uint64_t val) } } +static void mte_sync_check_fail (CPUARMState *env,uint32_t desc, +uint64_t dirty_ptr,uintptr_t ra) +{ +int is_write, syn; + + env->exception.vaddress = dirty_ptr; + + is_write =FIELD_EX32 (desc,MTEDESC ,WRITE ); + syn =syn_data_abort_no_iss (arm_current_el (env) !=0 ,0 ,0 ,0 ,0 , is_write, +0x11 ); +raise_exception_ra (env,EXCP_DATA_ABORT , syn,exception_target_el (env), ra); +g_assert_not_reached (); +} + +static void mte_async_check_fail (CPUARMState *env,uint32_t desc, +uint64_t dirty_ptr,uintptr_t ra, +ARMMMUIdx arm_mmu_idx,int el) +{ +int select; + +if (regime_has_2_ranges (arm_mmu_idx)) { + select =extract64 (dirty_ptr,55 ,1 ); + }else { + select =0 ; + } + env->cp15.tfsr_el[el] |=1 << select; +#ifdef CONFIG_USER_ONLY
target/arm/mte_helper.c void HELPER(stzgm_tags)(CPUARMState *env, uint64_t ptr, uint64_t val) · line 577
Quoted 10 lines
target/arm/mte_helper.c +10
-0+/* +* Stand in for a timer irq, setting _TIF_MTE_ASYNC_FAULT, +* which then sends a SIGSEGV when the thread is next scheduled. +* This cpu will return to the main loop at the end of the TB, +* which is rather sooner than "normal". But the alternative +* is waiting until the next syscall. +*/ +qemu_cpu_kick (env_cpu (env)); +#endif +}
This is ok, though the desc parameter is unused for async. I'm not adverse to using a goto, like so.
But either way,
r~
---%<
target/arm/mte_helper.c +13 -9
@@ -561,12 +561,23 @@ static void mte_check_fail(CPUARMState *env, uint32_t desc, tcf =extract64 (sctlr,40 ,2 ); } + is_write =FIELD_EX32 (desc,MTEDESC ,WRITE ); +switch (tcf) { +default :/* case 3 */ +/* +* Tag check fail causes asynchronous flag set for stores, +* or a synchronous exception for loads. +*/ +if (is_write) { + goto fail_async; + } +/* fall through */ +case 1 :/* Tag check fail causes a synchronous exception. */ env->exception.vaddress = dirty_ptr; - is_write =FIELD_EX32 (desc,MTEDESC ,WRITE ); syn =syn_data_abort_no_iss (arm_current_el (env) !=0 ,0 ,0 ,0 ,0 , is_write,0x11 ); raise_exception_ra(env, EXCP_DATA_ABORT, syn,
@@ -582,6 +593,7 @@ static void mte_check_fail(CPUARMState *env, uint32_t desc,g_assert_not_reached ();case 2 : + fail_async:/* Tag check fail causes asynchronous flag set. */ if (regime_has_2_ranges (arm_mmu_idx)) { select =extract64 (dirty_ptr,55 ,1 );
@@ -600,14 +612,6 @@ static void mte_check_fail(CPUARMState *env, uint32_t desc,qemu_cpu_kick (env_cpu (env));#endif break ; - -default : -/* Case 3: Reserved. */ -qemu_log_mask (LOG_GUEST_ERROR , -"Tag check failure with SCTLR_EL%d.TCF%s " -"set to reserved value %d\n" , - reg_el, el ?"" :"0" , tcf); -break ; } }
target/arm/cpu64.c +4 -3
@@ -679,9 +679,10 @@ static void aarch64_max_initfn(Object *obj) t =FIELD_DP64 (t,ID_AA64PFR1 ,BT ,1 ); t =FIELD_DP64 (t,ID_AA64PFR1 ,SSBS ,2 );/* -* Begin with full support for MTE. This will be downgraded to MTE=0 -* during realize if the board provides no tag memory, much like -* we do for EL2 with the virtualization=on property. +* Begin with full support for MTE (FEAT_MTE3). This will be +* downgraded to MTE=0 (no MTE) during realize if the board +* provides no tag memory, much like we do for EL2 with the +* virtualization=on property. */ t =FIELD_DP64 (t,ID_AA64PFR1 ,MTE ,2 ); cpu->isar.id_aa64pfr1 = t;
target/arm/mte_helper.c +13 -9
@@ -561,12 +561,23 @@ static void mte_check_fail(CPUARMState *env, uint32_t desc, tcf =extract64 (sctlr,40 ,2 ); } + is_write =FIELD_EX32 (desc,MTEDESC ,WRITE ); +switch (tcf) { +default :/* case 3 */ +/* +* Tag check fail causes asynchronous flag set for stores, +* or a synchronous exception for loads. +*/ +if (is_write) { + goto fail_async; + } +/* fall through */ +case 1 :/* Tag check fail causes a synchronous exception. */ env->exception.vaddress = dirty_ptr; - is_write =FIELD_EX32 (desc,MTEDESC ,WRITE ); syn =syn_data_abort_no_iss (arm_current_el (env) !=0 ,0 ,0 ,0 ,0 , is_write,0x11 ); raise_exception_ra(env, EXCP_DATA_ABORT, syn,
@@ -582,6 +593,7 @@ static void mte_check_fail(CPUARMState *env, uint32_t desc,g_assert_not_reached ();case 2 : + fail_async:/* Tag check fail causes asynchronous flag set. */ if (regime_has_2_ranges (arm_mmu_idx)) { select =extract64 (dirty_ptr,55 ,1 );
@@ -600,14 +612,6 @@ static void mte_check_fail(CPUARMState *env, uint32_t desc,qemu_cpu_kick (env_cpu (env));#endif break ; - -default : -/* Case 3: Reserved. */ -qemu_log_mask (LOG_GUEST_ERROR , -"Tag check failure with SCTLR_EL%d.TCF%s " -"set to reserved value %d\n" , - reg_el, el ?"" :"0" , tcf); -break ; } }
r~
Quoted 140 lines · Peter Collingbourne
MTE3 introduces an asymmetric tag checking mode, in which loads are checked synchronously and stores are checked asynchronously. Add support for it.
Signed-off-by Peter Collingbourne <[email protected]>--- target/arm/cpu64.c | 2 +- target/arm/mte_helper.c | 83 ++++++++++++++++++++++++++--------------- 2 files changed, 53 insertions(+), 32 deletions(-)target/arm/cpu64.c +1
-1@@ -683,7 +683,7 @@ static void aarch64_max_initfn(Object *obj)* during realize if the board provides no tag memory, much like * we do for EL2 with the virtualization=on property. */ - t =FIELD_DP64 (t,ID_AA64PFR1 ,MTE ,2 ); + t =FIELD_DP64 (t,ID_AA64PFR1 ,MTE ,3 ); cpu->isar.id_aa64pfr1 = t; t = cpu->isar.id_aa64mmfr0;target/arm/mte_helper.c +52
-31@@ -538,13 +538,51 @@ void HELPER(stzgm_tags)(CPUARMState *env, uint64_t ptr, uint64_t val) } } +static void mte_sync_check_fail (CPUARMState *env,uint32_t desc, +uint64_t dirty_ptr,uintptr_t ra) +{ +int is_write, syn; + + env->exception.vaddress = dirty_ptr; + + is_write =FIELD_EX32 (desc,MTEDESC ,WRITE ); + syn =syn_data_abort_no_iss (arm_current_el (env) !=0 ,0 ,0 ,0 ,0 , is_write, +0x11 ); +raise_exception_ra (env,EXCP_DATA_ABORT , syn,exception_target_el (env), ra); +g_assert_not_reached (); +} + +static void mte_async_check_fail (CPUARMState *env,uint32_t desc, +uint64_t dirty_ptr,uintptr_t ra, +ARMMMUIdx arm_mmu_idx,int el) +{ +int select; + +if (regime_has_2_ranges (arm_mmu_idx)) { + select =extract64 (dirty_ptr,55 ,1 ); + }else { + select =0 ; + } + env->cp15.tfsr_el[el] |=1 << select; +#ifdef CONFIG_USER_ONLY +/* +* Stand in for a timer irq, setting _TIF_MTE_ASYNC_FAULT, +* which then sends a SIGSEGV when the thread is next scheduled. +* This cpu will return to the main loop at the end of the TB, +* which is rather sooner than "normal". But the alternative +* is waiting until the next syscall. +*/ +qemu_cpu_kick (env_cpu (env)); +#endif +} +/* Record a tag check failure. */ static void mte_check_fail (CPUARMState *env,uint32_t desc,uint64_t dirty_ptr,uintptr_t ra) {int mmu_idx =FIELD_EX32 (desc,MTEDESC ,MIDX );ARMMMUIdx arm_mmu_idx =core_to_aa64_mmu_idx (mmu_idx); -int el, reg_el, tcf, select, is_write, syn; +int el, reg_el, tcf;uint64_t sctlr; reg_el =regime_el (env, arm_mmu_idx);@@ -564,14 +602,8 @@ static void mte_check_fail(CPUARMState *env, uint32_t desc,switch (tcf) {case 1 :/* Tag check fail causes a synchronous exception. */ - env->exception.vaddress = dirty_ptr; - - is_write =FIELD_EX32 (desc,MTEDESC ,WRITE ); - syn =syn_data_abort_no_iss (arm_current_el (env) !=0 ,0 ,0 ,0 ,0 , - is_write,0x11 ); -raise_exception_ra (env,EXCP_DATA_ABORT , syn, -exception_target_el (env), ra); -/* noreturn, but fall through to the assert anyway */ +mte_sync_check_fail (env, desc, dirty_ptr, ra); +break ;case 0 :/* @@ -583,30 +615,19 @@ static void mte_check_fail(CPUARMState *env, uint32_t desc,case 2 :/* Tag check fail causes asynchronous flag set. */ -if (regime_has_2_ranges (arm_mmu_idx)) { - select =extract64 (dirty_ptr,55 ,1 ); - }else { - select =0 ; - } - env->cp15.tfsr_el[el] |=1 << select; -#ifdef CONFIG_USER_ONLY -/* -* Stand in for a timer irq, setting _TIF_MTE_ASYNC_FAULT, -* which then sends a SIGSEGV when the thread is next scheduled. -* This cpu will return to the main loop at the end of the TB, -* which is rather sooner than "normal". But the alternative -* is waiting until the next syscall. -*/ -qemu_cpu_kick (env_cpu (env)); -#endif +mte_async_check_fail (env, desc, dirty_ptr, ra, arm_mmu_idx, el);break ; -default : -/* Case 3: Reserved. */ -qemu_log_mask (LOG_GUEST_ERROR , -"Tag check failure with SCTLR_EL%d.TCF%s " -"set to reserved value %d\n" , - reg_el, el ?"" :"0" , tcf); +case 3 : +/* +* Tag check fail causes asynchronous flag set for stores, or +* a synchronous exception for loads. +*/ +if (FIELD_EX32 (desc,MTEDESC ,WRITE )) { +mte_async_check_fail (env, desc, dirty_ptr, ra, arm_mmu_idx, el); + }else { +mte_sync_check_fail (env, desc, dirty_ptr, ra); + }break ; } }
Quoted 1 line · Richard Henderson
Cc Peter.
Bah, nevermind. There was a v2 that already went in.
r~