kvmppc: HMM backend driver to manage pages of secure guest
Subsystems (3)
v2 cover kvmppc: HMM backend driver to manage pages of secure guest
Hi,
A pseries guest can be run as a secure guest on Ultravisor-enabled POWER platforms. On such platforms, this driver will be used to manage the movement of guest pages between the normal memory managed by hypervisor (HV) and secure memory managed by Ultravisor (UV).
This is an early post of HMM driver patches that manage page migration between normal and secure memory.
Private ZONE_DEVICE memory equal to the amount of secure memory available in the platform for running secure guests is created via a HMM device. The movement of pages between normal and secure memory is done by ->alloc_and_copy() callback routine of migrate_vma().
The page-in or page-out requests from UV will come to HV as hcalls and HV will call back into UV via uvcalls to satisfy these page requests.
The implementation of uvcall themselves are not present in this post and will be posted separately.
Changes in v2
=============
- Removed the HMM PFN hash table as the same information is now being stored in kvm_memory_slot->arch.rmap[] array as suggested by Paul Mackerras.
- Addressed the review comments from v1.
Bharata B Rao (4):
kvmppc: HMM backend driver to manage pages of secure guest
kvmppc: Add support for shared pages in HMM driver
kvmppc: H_SVM_INIT_START and H_SVM_INIT_DONE hcalls
kvmppc: Handle memory plug/unplug to secure VM
arch/powerpc/include/asm/hvcall.h | 9 + arch/powerpc/include/asm/kvm_host.h | 15 + arch/powerpc/include/asm/kvm_ppc.h | 46 ++- arch/powerpc/include/asm/ucall-api.h | 33 ++ arch/powerpc/kvm/Makefile | 3 + arch/powerpc/kvm/book3s.c | 5 +- arch/powerpc/kvm/book3s_hv.c | 49 ++- arch/powerpc/kvm/book3s_hv_hmm.c | 542 +++++++++++++++++++++++++++ arch/powerpc/kvm/book3s_pr.c | 3 +- arch/powerpc/kvm/powerpc.c | 2 +- 10 files changed, 700 insertions(+), 7 deletions(-) create mode 100644 arch/powerpc/include/asm/ucall-api.h create mode 100644 arch/powerpc/kvm/book3s_hv_hmm.c
Signature · 1 line
2.17.1
RFC PATCH v2 1/4 kvmppc: HMM backend driver to manage pages of secure guest
HMM driver for KVM PPC to manage page transitions of secure guest via H_SVM_PAGE_IN and H_SVM_PAGE_OUT hcalls.
H_SVM_PAGE_IN: Move the content of a normal page to secure pageH_SVM_PAGE_OUT: Move the content of a secure page to normal page
--- arch/powerpc/include/asm/hvcall.h | 4 + arch/powerpc/include/asm/kvm_host.h | 14 + arch/powerpc/include/asm/kvm_ppc.h | 28 ++ arch/powerpc/include/asm/ucall-api.h | 22 ++ arch/powerpc/kvm/Makefile | 3 + arch/powerpc/kvm/book3s_hv.c | 21 ++ arch/powerpc/kvm/book3s_hv_hmm.c | 457 +++++++++++++++++++++++++++ 7 files changed, 549 insertions(+) create mode 100644 arch/powerpc/include/asm/ucall-api.h create mode 100644 arch/powerpc/kvm/book3s_hv_hmm.c
arch/powerpc/include/asm/hvcall.h +4 -0
@@ -336,6 +336,10 @@#define H_ENTER_NESTED 0xF804#define H_TLB_INVALIDATE 0xF808 +/* Platform-specific hcalls used by the Ultravisor */ +#define H_SVM_PAGE_IN 0xFF00 +#define H_SVM_PAGE_OUT 0xFF04 +/* Values for 2nd argument to H_SET_MODE */ #define H_SET_MODE_RESOURCE_SET_CIABR 1#define H_SET_MODE_RESOURCE_SET_DAWR 2
arch/powerpc/include/asm/kvm_host.h +14 -0
@@ -842,4 +842,18 @@ static inline void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu) {}static inline void kvm_arch_vcpu_unblocking (struct kvm_vcpu *vcpu) {}static inline void kvm_arch_vcpu_block_finish (struct kvm_vcpu *vcpu) {} +#ifdef CONFIG_PPC_SVM +extern int kvmppc_hmm_init (void ); +extern void kvmppc_hmm_free (void ); +extern void kvmppc_hmm_release_pfns (struct kvm_memory_slot *free); +#else +static inline int kvmppc_hmm_init (void ) +{ +return 0 ; +} + +static inline void kvmppc_hmm_free (void ) {} +static inline void kvmppc_hmm_release_pfns (struct kvm_memory_slot *free) {} +#endif /* CONFIG_PPC_SVM */ +#endif /* __POWERPC_KVM_HOST_H__ */
arch/powerpc/include/asm/kvm_ppc.h +28 -0
@@ -908,4 +908,32 @@ static inline ulong kvmppc_get_ea_indexed(struct kvm_vcpu *vcpu, int ra, int rb)extern void xics_wake_cpu (int cpu); +#ifdef CONFIG_PPC_SVM +extern unsigned long kvmppc_h_svm_page_in (struct kvm *kvm, +unsigned int lpid, +unsigned long gra, +unsigned long flags, +unsigned long page_shift); +extern unsigned long kvmppc_h_svm_page_out (struct kvm *kvm, +unsigned int lpid, +unsigned long gra, +unsigned long flags, +unsigned long page_shift); +#else +static inline unsigned long +kvmppc_h_svm_page_in (struct kvm *kvm,unsigned int lpid, +unsigned long gra,unsigned long flags, +unsigned long page_shift) +{ +return H_UNSUPPORTED ; +} + +static inline unsigned long +kvmppc_h_svm_page_out (struct kvm *kvm,unsigned int lpid, +unsigned long gra,unsigned long flags, +unsigned long page_shift) +{ +return H_UNSUPPORTED ; +} +#endif #endif /* __POWERPC_KVM_PPC_H__ */
arch/powerpc/include/asm/ucall-api.h new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_POWERPC_UCALL_API_H +#define _ASM_POWERPC_UCALL_API_H + +#define U_SUCCESS 0 + +/* +* TODO: Dummy uvcalls, will be replaced by real calls +*/ +static inline int uv_page_in (u64 lpid,u64 src_ra,u64 dst_gpa,u64 flags, +u64 page_shift) +{ +return U_SUCCESS ; +} + +static inline int uv_page_out (u64 lpid,u64 dst_ra,u64 src_gpa,u64 flags, +u64 page_shift) +{ +return U_SUCCESS ; +} + +#endif /* _ASM_POWERPC_UCALL_API_H */
arch/powerpc/kvm/Makefile +3 -0
@@ -76,6 +76,9 @@ kvm-hv-y += \ book3s_64_mmu_radix.o \ book3s_hv_nested.o +kvm-hv-$(CONFIG_PPC_SVM) += \ + book3s_hv_hmm.o + kvm-hv-$(CONFIG_PPC_TRANSACTIONAL_MEM) += \ book3s_hv_tm.o
arch/powerpc/kvm/book3s_hv.c +21 -0
@@ -74,6 +74,7 @@#include <asm/opal.h> #include <asm/xics.h> #include <asm/xive.h> +#include <asm/kvm_host.h> #include "book3s.h"
@@ -991,6 +992,20 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)if (nesting_enabled (vcpu->kvm)) ret =kvmhv_do_nested_tlbie (vcpu);break ; +case H_SVM_PAGE_IN : + ret =kvmppc_h_svm_page_in (vcpu->kvm, +kvmppc_get_gpr (vcpu,4 ), +kvmppc_get_gpr (vcpu,5 ), +kvmppc_get_gpr (vcpu,6 ), +kvmppc_get_gpr (vcpu,7 )); +break ; +case H_SVM_PAGE_OUT : + ret =kvmppc_h_svm_page_out (vcpu->kvm, +kvmppc_get_gpr (vcpu,4 ), +kvmppc_get_gpr (vcpu,5 ), +kvmppc_get_gpr (vcpu,6 ), +kvmppc_get_gpr (vcpu,7 )); +break ;default :return RESUME_HOST ;
@@ -4345,6 +4360,7 @@ static void kvmppc_core_free_memslot_hv(struct kvm_memory_slot *free, struct kvm_memory_slot *dont) {if (!dont || free->arch.rmap != dont->arch.rmap) { +kvmppc_hmm_release_pfns (free);vfree (free->arch.rmap); free->arch.rmap =NULL ; }
@@ -5357,11 +5373,16 @@ static int kvmppc_book3s_init_hv(void) no_mixing_hpt_and_radix = true; } + r =kvmppc_hmm_init (); +if (r <0 ) +pr_err ("KVM-HV: kvmppc_hmm_init failed %d\n" , r); +return r; }static void kvmppc_book3s_exit_hv (void ) { +kvmppc_hmm_free ();kvmppc_free_host_rm_ops ();if (kvmppc_radix_possible ())kvmppc_radix_exit ();
arch/powerpc/kvm/book3s_hv_hmm.c new file +457 -0
457 lines not on this page · raw message
Signature · 1 line
2.17.1
RFC PATCH v2 2/4 kvmppc: Add support for shared pages in HMM driver
In reply to Bharata B RaoA secure guest will share some of its pages with hypervisor (Eg. virtio bounce buffers etc). Support shared pages in HMM driver.
--- arch/powerpc/include/asm/hvcall.h | 3 ++ arch/powerpc/kvm/book3s_hv_hmm.c | 58 +++++++++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/hvcall.h +3 -0
@@ -336,6 +336,9 @@#define H_ENTER_NESTED 0xF804#define H_TLB_INVALIDATE 0xF808 +/* Flags for H_SVM_PAGE_IN */ +#define H_PAGE_IN_SHARED 0x1 +/* Platform-specific hcalls used by the Ultravisor */ #define H_SVM_PAGE_IN 0xFF00#define H_SVM_PAGE_OUT 0xFF04
arch/powerpc/kvm/book3s_hv_hmm.c +55 -3
84 lines not on this page · raw message
Signature · 1 line
2.17.1
RFC PATCH v2 3/4 kvmppc: H_SVM_INIT_START and H_SVM_INIT_DONE hcalls
In reply to Bharata B RaoH_SVM_INIT_START: Initiate securing a VMH_SVM_INIT_DONE: Conclude securing a VM
During early guest init, these hcalls will be issued by UV. As part of these hcalls, [un]register memslots with UV.
--- arch/powerpc/include/asm/hvcall.h | 2 ++ arch/powerpc/include/asm/kvm_host.h | 1 + arch/powerpc/include/asm/kvm_ppc.h | 12 ++++++++++ arch/powerpc/include/asm/ucall-api.h | 6 +++++ arch/powerpc/kvm/book3s_hv.c | 6 +++++ arch/powerpc/kvm/book3s_hv_hmm.c | 33 ++++++++++++++++++++++++++++ 6 files changed, 60 insertions(+)
arch/powerpc/include/asm/hvcall.h +2 -0
@@ -342,6 +342,8 @@/* Platform-specific hcalls used by the Ultravisor */ #define H_SVM_PAGE_IN 0xFF00#define H_SVM_PAGE_OUT 0xFF04 +#define H_SVM_INIT_START 0xFF08 +#define H_SVM_INIT_DONE 0xFF0C/* Values for 2nd argument to H_SET_MODE */ #define H_SET_MODE_RESOURCE_SET_CIABR 1
arch/powerpc/include/asm/kvm_host.h +1 -0
@@ -296,6 +296,7 @@ struct kvm_arch {struct dentry *htab_dentry;struct dentry *radix_dentry;struct kvm_resize_hpt *resize_hpt;/* protected by kvm->lock */ +bool secure;/* Indicates H_SVM_INIT_START has been called */ #endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */ #ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE struct mutex hpt_mutex;
arch/powerpc/include/asm/kvm_ppc.h +12 -0
@@ -919,6 +919,8 @@ extern unsigned long kvmppc_h_svm_page_out(struct kvm *kvm,unsigned long gra, unsigned long flags, unsigned long page_shift); +extern unsigned long kvmppc_h_svm_init_start (struct kvm *kvm); +extern unsigned long kvmppc_h_svm_init_done (struct kvm *kvm);#else static inline unsigned long kvmppc_h_svm_page_in(struct kvm *kvm, unsigned int lpid,
@@ -935,5 +937,15 @@ kvmppc_h_svm_page_out(struct kvm *kvm, unsigned int lpid, {return H_UNSUPPORTED ; } + +static inline unsigned long kvmppc_h_svm_init_start (struct kvm *kvm) +{ +return H_UNSUPPORTED ; +} + +static inline unsigned long kvmppc_h_svm_init_done (struct kvm *kvm) +{ +return H_UNSUPPORTED ; +}#endif #endif /* __POWERPC_KVM_PPC_H__ */
arch/powerpc/include/asm/ucall-api.h +6 -0
@@ -19,4 +19,10 @@ static inline int uv_page_out(u64 lpid, u64 dst_ra, u64 src_gpa, u64 flags, return U_SUCCESS; } +static inline int uv_register_mem_slot (u64 lpid,u64 start_gpa,u64 size, +u64 flags,u64 slotid) +{ +return 0 ; +} +#endif /* _ASM_POWERPC_UCALL_API_H */
arch/powerpc/kvm/book3s_hv.c +6 -0
@@ -1006,6 +1006,12 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)kvmppc_get_gpr (vcpu,6 ), kvmppc_get_gpr(vcpu, 7));break ; +case H_SVM_INIT_START : + ret =kvmppc_h_svm_init_start (vcpu->kvm); +break ; +case H_SVM_INIT_DONE : + ret =kvmppc_h_svm_init_done (vcpu->kvm); +break ;default :return RESUME_HOST ;
arch/powerpc/kvm/book3s_hv_hmm.c +33 -0
@@ -55,6 +55,39 @@ struct kvmppc_hmm_migrate_args {unsigned long page_shift; }; +unsigned long kvmppc_h_svm_init_start (struct kvm *kvm) +{ +struct kvm_memslots *slots; +struct kvm_memory_slot *memslot; +int ret =H_SUCCESS ; +int srcu_idx; + + srcu_idx =srcu_read_lock (&kvm->srcu); + slots =kvm_memslots (kvm); +kvm_for_each_memslot (memslot, slots) { + ret =uv_register_mem_slot (kvm->arch.lpid, + memslot->base_gfn <<PAGE_SHIFT , + memslot->npages *PAGE_SIZE , +0 , memslot->id); +if (ret <0 ) { + ret =H_PARAMETER ;/* TODO: proper retval */ + goto out; + } + } + kvm->arch.secure = true; +out: +srcu_read_unlock (&kvm->srcu, srcu_idx); +return ret; +} + +unsigned long kvmppc_h_svm_init_done (struct kvm *kvm) +{ +if (kvm->arch.secure) +return H_SUCCESS ; +else +return H_UNSUPPORTED ; +} +#define KVMPPC_PFN_HMM (0x1ULL << 61)static inline bool kvmppc_is_hmm_pfn (unsigned long pfn)
Signature · 1 line
2.17.1
RFC PATCH v2 4/4 kvmppc: Handle memory plug/unplug to secure VM
In reply to Bharata B RaoRegister the new memslot with UV during plug and unregister the memslot during unplug.
This needs addition of kvm_mr_change argument tokvm_ops->commit_memory_region()
--- arch/powerpc/include/asm/kvm_ppc.h | 6 ++++-- arch/powerpc/include/asm/ucall-api.h | 5 +++++ arch/powerpc/kvm/book3s.c | 5 +++-- arch/powerpc/kvm/book3s_hv.c | 22 +++++++++++++++++++++- arch/powerpc/kvm/book3s_pr.c | 3 ++- arch/powerpc/kvm/powerpc.c | 2 +- 6 files changed, 36 insertions(+), 7 deletions(-)
arch/powerpc/include/asm/kvm_ppc.h +4 -2
@@ -224,7 +224,8 @@ extern int kvmppc_core_prepare_memory_region(struct kvm *kvm,extern void kvmppc_core_commit_memory_region (struct kvm *kvm,const struct kvm_userspace_memory_region *mem,const struct kvm_memory_slot *old, -const struct kvm_memory_slot *new); +const struct kvm_memory_slot *new, +enum kvm_mr_change change);extern int kvm_vm_ioctl_get_smmu_info (struct kvm *kvm,struct kvm_ppc_smmu_info *info); extern void kvmppc_core_flush_memslot(struct kvm *kvm,
@@ -294,7 +295,8 @@ struct kvmppc_ops {void (*commit_memory_region)(struct kvm *kvm,const struct kvm_userspace_memory_region *mem,const struct kvm_memory_slot *old, -const struct kvm_memory_slot *new); +const struct kvm_memory_slot *new, +enum kvm_mr_change change);int (*unmap_hva_range)(struct kvm *kvm,unsigned long start,unsigned long end);int (*age_hva)(struct kvm *kvm,unsigned long start,unsigned long end);
arch/powerpc/include/asm/ucall-api.h +5 -0
@@ -25,4 +25,9 @@ static inline int uv_register_mem_slot(u64 lpid, u64 start_gpa, u64 size, return 0; } +static inline int uv_unregister_mem_slot (u64 lpid,u64 dw0) +{ +return 0 ; +} +#endif /* _ASM_POWERPC_UCALL_API_H */
arch/powerpc/kvm/book3s.c +3 -2
@@ -830,9 +830,10 @@ int kvmppc_core_prepare_memory_region(struct kvm *kvm,void kvmppc_core_commit_memory_region (struct kvm *kvm,const struct kvm_userspace_memory_region *mem,const struct kvm_memory_slot *old, -const struct kvm_memory_slot *new) +const struct kvm_memory_slot *new, +enum kvm_mr_change change) { - kvm->arch.kvm_ops->commit_memory_region (kvm, mem, old, new); + kvm->arch.kvm_ops->commit_memory_region (kvm, mem, old, new, change); }int kvm_unmap_hva_range (struct kvm *kvm,unsigned long start,unsigned long end)
arch/powerpc/kvm/book3s_hv.c +21 -1
@@ -75,6 +75,7 @@#include <asm/xics.h> #include <asm/xive.h> #include <asm/kvm_host.h> +#include <asm/ucall-api.h> #include "book3s.h"
@@ -4392,7 +4393,8 @@ static int kvmppc_core_prepare_memory_region_hv(struct kvm *kvm,static void kvmppc_core_commit_memory_region_hv (struct kvm *kvm,const struct kvm_userspace_memory_region *mem,const struct kvm_memory_slot *old, -const struct kvm_memory_slot *new) +const struct kvm_memory_slot *new, +enum kvm_mr_change change) {unsigned long npages = mem->memory_size >>PAGE_SHIFT ;
@@ -4404,6 +4406,24 @@ static void kvmppc_core_commit_memory_region_hv(struct kvm *kvm,*/ if (npages)atomic64_inc (&kvm->arch.mmio_update); +/* +* If UV hasn't yet called H_SVM_INIT_START, don't register memslots. +*/ +if (!kvm->arch.secure) +return ; + +/* +* TODO: Handle KVM_MR_MOVE +*/ +if (change ==KVM_MR_CREATE ) { +uv_register_mem_slot (kvm->arch.lpid, + new->base_gfn <<PAGE_SHIFT , + new->npages *PAGE_SIZE , +0 , + new->id); + }else if (change ==KVM_MR_DELETE ) { +uv_unregister_mem_slot (kvm->arch.lpid, old->id); + } }/*
arch/powerpc/kvm/book3s_pr.c +2 -1
@@ -1913,7 +1913,8 @@ static int kvmppc_core_prepare_memory_region_pr(struct kvm *kvm,static void kvmppc_core_commit_memory_region_pr (struct kvm *kvm,const struct kvm_userspace_memory_region *mem,const struct kvm_memory_slot *old, -const struct kvm_memory_slot *new) +const struct kvm_memory_slot *new, +enum kvm_mr_change change) {return ; }
arch/powerpc/kvm/powerpc.c +1 -1
@@ -696,7 +696,7 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,const struct kvm_memory_slot *new, enum kvm_mr_change change) { -kvmppc_core_commit_memory_region (kvm ,mem ,old ,new ); +kvmppc_core_commit_memory_region (kvm ,mem ,old ,new ,change ); } void kvm_arch_flush_shadow_memslot(struct kvm *kvm,
Signature · 1 line
2.17.1