[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 02/12] target/arm: Use set/clear_helper_retaddr in helper-a64.
From: |
Richard Henderson |
Subject: |
[PATCH v3 02/12] target/arm: Use set/clear_helper_retaddr in helper-a64.c |
Date: |
Fri, 19 Jul 2024 11:06:57 +1000 |
Use these in helper_dc_dva and the FEAT_MOPS routines to
avoid a race condition with munmap in another thread.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/tcg/helper-a64.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c
index 0ea8668ab4..c60d2a7ec9 100644
--- a/target/arm/tcg/helper-a64.c
+++ b/target/arm/tcg/helper-a64.c
@@ -928,6 +928,8 @@ uint32_t HELPER(sqrt_f16)(uint32_t a, void *fpstp)
void HELPER(dc_zva)(CPUARMState *env, uint64_t vaddr_in)
{
+ uintptr_t ra = GETPC();
+
/*
* Implement DC ZVA, which zeroes a fixed-length block of memory.
* Note that we do not implement the (architecturally mandated)
@@ -948,8 +950,6 @@ void HELPER(dc_zva)(CPUARMState *env, uint64_t vaddr_in)
#ifndef CONFIG_USER_ONLY
if (unlikely(!mem)) {
- uintptr_t ra = GETPC();
-
/*
* Trap if accessing an invalid page. DC_ZVA requires that we supply
* the original pointer for an invalid page. But watchpoints require
@@ -971,7 +971,9 @@ void HELPER(dc_zva)(CPUARMState *env, uint64_t vaddr_in)
}
#endif
+ set_helper_retaddr(ra);
memset(mem, 0, blocklen);
+ clear_helper_retaddr();
}
void HELPER(unaligned_access)(CPUARMState *env, uint64_t addr,
@@ -1120,7 +1122,9 @@ static uint64_t set_step(CPUARMState *env, uint64_t
toaddr,
}
#endif
/* Easy case: just memset the host memory */
+ set_helper_retaddr(ra);
memset(mem, data, setsize);
+ clear_helper_retaddr();
return setsize;
}
@@ -1163,7 +1167,9 @@ static uint64_t set_step_tags(CPUARMState *env, uint64_t
toaddr,
}
#endif
/* Easy case: just memset the host memory */
+ set_helper_retaddr(ra);
memset(mem, data, setsize);
+ clear_helper_retaddr();
mte_mops_set_tags(env, toaddr, setsize, *mtedesc);
return setsize;
}
@@ -1497,7 +1503,9 @@ static uint64_t copy_step(CPUARMState *env, uint64_t
toaddr, uint64_t fromaddr,
}
#endif
/* Easy case: just memmove the host memory */
+ set_helper_retaddr(ra);
memmove(wmem, rmem, copysize);
+ clear_helper_retaddr();
return copysize;
}
@@ -1572,7 +1580,9 @@ static uint64_t copy_step_rev(CPUARMState *env, uint64_t
toaddr,
* Easy case: just memmove the host memory. Note that wmem and
* rmem here point to the *last* byte to copy.
*/
+ set_helper_retaddr(ra);
memmove(wmem - (copysize - 1), rmem - (copysize - 1), copysize);
+ clear_helper_retaddr();
return copysize;
}
--
2.43.0
- [PATCH v3 00/12] Fixes for user-only munmap races, Richard Henderson, 2024/07/18
- [PATCH v3 01/12] accel/tcg: Move {set, clear}_helper_retaddr to cpu_ldst.h, Richard Henderson, 2024/07/18
- [PATCH v3 03/12] target/arm: Use set/clear_helper_retaddr in SVE and SME helpers, Richard Henderson, 2024/07/18
- [PATCH v3 02/12] target/arm: Use set/clear_helper_retaddr in helper-a64.c,
Richard Henderson <=
- [PATCH v3 05/12] target/ppc: Hoist dcbz_size out of dcbz_common, Richard Henderson, 2024/07/18
- [PATCH v3 06/12] target/ppc: Split out helper_dbczl for 970, Richard Henderson, 2024/07/18
- [PATCH v3 09/12] target/s390x: Use user_or_likely in do_access_memset, Richard Henderson, 2024/07/18
- [PATCH v3 07/12] target/ppc: Merge helper_{dcbz,dcbzep}, Richard Henderson, 2024/07/18
- [PATCH v3 08/12] target/ppc: Improve helper_dcbz for user-only, Richard Henderson, 2024/07/18
- [PATCH v3 04/12] target/ppc/mem_helper.c: Remove a conditional from dcbz_common(), Richard Henderson, 2024/07/18
- [PATCH v3 12/12] target/riscv: Simplify probing in vext_ldff, Richard Henderson, 2024/07/18
- [PATCH v3 10/12] target/s390x: Use user_or_likely in access_memmove, Richard Henderson, 2024/07/18