From: Peter Maydell <peter.maydell@linaro.org>
To: Richard Henderson <richard.henderson@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>,
Laurent Vivier <laurent@vivier.eu>
Subject: Re: [PATCH for-6.0] target/arm: Set ARMMMUFaultInfo.level in user-only arm_cpu_tlb_fill
Date: Tue, 23 Mar 2021 14:07:59 +0000 [thread overview]
Message-ID: <CAFEAcA-O=NGG97MqmPWof95bOFnY0D72mCPCLpYgNeoEup_-HA@mail.gmail.com> (raw)
In-Reply-To: <CAFEAcA_gVEMzgaVgE5U6hvoE+H38EiCr7NeZejVHztJta5sM=g@mail.gmail.com>
On Mon, 22 Mar 2021 at 14:10, Peter Maydell <peter.maydell@linaro.org> wrote:
>
> On Sat, 20 Mar 2021 at 00:06, Richard Henderson
> <richard.henderson@linaro.org> wrote:
> >
> > Pretend the fault always happens at page table level 3.
> >
> > Failure to set this leaves level = 0, which is impossible for
> > ARMFault_Permission, and produces an invalid syndrome, which
> > reaches g_assert_not_reached in cpu_loop.
> >
> > Fixes: 8db94ab4e5db ("linux-user/aarch64: Pass syndrome to EXC_*_ABORT")
> > Reported-by: Laurent Vivier <laurent@vivier.eu>
> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> > ---
> > target/arm/tlb_helper.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/target/arm/tlb_helper.c b/target/arm/tlb_helper.c
> > index 9609333cbd..3107f9823e 100644
> > --- a/target/arm/tlb_helper.c
> > +++ b/target/arm/tlb_helper.c
> > @@ -163,6 +163,7 @@ bool arm_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
> > } else {
> > fi.type = ARMFault_Translation;
> > }
> > + fi.level = 3;
> >
> > /* now we have a real cpu fault */
> > cpu_restore_state(cs, retaddr, true);
>
>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
...and applied to target-arm.next.
thanks
-- PMM
prev parent reply other threads:[~2021-03-23 14:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-20 0:06 [PATCH for-6.0] target/arm: Set ARMMMUFaultInfo.level in user-only arm_cpu_tlb_fill Richard Henderson
2021-03-22 14:10 ` Peter Maydell
2021-03-23 14:07 ` Peter Maydell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAFEAcA-O=NGG97MqmPWof95bOFnY0D72mCPCLpYgNeoEup_-HA@mail.gmail.com' \
--to=peter.maydell@linaro.org \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).