From: Pavel Tatashin <pasha.tatashin@soleen.com>
To: Marc Zyngier <maz@kernel.org>
Cc: James Morris <jmorris@namei.org>, Sasha Levin <sashal@kernel.org>,
"Eric W. Biederman" <ebiederm@xmission.com>,
kexec mailing list <kexec@lists.infradead.org>,
LKML <linux-kernel@vger.kernel.org>,
Jonathan Corbet <corbet@lwn.net>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
James Morse <james.morse@arm.com>,
Vladimir Murzin <vladimir.murzin@arm.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
linux-mm <linux-mm@kvack.org>,
Mark Rutland <mark.rutland@arm.com>,
steve.capper@arm.com, rfontana@redhat.com,
Thomas Gleixner <tglx@linutronix.de>,
Selin Dag <selindag@gmail.com>,
Tyler Hicks <tyhicks@linux.microsoft.com>,
Pingfan Liu <kernelfans@gmail.com>
Subject: Re: [PATCH v13 03/18] arm64: hyp-stub: Move el1_sync into the vectors
Date: Thu, 8 Apr 2021 10:45:18 -0400 [thread overview]
Message-ID: <CA+CK2bDc+9EsH_TLTgg9Pqv_-rZfZfPohdZEfsYjT8ss+8skjg@mail.gmail.com> (raw)
In-Reply-To: <480272f8fb3e46d24a0ee1418fb85809@kernel.org>
On Thu, Apr 8, 2021 at 6:24 AM Marc Zyngier <maz@kernel.org> wrote:
>
> On 2021-04-08 05:05, Pavel Tatashin wrote:
> > From: James Morse <james.morse@arm.com>
> >
> > The hyp-stub's el1_sync code doesn't do very much, this can easily fit
> > in the vectors.
> >
> > With this, all of the hyp-stubs behaviour is contained in its vectors.
> > This lets kexec and hibernate copy the hyp-stub when they need its
> > behaviour, instead of re-implementing it.
> >
> > Signed-off-by: James Morse <james.morse@arm.com>
> >
> > [Fixed merging issues]
>
> That's a pretty odd fix IMO.
>
> >
> > Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
> > ---
> > arch/arm64/kernel/hyp-stub.S | 59 ++++++++++++++++++------------------
> > 1 file changed, 29 insertions(+), 30 deletions(-)
> >
> > diff --git a/arch/arm64/kernel/hyp-stub.S
> > b/arch/arm64/kernel/hyp-stub.S
> > index ff329c5c074d..d1a73d0f74e0 100644
> > --- a/arch/arm64/kernel/hyp-stub.S
> > +++ b/arch/arm64/kernel/hyp-stub.S
> > @@ -21,6 +21,34 @@ SYM_CODE_START_LOCAL(\label)
> > .align 7
> > b \label
> > SYM_CODE_END(\label)
> > +.endm
> > +
> > +.macro hyp_stub_el1_sync
> > +SYM_CODE_START_LOCAL(hyp_stub_el1_sync)
> > + .align 7
> > + cmp x0, #HVC_SET_VECTORS
> > + b.ne 2f
> > + msr vbar_el2, x1
> > + b 9f
> > +
> > +2: cmp x0, #HVC_SOFT_RESTART
> > + b.ne 3f
> > + mov x0, x2
> > + mov x2, x4
> > + mov x4, x1
> > + mov x1, x3
> > + br x4 // no return
> > +
> > +3: cmp x0, #HVC_RESET_VECTORS
> > + beq 9f // Nothing to reset!
> > +
> > + /* Someone called kvm_call_hyp() against the hyp-stub... */
> > + mov_q x0, HVC_STUB_ERR
> > + eret
> > +
> > +9: mov x0, xzr
> > + eret
> > +SYM_CODE_END(hyp_stub_el1_sync)
>
> You said you tested this on a TX2. I guess you don't care whether
> it runs VHE or not...
Hi Marc,
Thank you for noticing this. Not sure how this missmerge happened. I
have added the missing case, and VHE is initialized correctly during
boot.
[ 14.698175] kvm [1]: VHE mode initialized successfully
During normal boot, kexec reboot, and kdump reboot. I will respin the
series and send the version 14 soon.
Thanks,
Pasha
>
> M.
>
> > .endm
> >
> > .text
> > @@ -39,7 +67,7 @@ SYM_CODE_START(__hyp_stub_vectors)
> > invalid_vector hyp_stub_el2h_fiq_invalid // FIQ EL2h
> > invalid_vector hyp_stub_el2h_error_invalid // Error EL2h
> >
> > - ventry el1_sync // Synchronous 64-bit EL1
> > + hyp_stub_el1_sync // Synchronous 64-bit EL1
> > invalid_vector hyp_stub_el1_irq_invalid // IRQ 64-bit EL1
> > invalid_vector hyp_stub_el1_fiq_invalid // FIQ 64-bit EL1
> > invalid_vector hyp_stub_el1_error_invalid // Error 64-bit EL1
> > @@ -55,35 +83,6 @@ SYM_CODE_END(__hyp_stub_vectors)
> > # Check the __hyp_stub_vectors didn't overflow
> > .org . - (__hyp_stub_vectors_end - __hyp_stub_vectors) + SZ_2K
> >
> > -
> > -SYM_CODE_START_LOCAL(el1_sync)
> > - cmp x0, #HVC_SET_VECTORS
> > - b.ne 1f
> > - msr vbar_el2, x1
> > - b 9f
> > -
> > -1: cmp x0, #HVC_VHE_RESTART
> > - b.eq mutate_to_vhe
> > -
> > -2: cmp x0, #HVC_SOFT_RESTART
> > - b.ne 3f
> > - mov x0, x2
> > - mov x2, x4
> > - mov x4, x1
> > - mov x1, x3
> > - br x4 // no return
> > -
> > -3: cmp x0, #HVC_RESET_VECTORS
> > - beq 9f // Nothing to reset!
> > -
> > - /* Someone called kvm_call_hyp() against the hyp-stub... */
> > - mov_q x0, HVC_STUB_ERR
> > - eret
> > -
> > -9: mov x0, xzr
> > - eret
> > -SYM_CODE_END(el1_sync)
> > -
> > // nVHE? No way! Give me the real thing!
> > SYM_CODE_START_LOCAL(mutate_to_vhe)
> > // Sanity check: MMU *must* be off
>
> --
> Jazz is not dead. It just smells funny...
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-04-08 14:47 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 4:05 [PATCH v13 00/18] arm64: MMU enabled kexec relocation Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 01/18] arm64: hyp-stub: Check the size of the HYP stub's vectors Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 02/18] arm64: hyp-stub: Move invalid vector entries into the vectors Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 03/18] arm64: hyp-stub: Move el1_sync " Pavel Tatashin
2021-04-08 10:24 ` Marc Zyngier
2021-04-08 14:45 ` Pavel Tatashin [this message]
2021-04-08 15:01 ` Marc Zyngier
2021-04-08 16:28 ` Pavel Tatashin
2021-04-26 18:10 ` Pavel Tatashin
2021-04-26 18:11 ` Pavel Tatashin
2021-04-26 18:24 ` Marc Zyngier
2021-04-08 4:05 ` [PATCH v13 04/18] arm64: kernel: add helper for booted at EL2 and not VHE Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 05/18] arm64: trans_pgd: hibernate: Add trans_pgd_copy_el2_vectors Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 06/18] arm64: hibernate: abstract ttrb0 setup function Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 07/18] arm64: kexec: flush image and lists during kexec load time Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 08/18] arm64: kexec: skip relocation code for inplace kexec Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 09/18] arm64: kexec: Use dcache ops macros instead of open-coding Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 10/18] arm64: kexec: pass kimage as the only argument to relocation function Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 11/18] arm64: kexec: kexec may require EL2 vectors Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 12/18] arm64: kexec: relocate in EL1 mode Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 13/18] arm64: kexec: use ld script for relocation function Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 14/18] arm64: kexec: install a copy of the linear-map Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 15/18] arm64: kexec: keep MMU enabled during kexec relocation Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 16/18] arm64: kexec: remove the pre-kexec PoC maintenance Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 17/18] arm64: kexec: Remove cpu-reset.h Pavel Tatashin
2021-04-08 4:05 ` [PATCH v13 18/18] arm64/mm: remove useless trans_pgd_map_page() Pavel Tatashin
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=CA+CK2bDc+9EsH_TLTgg9Pqv_-rZfZfPohdZEfsYjT8ss+8skjg@mail.gmail.com \
--to=pasha.tatashin@soleen.com \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=ebiederm@xmission.com \
--cc=james.morse@arm.com \
--cc=jmorris@namei.org \
--cc=kernelfans@gmail.com \
--cc=kexec@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mark.rutland@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=maz@kernel.org \
--cc=rfontana@redhat.com \
--cc=sashal@kernel.org \
--cc=selindag@gmail.com \
--cc=steve.capper@arm.com \
--cc=tglx@linutronix.de \
--cc=tyhicks@linux.microsoft.com \
--cc=vladimir.murzin@arm.com \
--cc=will@kernel.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).