On Thu, Oct 14, 2021 at 10:14 PM Richard Henderson <
[email protected]> wrote:

> Use the new cpu_loop_exit_sigbus for cpu_mmu_lookup.
>
> Reviewed-by: Peter Maydell <[email protected]>
> Signed-off-by: Richard Henderson <[email protected]>
> ---
>  accel/tcg/user-exec.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>

Reviewed-by: Warner Losh <[email protected]>



> diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
> index 92cbffd7c6..7d50dd54f6 100644
> --- a/accel/tcg/user-exec.c
> +++ b/accel/tcg/user-exec.c
> @@ -220,9 +220,14 @@ static void validate_memop(MemOpIdx oi, MemOp
> expected)
>  static void *cpu_mmu_lookup(CPUArchState *env, target_ulong addr,
>                              MemOpIdx oi, uintptr_t ra, MMUAccessType type)
>  {
> +    MemOp mop = get_memop(oi);
> +    int a_bits = get_alignment_bits(mop);
>      void *ret;
>
> -    /* TODO: Enforce guest required alignment.  */
> +    /* Enforce guest required alignment.  */
> +    if (unlikely(addr & ((1 << a_bits) - 1))) {
> +        cpu_loop_exit_sigbus(env_cpu(env), addr, type, ra);
> +    }
>
>      ret = g2h(env_cpu(env), addr);
>      set_helper_retaddr(ra);
> --
> 2.25.1
>
>

Reply via email to