From: Marc Zyngier <maz@kernel.org>
To: linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org
Cc: kernel-team@android.com, Srinivas Ramana <sramana@codeaurora.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Ard Biesheuvel <ardb@kernel.org>, Will Deacon <will@kernel.org>,
Ajay Patil <pajay@qti.qualcomm.com>,
Prasad Sodagudi <psodagud@codeaurora.org>
Subject: Re: [PATCH v3 04/21] arm64: Provide an 'upgrade to VHE' stub hypercall
Date: Mon, 11 Jan 2021 13:53:18 +0000 [thread overview]
Message-ID: <017892d274a0a2ba20ad83f3eb9bc6e3@kernel.org> (raw)
In-Reply-To: <20210111132811.2455113-5-maz@kernel.org>
On 2021-01-11 13:27, Marc Zyngier wrote:
> As we are about to change the way a VHE system boots, let's
> provide the core helper, in the form of a stub hypercall that
> enables VHE and replicates the full EL1 context at EL2, thanks
> to EL1 and VHE-EL2 being extremely similar.
>
> On exception return, the kernel carries on at EL2. Fancy!
>
> Nothing calls this new hypercall yet, so no functional change.
Famous last words...
>
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> ---
> arch/arm64/include/asm/virt.h | 7 +++-
> arch/arm64/kernel/hyp-stub.S | 67 +++++++++++++++++++++++++++++++++--
> 2 files changed, 71 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm64/include/asm/virt.h
> b/arch/arm64/include/asm/virt.h
> index ee6a48df89d9..7379f35ae2c6 100644
> --- a/arch/arm64/include/asm/virt.h
> +++ b/arch/arm64/include/asm/virt.h
> @@ -35,8 +35,13 @@
> */
> #define HVC_RESET_VECTORS 2
>
> +/*
> + * HVC_VHE_RESTART - Upgrade the CPU from EL1 to EL2, if possible
> + */
> +#define HVC_VHE_RESTART 3
> +
> /* Max number of HYP stub hypercalls */
> -#define HVC_STUB_HCALL_NR 3
> +#define HVC_STUB_HCALL_NR 4
>
> /* Error returned when an invalid stub number is passed into x0 */
> #define HVC_STUB_ERR 0xbadca11
> diff --git a/arch/arm64/kernel/hyp-stub.S
> b/arch/arm64/kernel/hyp-stub.S
> index 160f5881a0b7..0a84602344eb 100644
> --- a/arch/arm64/kernel/hyp-stub.S
> +++ b/arch/arm64/kernel/hyp-stub.S
> @@ -8,9 +8,9 @@
>
> #include <linux/init.h>
> #include <linux/linkage.h>
> -#include <linux/irqchip/arm-gic-v3.h>
>
> #include <asm/assembler.h>
> +#include <asm/el2_setup.h>
> #include <asm/kvm_arm.h>
> #include <asm/kvm_asm.h>
> #include <asm/ptrace.h>
> @@ -47,10 +47,13 @@ SYM_CODE_END(__hyp_stub_vectors)
>
> SYM_CODE_START_LOCAL(el1_sync)
> cmp x0, #HVC_SET_VECTORS
> - b.ne 2f
> + b.ne 1f
> msr vbar_el2, x1
> b 9f
>
> +1: cmp x0, #HVC_VHE_RESTART
> + b mutate_to_vhe
And of course, I managed to send the *wrong* version of this patch.
This should obviously be a "b.eq", otherwise none of the other
hypercalls are reachable...
The correct version of this is now pushed in my tree[1].
Thanks,
M.
[1]
https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git/log/?h=hack/arm64-early-cpufeature
--
Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
WARNING: multiple messages have this Message-ID (diff)
From: Marc Zyngier <maz@kernel.org>
To: linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org
Cc: Mark Rutland <mark.rutland@arm.com>,
Jing Zhang <jingzhangos@google.com>,
kernel-team@android.com, Srinivas Ramana <sramana@codeaurora.org>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Ard Biesheuvel <ardb@kernel.org>, Will Deacon <will@kernel.org>,
James Morse <james.morse@arm.com>,
Ajay Patil <pajay@qti.qualcomm.com>,
Prasad Sodagudi <psodagud@codeaurora.org>,
Alexandru Elisei <alexandru.elisei@arm.com>,
David Brazdil <dbrazdil@google.com>,
Julien Thierry <julien.thierry.kdev@gmail.com>
Subject: Re: [PATCH v3 04/21] arm64: Provide an 'upgrade to VHE' stub hypercall
Date: Mon, 11 Jan 2021 13:53:18 +0000 [thread overview]
Message-ID: <017892d274a0a2ba20ad83f3eb9bc6e3@kernel.org> (raw)
In-Reply-To: <20210111132811.2455113-5-maz@kernel.org>
On 2021-01-11 13:27, Marc Zyngier wrote:
> As we are about to change the way a VHE system boots, let's
> provide the core helper, in the form of a stub hypercall that
> enables VHE and replicates the full EL1 context at EL2, thanks
> to EL1 and VHE-EL2 being extremely similar.
>
> On exception return, the kernel carries on at EL2. Fancy!
>
> Nothing calls this new hypercall yet, so no functional change.
Famous last words...
>
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> ---
> arch/arm64/include/asm/virt.h | 7 +++-
> arch/arm64/kernel/hyp-stub.S | 67 +++++++++++++++++++++++++++++++++--
> 2 files changed, 71 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm64/include/asm/virt.h
> b/arch/arm64/include/asm/virt.h
> index ee6a48df89d9..7379f35ae2c6 100644
> --- a/arch/arm64/include/asm/virt.h
> +++ b/arch/arm64/include/asm/virt.h
> @@ -35,8 +35,13 @@
> */
> #define HVC_RESET_VECTORS 2
>
> +/*
> + * HVC_VHE_RESTART - Upgrade the CPU from EL1 to EL2, if possible
> + */
> +#define HVC_VHE_RESTART 3
> +
> /* Max number of HYP stub hypercalls */
> -#define HVC_STUB_HCALL_NR 3
> +#define HVC_STUB_HCALL_NR 4
>
> /* Error returned when an invalid stub number is passed into x0 */
> #define HVC_STUB_ERR 0xbadca11
> diff --git a/arch/arm64/kernel/hyp-stub.S
> b/arch/arm64/kernel/hyp-stub.S
> index 160f5881a0b7..0a84602344eb 100644
> --- a/arch/arm64/kernel/hyp-stub.S
> +++ b/arch/arm64/kernel/hyp-stub.S
> @@ -8,9 +8,9 @@
>
> #include <linux/init.h>
> #include <linux/linkage.h>
> -#include <linux/irqchip/arm-gic-v3.h>
>
> #include <asm/assembler.h>
> +#include <asm/el2_setup.h>
> #include <asm/kvm_arm.h>
> #include <asm/kvm_asm.h>
> #include <asm/ptrace.h>
> @@ -47,10 +47,13 @@ SYM_CODE_END(__hyp_stub_vectors)
>
> SYM_CODE_START_LOCAL(el1_sync)
> cmp x0, #HVC_SET_VECTORS
> - b.ne 2f
> + b.ne 1f
> msr vbar_el2, x1
> b 9f
>
> +1: cmp x0, #HVC_VHE_RESTART
> + b mutate_to_vhe
And of course, I managed to send the *wrong* version of this patch.
This should obviously be a "b.eq", otherwise none of the other
hypercalls are reachable...
The correct version of this is now pushed in my tree[1].
Thanks,
M.
[1]
https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git/log/?h=hack/arm64-early-cpufeature
--
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
WARNING: multiple messages have this Message-ID (diff)
From: Marc Zyngier <maz@kernel.org>
To: linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org
Cc: Mark Rutland <mark.rutland@arm.com>,
Jing Zhang <jingzhangos@google.com>,
Prasad Sodagudi <psodagud@codeaurora.org>,
Srinivas Ramana <sramana@codeaurora.org>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Alexandru Elisei <alexandru.elisei@arm.com>,
James Morse <james.morse@arm.com>,
Ajay Patil <pajay@qti.qualcomm.com>,
kernel-team@android.com, David Brazdil <dbrazdil@google.com>,
Will Deacon <will@kernel.org>, Ard Biesheuvel <ardb@kernel.org>,
Julien Thierry <julien.thierry.kdev@gmail.com>
Subject: Re: [PATCH v3 04/21] arm64: Provide an 'upgrade to VHE' stub hypercall
Date: Mon, 11 Jan 2021 13:53:18 +0000 [thread overview]
Message-ID: <017892d274a0a2ba20ad83f3eb9bc6e3@kernel.org> (raw)
In-Reply-To: <20210111132811.2455113-5-maz@kernel.org>
On 2021-01-11 13:27, Marc Zyngier wrote:
> As we are about to change the way a VHE system boots, let's
> provide the core helper, in the form of a stub hypercall that
> enables VHE and replicates the full EL1 context at EL2, thanks
> to EL1 and VHE-EL2 being extremely similar.
>
> On exception return, the kernel carries on at EL2. Fancy!
>
> Nothing calls this new hypercall yet, so no functional change.
Famous last words...
>
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> ---
> arch/arm64/include/asm/virt.h | 7 +++-
> arch/arm64/kernel/hyp-stub.S | 67 +++++++++++++++++++++++++++++++++--
> 2 files changed, 71 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm64/include/asm/virt.h
> b/arch/arm64/include/asm/virt.h
> index ee6a48df89d9..7379f35ae2c6 100644
> --- a/arch/arm64/include/asm/virt.h
> +++ b/arch/arm64/include/asm/virt.h
> @@ -35,8 +35,13 @@
> */
> #define HVC_RESET_VECTORS 2
>
> +/*
> + * HVC_VHE_RESTART - Upgrade the CPU from EL1 to EL2, if possible
> + */
> +#define HVC_VHE_RESTART 3
> +
> /* Max number of HYP stub hypercalls */
> -#define HVC_STUB_HCALL_NR 3
> +#define HVC_STUB_HCALL_NR 4
>
> /* Error returned when an invalid stub number is passed into x0 */
> #define HVC_STUB_ERR 0xbadca11
> diff --git a/arch/arm64/kernel/hyp-stub.S
> b/arch/arm64/kernel/hyp-stub.S
> index 160f5881a0b7..0a84602344eb 100644
> --- a/arch/arm64/kernel/hyp-stub.S
> +++ b/arch/arm64/kernel/hyp-stub.S
> @@ -8,9 +8,9 @@
>
> #include <linux/init.h>
> #include <linux/linkage.h>
> -#include <linux/irqchip/arm-gic-v3.h>
>
> #include <asm/assembler.h>
> +#include <asm/el2_setup.h>
> #include <asm/kvm_arm.h>
> #include <asm/kvm_asm.h>
> #include <asm/ptrace.h>
> @@ -47,10 +47,13 @@ SYM_CODE_END(__hyp_stub_vectors)
>
> SYM_CODE_START_LOCAL(el1_sync)
> cmp x0, #HVC_SET_VECTORS
> - b.ne 2f
> + b.ne 1f
> msr vbar_el2, x1
> b 9f
>
> +1: cmp x0, #HVC_VHE_RESTART
> + b mutate_to_vhe
And of course, I managed to send the *wrong* version of this patch.
This should obviously be a "b.eq", otherwise none of the other
hypercalls are reachable...
The correct version of this is now pushed in my tree[1].
Thanks,
M.
[1]
https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git/log/?h=hack/arm64-early-cpufeature
--
Jazz is not dead. It just smells funny...
next prev parent reply other threads:[~2021-01-11 13:53 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-11 13:27 [PATCH v3 00/21] arm64: Early CPU feature override, and applications to VHE, BTI and PAuth Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:27 ` [PATCH v3 01/21] arm64: Fix labels in el2_setup macros Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:27 ` [PATCH v3 02/21] arm64: Fix outdated TCR setup comment Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:27 ` [PATCH v3 03/21] arm64: Turn the MMU-on sequence into a macro Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:27 ` [PATCH v3 04/21] arm64: Provide an 'upgrade to VHE' stub hypercall Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:53 ` Marc Zyngier [this message]
2021-01-11 13:53 ` Marc Zyngier
2021-01-11 13:53 ` Marc Zyngier
2021-01-11 13:27 ` [PATCH v3 05/21] arm64: Initialise as nVHE before switching to VHE Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:27 ` [PATCH v3 06/21] arm64: Move VHE-specific SPE setup to mutate_to_vhe() Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:27 ` [PATCH v3 07/21] arm64: Simplify init_el2_state to be non-VHE only Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:27 ` [PATCH v3 08/21] arm64: Move SCTLR_EL1 initialisation to EL-agnostic code Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:27 ` [PATCH v3 09/21] arm64: cpufeature: Add global feature override facility Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 13:27 ` Marc Zyngier
2021-01-11 18:41 ` Catalin Marinas
2021-01-11 18:41 ` Catalin Marinas
2021-01-11 18:41 ` Catalin Marinas
2021-01-11 19:48 ` Marc Zyngier
2021-01-11 19:48 ` Marc Zyngier
2021-01-11 19:48 ` Marc Zyngier
2021-01-12 9:17 ` Suzuki K Poulose
2021-01-12 9:17 ` Suzuki K Poulose
2021-01-12 9:17 ` Suzuki K Poulose
2021-01-12 11:50 ` Marc Zyngier
2021-01-12 11:50 ` Marc Zyngier
2021-01-12 11:50 ` Marc Zyngier
2021-01-12 11:51 ` Marc Zyngier
2021-01-12 11:51 ` Marc Zyngier
2021-01-12 11:51 ` Marc Zyngier
2021-01-12 12:20 ` Suzuki K Poulose
2021-01-12 12:20 ` Suzuki K Poulose
2021-01-12 12:20 ` Suzuki K Poulose
2021-01-12 11:59 ` Suzuki K Poulose
2021-01-12 11:59 ` Suzuki K Poulose
2021-01-12 11:59 ` Suzuki K Poulose
2021-01-12 14:54 ` Marc Zyngier
2021-01-12 14:54 ` Marc Zyngier
2021-01-12 14:54 ` Marc Zyngier
2021-01-11 20:38 ` Srinivas Ramana
2021-01-11 20:38 ` Srinivas Ramana
2021-01-11 13:28 ` [PATCH v3 10/21] arm64: cpufeature: Use IDreg override in __read_sysreg_by_encoding() Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` [PATCH v3 11/21] arm64: Extract early FDT mapping from kaslr_early_init() Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` [PATCH v3 12/21] arm64: cpufeature: Add an early command-line cpufeature override facility Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` [PATCH v3 13/21] arm64: Allow ID_AA64MMFR1_EL1.VH to be overridden from the command line Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` [PATCH v3 14/21] arm64: Honor VHE being disabled from the command-line Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` [PATCH v3 15/21] arm64: Add an aliasing facility for the idreg override Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` [PATCH v3 16/21] arm64: Make kvm-arm.mode={nvhe, protected} an alias of id_aa64mmfr1.vh=0 Marc Zyngier
2021-01-11 13:28 ` [PATCH v3 16/21] arm64: Make kvm-arm.mode={nvhe,protected} " Marc Zyngier
2021-01-11 13:28 ` [PATCH v3 16/21] arm64: Make kvm-arm.mode={nvhe, protected} " Marc Zyngier
2021-01-11 13:28 ` [PATCH v3 17/21] KVM: arm64: Document HVC_VHE_RESTART stub hypercall Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` [PATCH v3 18/21] arm64: Move "nokaslr" over to the early cpufeature infrastructure Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` [PATCH v3 19/21] arm64: cpufeatures: Allow disabling of BTI from the command-line Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` [PATCH v3 20/21] arm64: Defer enabling pointer authentication on boot core Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` [PATCH v3 21/21] arm64: cpufeatures: Allow disabling of Pointer Auth from the command-line Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
2021-01-11 13:28 ` Marc Zyngier
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=017892d274a0a2ba20ad83f3eb9bc6e3@kernel.org \
--to=maz@kernel.org \
--cc=ardb@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=kernel-team@android.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pajay@qti.qualcomm.com \
--cc=psodagud@codeaurora.org \
--cc=sramana@codeaurora.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.