KVMPPC HMM driver to manage secure guest pages
Subsystems (2)
cover KVMPPC HMM driver to manage secure guest pages
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.
Regards,
Bharata.
Bharata B Rao (3):
kvmppc: HMM backend driver to manage pages of secure guest
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 | 11 + arch/powerpc/include/asm/kvm_ppc.h | 34 ++- arch/powerpc/include/asm/ucall-api.h | 31 ++ arch/powerpc/kvm/Makefile | 3 + arch/powerpc/kvm/book3s.c | 5 +- arch/powerpc/kvm/book3s_hv.c | 105 ++++++- arch/powerpc/kvm/book3s_hv_hmm.c | 531 +++++++++++++++++++++++++++++++++++ arch/powerpc/kvm/book3s_pr.c | 3 +- arch/powerpc/kvm/powerpc.c | 2 +- 10 files changed, 726 insertions(+), 8 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.14.3
RFC PATCH 1/3 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 | 7 +- arch/powerpc/include/asm/kvm_host.h | 10 + arch/powerpc/include/asm/kvm_ppc.h | 28 ++ arch/powerpc/include/asm/ucall-api.h | 20 ++ arch/powerpc/kvm/Makefile | 3 + arch/powerpc/kvm/book3s_hv.c | 28 ++ arch/powerpc/kvm/book3s_hv_hmm.c | 531 +++++++++++++++++++++++++++++++++++ 7 files changed, 626 insertions(+), 1 deletion(-) 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 +6 -1
@@ -158,6 +158,9 @@/* Each control block has to be on a 4K boundary */ #define H_CB_ALIGNMENT 4096 +/* Flags for H_SVM_PAGE_IN */ +#define H_PAGE_IN_SHARED 0x1 +/* pSeries hypervisor opcodes */ #define H_REMOVE 0x04#define H_ENTER 0x08
@@ -295,7 +298,9 @@#define H_INT_ESB 0x3C8#define H_INT_SYNC 0x3CC#define H_INT_RESET 0x3D0 -#define MAX_HCALL_OPCODE H_INT_RESET +#define H_SVM_PAGE_IN 0x3D4 +#define H_SVM_PAGE_OUT 0x3D8 +#define MAX_HCALL_OPCODE H_SVM_PAGE_OUT/* H_VIOCTL functions */ #define H_GET_VIOA_DUMP_SIZE 0x01
arch/powerpc/include/asm/kvm_host.h +10 -0
@@ -830,4 +830,14 @@ 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 +struct kvmppc_hmm_device { +struct hmm_device *device; +struct hmm_devmem *devmem; +unsigned long *pfn_bitmap; +}; + +extern int kvmppc_hmm_init (void ); +extern void kvmppc_hmm_free (void ); +#endif #endif /* __POWERPC_KVM_HOST_H__ */
arch/powerpc/include/asm/kvm_ppc.h +28 -0
@@ -906,4 +906,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 +20 -0
@@ -0,0 +1,20 @@ +/* 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 dw0,u64 dw1,u64 dw2,u64 dw3) +{ +return U_SUCCESS ; +} + +static inline int uv_page_out (u64 lpid,u64 dw0,u64 dw1,u64 dw2,u64 dw3) +{ +return U_SUCCESS ; +} + +#endif /* _ASM_POWERPC_UCALL_API_H */
arch/powerpc/kvm/Makefile +3 -0
@@ -77,6 +77,9 @@ kvm-hv-y += \ book3s_64_mmu_hv.o \ book3s_64_mmu_radix.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 +28 -0
@@ -73,6 +73,7 @@#include <asm/opal.h> #include <asm/xics.h> #include <asm/xive.h> +#include <asm/kvm_host.h> #include "book3s.h"
@@ -935,6 +936,20 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)if (ret ==H_TOO_HARD )return RESUME_HOST ;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 ; }
@@ -961,6 +976,8 @@ static int kvmppc_hcall_impl_hv(unsigned long cmd)case H_IPOLL :case H_XIRR_X :#endif +case H_SVM_PAGE_IN : +case H_SVM_PAGE_OUT :return 1 ; }
@@ -4384,6 +4401,8 @@ static unsigned int default_hcall_list[] = {H_XIRR ,H_XIRR_X , #endif +H_SVM_PAGE_IN , +H_SVM_PAGE_OUT ,0 };
@@ -4596,11 +4615,20 @@ static int kvmppc_book3s_init_hv(void) no_mixing_hpt_and_radix = true; } +#ifdef CONFIG_PPC_SVM + r =kvmppc_hmm_init (); +if (r <0 ) +pr_err ("KVM-HV: kvmppc_hmm_init failed %d\n" , r); +#endif +return r; }static void kvmppc_book3s_exit_hv (void ) { +#ifdef CONFIG_PPC_SVM +kvmppc_hmm_free (); +#endif kvmppc_free_host_rm_ops ();if (kvmppc_radix_possible ())kvmppc_radix_exit ();
arch/powerpc/kvm/book3s_hv_hmm.c new file +531 -0
531 lines not on this page · raw message
Signature · 1 line
2.14.3
RFC PATCH 2/3 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 | 4 ++- arch/powerpc/include/asm/kvm_host.h | 1 + arch/powerpc/include/asm/ucall-api.h | 6 ++++ arch/powerpc/kvm/book3s_hv.c | 54 ++++++++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 1 deletion(-)
arch/powerpc/include/asm/hvcall.h +3 -1
@@ -300,7 +300,9 @@#define H_INT_RESET 0x3D0#define H_SVM_PAGE_IN 0x3D4#define H_SVM_PAGE_OUT 0x3D8 -#define MAX_HCALL_OPCODE H_SVM_PAGE_OUT +#define H_SVM_INIT_START 0x3DC +#define H_SVM_INIT_DONE 0x3E0 +#define MAX_HCALL_OPCODE H_SVM_INIT_DONE/* H_VIOCTL functions */ #define H_GET_VIOA_DUMP_SIZE 0x01
arch/powerpc/include/asm/kvm_host.h +1 -0
@@ -292,6 +292,7 @@ struct kvm_arch {struct dentry *debugfs_dir;struct dentry *htab_dentry;struct kvm_resize_hpt *resize_hpt;/* protected by kvm->lock */ +bool svm_init_start;/* 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/ucall-api.h +6 -0
@@ -17,4 +17,10 @@ static inline int uv_page_out(u64 lpid, u64 dw0, u64 dw1, u64 dw2, u64 dw3) return U_SUCCESS; } +static inline int uv_register_mem_slot (u64 lpid,u64 dw0,u64 dw1,u64 dw2, +u64 dw3) +{ +return 0 ; +} +#endif /* _ASM_POWERPC_UCALL_API_H */
arch/powerpc/kvm/book3s_hv.c +54 -0
78 lines not on this page · raw message
Signature · 1 line
2.14.3
RFC PATCH 3/3 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.
--- 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 | 23 ++++++++++++++++++++++- arch/powerpc/kvm/book3s_pr.c | 3 ++- arch/powerpc/kvm/powerpc.c | 2 +- 6 files changed, 37 insertions(+), 7 deletions(-)
arch/powerpc/include/asm/kvm_ppc.h +4 -2
@@ -226,7 +226,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,
@@ -296,7 +297,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
@@ -23,4 +23,9 @@ static inline int uv_register_mem_slot(u64 lpid, u64 dw0, u64 dw1, u64 dw2, 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
@@ -804,9 +804,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 +22 -1
@@ -3729,7 +3729,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 ;
@@ -3741,6 +3742,26 @@ 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.svm_init_start) +return ; + +#ifdef CONFIG_PPC_SVM +/* +* 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); + } +#endif }/*
arch/powerpc/kvm/book3s_pr.c +2 -1
@@ -1914,7 +1914,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
@@ -691,7 +691,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.14.3