[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 34/41] target/arm: check TGE and E2H flags for EL0 pauth traps
From: |
Richard Henderson |
Subject: |
[PATCH v7 34/41] target/arm: check TGE and E2H flags for EL0 pauth traps |
Date: |
Thu, 6 Feb 2020 10:54:41 +0000 |
From: Alex Bennée <address@hidden>
According to ARM ARM we should only trap from the EL1&0 regime.
Tested-by: Alex Bennée <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target/arm/pauth_helper.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/target/arm/pauth_helper.c b/target/arm/pauth_helper.c
index e0c401c4a9..9746e32bf8 100644
--- a/target/arm/pauth_helper.c
+++ b/target/arm/pauth_helper.c
@@ -371,7 +371,10 @@ static void pauth_check_trap(CPUARMState *env, int el,
uintptr_t ra)
if (el < 2 && arm_feature(env, ARM_FEATURE_EL2)) {
uint64_t hcr = arm_hcr_el2_eff(env);
bool trap = !(hcr & HCR_API);
- /* FIXME: ARMv8.1-VHE: trap only applies to EL1&0 regime. */
+ if (el == 0) {
+ /* Trap only applies to EL1&0 regime. */
+ trap &= (hcr & (HCR_E2H | HCR_TGE)) != (HCR_E2H | HCR_TGE);
+ }
/* FIXME: ARMv8.3-NV: HCR_NV trap takes precedence for ERETA[AB]. */
if (trap) {
pauth_trap(env, 2, ra);
--
2.20.1
- [PATCH v7 28/41] target/arm: Add VHE system register redirection and aliasing, (continued)
- [PATCH v7 28/41] target/arm: Add VHE system register redirection and aliasing, Richard Henderson, 2020/02/06
- [PATCH v7 37/41] target/arm: Enable ARMv8.1-VHE in -cpu max, Richard Henderson, 2020/02/06
- [PATCH v7 39/41] target/arm: Pass more cpu state to arm_excp_unmasked, Richard Henderson, 2020/02/06
- [PATCH v7 33/41] target/arm: Update {fp,sve}_exception_el for VHE, Richard Henderson, 2020/02/06
- [PATCH v7 38/41] target/arm: Move arm_excp_unmasked to cpu.c, Richard Henderson, 2020/02/06
- [PATCH v7 41/41] target/arm: Raise only one interrupt in arm_cpu_exec_interrupt, Richard Henderson, 2020/02/06
- [PATCH v7 22/41] target/arm: Update arm_sctlr for VHE, Richard Henderson, 2020/02/06
- [PATCH v7 21/41] target/arm: Update arm_mmu_idx for VHE, Richard Henderson, 2020/02/06
- [PATCH v7 31/41] target/arm: Flush tlbs for E2&0 translation regime, Richard Henderson, 2020/02/06
- [PATCH v7 29/41] target/arm: Add VHE timer register redirection and aliasing, Richard Henderson, 2020/02/06
- [PATCH v7 34/41] target/arm: check TGE and E2H flags for EL0 pauth traps,
Richard Henderson <=
- [PATCH v7 36/41] target/arm: Update arm_cpu_do_interrupt_aarch64 for VHE, Richard Henderson, 2020/02/06
- [PATCH v7 35/41] target/arm: Update get_a64_user_mem_index for VHE, Richard Henderson, 2020/02/06
- [PATCH v7 40/41] target/arm: Use bool for unmasked in arm_excp_unmasked, Richard Henderson, 2020/02/06
- Re: [PATCH v7 00/41] target/arm: Implement ARMv8.1-VHE, Peter Maydell, 2020/02/07