From: Marc Zyngier <maz@kernel.org>
To: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org,
Quentin Perret <qperret@google.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Alexandru Elisei <alexandru.elisei@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
kvmarm@lists.cs.columbia.edu
Subject: Re: [PATCH 5/5] KVM: arm64: Disable privileged hypercalls after pKVM finalisation
Date: Thu, 23 Sep 2021 13:56:21 +0100 [thread overview]
Message-ID: <87zgs3tpqi.wl-maz@kernel.org> (raw)
In-Reply-To: <20210923112256.15767-6-will@kernel.org>
On Thu, 23 Sep 2021 12:22:56 +0100,
Will Deacon <will@kernel.org> wrote:
>
> After pKVM has been 'finalised' using the __pkvm_prot_finalize hypercall,
> the calling CPU will have a Stage-2 translation enabled to prevent access
> to memory pages owned by EL2.
>
> Although this forms a significant part of the process to deprivilege the
> host kernel, we also need to ensure that the hypercall interface is
> reduced so that the EL2 code cannot, for example, be re-initialised using
> a new set of vectors.
>
> Re-order the hypercalls so that only a suffix remains available after
> finalisation of pKVM.
>
> Cc: Marc Zyngier <maz@kernel.org>
> Cc: Quentin Perret <qperret@google.com>
> Signed-off-by: Will Deacon <will@kernel.org>
> ---
> arch/arm64/include/asm/kvm_asm.h | 43 ++++++++++++++++--------------
> arch/arm64/kvm/hyp/nvhe/hyp-main.c | 26 +++++++++++-------
> 2 files changed, 39 insertions(+), 30 deletions(-)
>
> diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h
> index e86045ac43ba..68630fd382c5 100644
> --- a/arch/arm64/include/asm/kvm_asm.h
> +++ b/arch/arm64/include/asm/kvm_asm.h
> @@ -43,27 +43,30 @@
>
> #define KVM_HOST_SMCCC_FUNC(name) KVM_HOST_SMCCC_ID(__KVM_HOST_SMCCC_FUNC_##name)
>
> +/* Hypercalls available only prior to pKVM finalisation */
> #define __KVM_HOST_SMCCC_FUNC___kvm_hyp_init 0
> -#define __KVM_HOST_SMCCC_FUNC___kvm_vcpu_run 1
> -#define __KVM_HOST_SMCCC_FUNC___kvm_flush_vm_context 2
> -#define __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_ipa 3
> -#define __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid 4
> -#define __KVM_HOST_SMCCC_FUNC___kvm_flush_cpu_context 5
> -#define __KVM_HOST_SMCCC_FUNC___kvm_timer_set_cntvoff 6
> -#define __KVM_HOST_SMCCC_FUNC___kvm_enable_ssbs 7
> -#define __KVM_HOST_SMCCC_FUNC___vgic_v3_get_gic_config 8
> -#define __KVM_HOST_SMCCC_FUNC___vgic_v3_read_vmcr 9
> -#define __KVM_HOST_SMCCC_FUNC___vgic_v3_write_vmcr 10
> -#define __KVM_HOST_SMCCC_FUNC___vgic_v3_init_lrs 11
> -#define __KVM_HOST_SMCCC_FUNC___kvm_get_mdcr_el2 12
> -#define __KVM_HOST_SMCCC_FUNC___vgic_v3_save_aprs 13
> -#define __KVM_HOST_SMCCC_FUNC___vgic_v3_restore_aprs 14
> -#define __KVM_HOST_SMCCC_FUNC___pkvm_init 15
> -#define __KVM_HOST_SMCCC_FUNC___pkvm_host_share_hyp 16
> -#define __KVM_HOST_SMCCC_FUNC___pkvm_create_private_mapping 17
> -#define __KVM_HOST_SMCCC_FUNC___pkvm_cpu_set_vector 18
> -#define __KVM_HOST_SMCCC_FUNC___pkvm_prot_finalize 19
> -#define __KVM_HOST_SMCCC_FUNC___kvm_adjust_pc 20
> +#define __KVM_HOST_SMCCC_FUNC___kvm_get_mdcr_el2 1
> +#define __KVM_HOST_SMCCC_FUNC___pkvm_init 2
> +#define __KVM_HOST_SMCCC_FUNC___pkvm_create_private_mapping 3
> +#define __KVM_HOST_SMCCC_FUNC___pkvm_cpu_set_vector 4
> +#define __KVM_HOST_SMCCC_FUNC___kvm_enable_ssbs 5
> +#define __KVM_HOST_SMCCC_FUNC___vgic_v3_init_lrs 6
> +#define __KVM_HOST_SMCCC_FUNC___vgic_v3_get_gic_config 7
> +#define __KVM_HOST_SMCCC_FUNC___pkvm_prot_finalize 8
> +
> +/* Hypercalls available after pKVM finalisation */
> +#define __KVM_HOST_SMCCC_FUNC___pkvm_host_share_hyp 9
> +#define __KVM_HOST_SMCCC_FUNC___kvm_adjust_pc 10
> +#define __KVM_HOST_SMCCC_FUNC___kvm_vcpu_run 11
> +#define __KVM_HOST_SMCCC_FUNC___kvm_flush_vm_context 12
> +#define __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid_ipa 13
> +#define __KVM_HOST_SMCCC_FUNC___kvm_tlb_flush_vmid 14
> +#define __KVM_HOST_SMCCC_FUNC___kvm_flush_cpu_context 15
> +#define __KVM_HOST_SMCCC_FUNC___kvm_timer_set_cntvoff 16
> +#define __KVM_HOST_SMCCC_FUNC___vgic_v3_read_vmcr 17
> +#define __KVM_HOST_SMCCC_FUNC___vgic_v3_write_vmcr 18
> +#define __KVM_HOST_SMCCC_FUNC___vgic_v3_save_aprs 19
> +#define __KVM_HOST_SMCCC_FUNC___vgic_v3_restore_aprs 20
>
> #ifndef __ASSEMBLY__
>
> diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c
> index 2da6aa8da868..4120e34288e1 100644
> --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c
> +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c
> @@ -165,36 +165,42 @@ typedef void (*hcall_t)(struct kvm_cpu_context *);
> #define HANDLE_FUNC(x) [__KVM_HOST_SMCCC_FUNC_##x] = (hcall_t)handle_##x
>
> static const hcall_t host_hcall[] = {
> - HANDLE_FUNC(__kvm_vcpu_run),
> + /* ___kvm_hyp_init */
> + HANDLE_FUNC(__kvm_get_mdcr_el2),
> + HANDLE_FUNC(__pkvm_init),
> + HANDLE_FUNC(__pkvm_create_private_mapping),
> + HANDLE_FUNC(__pkvm_cpu_set_vector),
> + HANDLE_FUNC(__kvm_enable_ssbs),
> + HANDLE_FUNC(__vgic_v3_init_lrs),
> + HANDLE_FUNC(__pkvm_prot_finalize),
> +
> + HANDLE_FUNC(__pkvm_host_share_hyp),
> HANDLE_FUNC(__kvm_adjust_pc),
> + HANDLE_FUNC(__kvm_vcpu_run),
> HANDLE_FUNC(__kvm_flush_vm_context),
> HANDLE_FUNC(__kvm_tlb_flush_vmid_ipa),
> HANDLE_FUNC(__kvm_tlb_flush_vmid),
> HANDLE_FUNC(__kvm_flush_cpu_context),
> HANDLE_FUNC(__kvm_timer_set_cntvoff),
> - HANDLE_FUNC(__kvm_enable_ssbs),
> HANDLE_FUNC(__vgic_v3_get_gic_config),
> HANDLE_FUNC(__vgic_v3_read_vmcr),
> HANDLE_FUNC(__vgic_v3_write_vmcr),
> - HANDLE_FUNC(__vgic_v3_init_lrs),
> - HANDLE_FUNC(__kvm_get_mdcr_el2),
> HANDLE_FUNC(__vgic_v3_save_aprs),
> HANDLE_FUNC(__vgic_v3_restore_aprs),
> - HANDLE_FUNC(__pkvm_init),
> - HANDLE_FUNC(__pkvm_cpu_set_vector),
> - HANDLE_FUNC(__pkvm_host_share_hyp),
> - HANDLE_FUNC(__pkvm_create_private_mapping),
> - HANDLE_FUNC(__pkvm_prot_finalize),
> };
>
> static void handle_host_hcall(struct kvm_cpu_context *host_ctxt)
> {
> DECLARE_REG(unsigned long, id, host_ctxt, 0);
> + unsigned long hcall_min = 0;
> hcall_t hfn;
>
> + if (static_branch_unlikely(&kvm_protected_mode_initialized))
> + hcall_min = __KVM_HOST_SMCCC_FUNC___pkvm_prot_finalize;
> +
> id -= KVM_HOST_SMCCC_ID(0);
>
> - if (unlikely(id >= ARRAY_SIZE(host_hcall)))
> + if (unlikely(id < hcall_min || id >= ARRAY_SIZE(host_hcall)))
So I can still issue a pkvm_prot_finalize after finalisation? Seems
odd. As hcall_min has to be inclusive, you probably want it to be set
to __KVM_HOST_SMCCC_FUNC___pkvm_host_share_hyp once protected.
Thanks,
M.
--
Without deviation from the norm, progress is not possible.
_______________________________________________
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-09-23 12:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-23 11:22 [PATCH 0/5] KVM: arm64: Restrict host hypercalls when pKVM is enabled Will Deacon
2021-09-23 11:22 ` [PATCH 1/5] arm64: Prevent kexec and hibernation if is_protected_kvm_enabled() Will Deacon
2021-09-23 11:45 ` Mark Rutland
2021-09-23 12:29 ` Will Deacon
2021-09-23 11:22 ` [PATCH 2/5] KVM: arm64: Reject stub hypercalls after pKVM has been initialised Will Deacon
2021-09-29 13:37 ` Quentin Perret
2021-09-23 11:22 ` [PATCH 3/5] KVM: arm64: Propagate errors from __pkvm_prot_finalize hypercall Will Deacon
2021-09-29 13:36 ` Quentin Perret
2021-10-05 11:30 ` Will Deacon
2021-09-23 11:22 ` [PATCH 4/5] KVM: arm64: Prevent re-finalisation of pKVM for a given CPU Will Deacon
2021-09-29 13:41 ` Quentin Perret
2021-09-23 11:22 ` [PATCH 5/5] KVM: arm64: Disable privileged hypercalls after pKVM finalisation Will Deacon
2021-09-23 12:56 ` Marc Zyngier [this message]
2021-09-23 13:02 ` Will Deacon
2021-09-23 13:11 ` Marc Zyngier
2021-09-23 12:58 ` Will Deacon
2021-09-23 12:21 ` [PATCH 0/5] KVM: arm64: Restrict host hypercalls when pKVM is enabled 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=87zgs3tpqi.wl-maz@kernel.org \
--to=maz@kernel.org \
--cc=alexandru.elisei@arm.com \
--cc=catalin.marinas@arm.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=qperret@google.com \
--cc=suzuki.poulose@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).