KVM: PPC: Driver to manage pages of secure guest
Subsystems (6)
v11 cover KVM: PPC: Driver to manage pages of secure guest
Hi,
This is the next version of the patchset that adds required support in the KVM hypervisor to run secure guests on PEF-enabled POWER platforms.
This version includes the following changes:
- Ensure that any malicious calls to the 4 hcalls (init_start, init_done, page_in and page_out) are handled safely by returning appropriate errors (Paul Mackerras)
- init_start hcall should work for only radix guests.
- Fix the page-size-order argument in uv_page_inval (Ram Pai)
- Don't free up partition scoped page tables in HV when guest becomes secure (Paul Mackerras)
- During guest reset, when we unpin VPA pages, make sure that no vcpu is running and fail the SVM_OFF ioctl if any are running (Paul Mackerras)
- Dropped the patch that implemented init_abort hcall as it still has unresolved questions.
Anshuman Khandual (1):
KVM: PPC: Ultravisor: Add PPC_UV config option
Bharata B Rao (6):
mm: ksm: Export ksm_madvise()
KVM: PPC: Support for running secure guests
KVM: PPC: Shared pages support for secure guests
KVM: PPC: Radix changes for secure guest
KVM: PPC: Handle memory plug/unplug to secure VM
KVM: PPC: Support reset of secure guest
Documentation/virt/kvm/api.txt | 18 + arch/powerpc/Kconfig | 17 + arch/powerpc/include/asm/hvcall.h | 9 + arch/powerpc/include/asm/kvm_book3s_uvmem.h | 74 ++ arch/powerpc/include/asm/kvm_host.h | 6 + arch/powerpc/include/asm/kvm_ppc.h | 1 + arch/powerpc/include/asm/ultravisor-api.h | 6 + arch/powerpc/include/asm/ultravisor.h | 36 + arch/powerpc/kvm/Makefile | 3 + arch/powerpc/kvm/book3s_64_mmu_radix.c | 25 + arch/powerpc/kvm/book3s_hv.c | 143 ++++ arch/powerpc/kvm/book3s_hv_uvmem.c | 774 ++++++++++++++++++++ arch/powerpc/kvm/powerpc.c | 12 + include/uapi/linux/kvm.h | 1 + mm/ksm.c | 1 + 15 files changed, 1126 insertions(+) create mode 100644 arch/powerpc/include/asm/kvm_book3s_uvmem.h create mode 100644 arch/powerpc/kvm/book3s_hv_uvmem.c
Signature · 1 line
2.21.0
PATCH v11 1/7 mm: ksm: Export ksm_madvise()
On PEF-enabled POWER platforms that support running of secure guests, secure pages of the guest are represented by device private pages in the host. Such pages needn't participate in KSM merging. This is achieved by using ksm_madvise() call which need to be exported since KVM PPC can be a kernel module.
--- mm/ksm.c | 1 + 1 file changed, 1 insertion(+)
mm/ksm.c +1 -0
@@ -2478,6 +2478,7 @@ int ksm_madvise(struct vm_area_struct *vma, unsigned long start,return 0 ; } +EXPORT_SYMBOL_GPL (ksm_madvise);int __ksm_enter (struct mm_struct *mm) {
Signature · 1 line
2.21.0
PATCH v11 2/7 KVM: PPC: Support for running secure guests
In reply to Bharata B RaoA pseries guest can be run as 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).
HV is informed about the guest's transition to secure mode via hcalls:
H_SVM_INIT_START: Initiate securing a VMH_SVM_INIT_DONE: Conclude securing a VM
As part of H_SVM_INIT_START, register all existing memslots with the UV. H_SVM_INIT_DONE call by UV informs HV that transition of the guest to secure mode is complete.
These two states (transition to secure mode STARTED and transition to secure mode COMPLETED) are recorded in kvm->arch.secure_guest. Setting these states will cause the assembly code that enters the guest to call the UV_RETURN ucall instead of trying to enter the guest directly.
Migration of pages betwen normal and secure memory of secure guest is implemented in 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
Private ZONE_DEVICE memory equal to the amount of secure memory available in the platform for running secure guests is created. Whenever a page belonging to the guest becomes secure, a page from this private device memory is used to represent and track that secure page on the HV side. The movement of pages between normal and secure memory is done via migrate_vma_pages() using UV_PAGE_IN and UV_PAGE_OUT ucalls.
--- arch/powerpc/include/asm/hvcall.h | 6 + arch/powerpc/include/asm/kvm_book3s_uvmem.h | 62 ++ arch/powerpc/include/asm/kvm_host.h | 6 + arch/powerpc/include/asm/ultravisor-api.h | 3 + arch/powerpc/include/asm/ultravisor.h | 21 + arch/powerpc/kvm/Makefile | 3 + arch/powerpc/kvm/book3s_hv.c | 29 + arch/powerpc/kvm/book3s_hv_uvmem.c | 628 ++++++++++++++++++++ 8 files changed, 758 insertions(+) create mode 100644 arch/powerpc/include/asm/kvm_book3s_uvmem.h create mode 100644 arch/powerpc/kvm/book3s_hv_uvmem.c
arch/powerpc/include/asm/hvcall.h +6 -0
@@ -342,6 +342,12 @@#define H_TLB_INVALIDATE 0xF808#define H_COPY_TOFROM_GUEST 0xF80C +/* Platform-specific hcalls used by the Ultravisor */ +#define H_SVM_PAGE_IN 0xEF00 +#define H_SVM_PAGE_OUT 0xEF04 +#define H_SVM_INIT_START 0xEF08 +#define H_SVM_INIT_DONE 0xEF0C +/* 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_book3s_uvmem.h new file +62 -0
62 lines not on this page · raw message
arch/powerpc/include/asm/kvm_host.h +6 -0
@@ -275,6 +275,10 @@ struct kvm_hpt_info {struct kvm_resize_hpt ; +/* Flag values for kvm_arch.secure_guest */ +#define KVMPPC_SECURE_INIT_START 0x1/* H_SVM_INIT_START has been called */ +#define KVMPPC_SECURE_INIT_DONE 0x2/* H_SVM_INIT_DONE completed */ +struct kvm_arch {unsigned int lpid;unsigned int smt_mode;/* # vcpus per virtual core */
@@ -330,6 +334,8 @@ struct kvm_arch {#endif struct kvmppc_ops *kvm_ops;#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE +struct mutex uvmem_lock; +struct list_head uvmem_pfns;struct mutex mmu_setup_lock;/* nests inside vcpu mutexes */ u64 l1_ptcr;int max_nested_lpid;
arch/powerpc/include/asm/ultravisor-api.h +3 -0
@@ -26,6 +26,9 @@#define UV_WRITE_PATE 0xF104#define UV_RETURN 0xF11C#define UV_ESM 0xF110 +#define UV_REGISTER_MEM_SLOT 0xF120 +#define UV_PAGE_IN 0xF128 +#define UV_PAGE_OUT 0xF12C#define UV_SHARE_PAGE 0xF130#define UV_UNSHARE_PAGE 0xF134#define UV_UNSHARE_ALL_PAGES 0xF140
arch/powerpc/include/asm/ultravisor.h +21 -0
@@ -46,4 +46,25 @@ static inline int uv_unshare_all_pages(void) return ucall_norets(UV_UNSHARE_ALL_PAGES); } +static inline int uv_page_in (u64 lpid,u64 src_ra,u64 dst_gpa,u64 flags, +u64 page_shift) +{ +return ucall_norets (UV_PAGE_IN , lpid, src_ra, dst_gpa, flags, + page_shift); +} + +static inline int uv_page_out (u64 lpid,u64 dst_ra,u64 src_gpa,u64 flags, +u64 page_shift) +{ +return ucall_norets (UV_PAGE_OUT , lpid, dst_ra, src_gpa, flags, + page_shift); +} + +static inline int uv_register_mem_slot (u64 lpid,u64 start_gpa,u64 size, +u64 flags,u64 slotid) +{ +return ucall_norets (UV_REGISTER_MEM_SLOT , lpid, start_gpa, + size, flags, slotid); +} +#endif /* _ASM_POWERPC_ULTRAVISOR_H */
arch/powerpc/kvm/Makefile +3 -0
@@ -71,6 +71,9 @@ kvm-hv-y += \ book3s_64_mmu_radix.o \ book3s_hv_nested.o +kvm-hv-$(CONFIG_PPC_UV) += \ + book3s_hv_uvmem.o + kvm-hv-$(CONFIG_PPC_TRANSACTIONAL_MEM) += \ book3s_hv_tm.o
arch/powerpc/kvm/book3s_hv.c +29 -0
@@ -72,6 +72,8 @@#include <asm/xics.h> #include <asm/xive.h> #include <asm/hw_breakpoint.h> +#include <asm/kvm_host.h> +#include <asm/kvm_book3s_uvmem.h> #include "book3s.h"
@@ -1078,6 +1080,25 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)kvmppc_get_gpr (vcpu,5 ), kvmppc_get_gpr(vcpu, 6));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 )); +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 )); +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 ; }
@@ -4784,6 +4805,8 @@ static int kvmppc_core_init_vm_hv(struct kvm *kvm)char buf[32 ];int ret; +mutex_init (&kvm->arch.uvmem_lock); +INIT_LIST_HEAD (&kvm->arch.uvmem_pfns);mutex_init (&kvm->arch.mmu_setup_lock);/* Allocate the guest's logical partition ID */
@@ -4955,6 +4978,7 @@ static void kvmppc_core_destroy_vm_hv(struct kvm *kvm) kvm->arch.process_table =0 ;kvmhv_set_ptbl_entry (kvm->arch.lpid,0 ,0 ); } +kvmppc_free_lpid (kvm->arch.lpid);kvmppc_free_pimap (kvm);
@@ -5544,11 +5568,16 @@ static int kvmppc_book3s_init_hv(void) no_mixing_hpt_and_radix = true; } + r =kvmppc_uvmem_init (); +if (r <0 ) +pr_err ("KVM-HV: kvmppc_uvmem_init failed %d\n" , r); +return r; }static void kvmppc_book3s_exit_hv (void ) { +kvmppc_uvmem_free ();kvmppc_free_host_rm_ops ();if (kvmppc_radix_possible ())kvmppc_radix_exit ();
arch/powerpc/kvm/book3s_hv_uvmem.c new file +628 -0
628 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v11 3/7 KVM: PPC: Shared pages support for secure guests
In reply to Bharata B RaoA secure guest will share some of its pages with hypervisor (Eg. virtio bounce buffers etc). Support sharing of pages between hypervisor and ultravisor.
Shared page is reachable via both HV and UV side page tables. Once a secure page is converted to shared page, the device page that represents the secure page is unmapped from the HV side page tables.
--- arch/powerpc/include/asm/hvcall.h | 3 ++ arch/powerpc/kvm/book3s_hv_uvmem.c | 85 ++++++++++++++++++++++++++++-- 2 files changed, 84 insertions(+), 4 deletions(-)
arch/powerpc/include/asm/hvcall.h +3 -0
@@ -342,6 +342,9 @@#define H_TLB_INVALIDATE 0xF808#define H_COPY_TOFROM_GUEST 0xF80C +/* Flags for H_SVM_PAGE_IN */ +#define H_PAGE_IN_SHARED 0x1 +/* Platform-specific hcalls used by the Ultravisor */ #define H_SVM_PAGE_IN 0xEF00#define H_SVM_PAGE_OUT 0xEF04
arch/powerpc/kvm/book3s_hv_uvmem.c +81 -4
133 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v11 4/7 KVM: PPC: Radix changes for secure guest
In reply to Bharata B Rao- After the guest becomes secure, when we handle a page fault of a page belonging to SVM in HV, send that page to UV via UV_PAGE_IN.
- Whenever a page is unmapped on the HV side, inform UV via UV_PAGE_INVAL.
- Ensure all those routines that walk the secondary page tables of the guest don't do so in case of secure VM. For secure guest, the active secondary page tables are in secure memory and the secondary page tables in HV are freed when guest becomes secure.
--- arch/powerpc/include/asm/kvm_book3s_uvmem.h | 6 ++++ arch/powerpc/include/asm/ultravisor-api.h | 1 + arch/powerpc/include/asm/ultravisor.h | 5 ++++ arch/powerpc/kvm/book3s_64_mmu_radix.c | 22 ++++++++++++++ arch/powerpc/kvm/book3s_hv_uvmem.c | 32 +++++++++++++++++++++ 5 files changed, 66 insertions(+)
arch/powerpc/include/asm/kvm_book3s_uvmem.h +6 -0
@@ -18,6 +18,7 @@ unsigned long kvmppc_h_svm_page_out(struct kvm *kvm, unsigned long page_shift);unsigned long kvmppc_h_svm_init_start (struct kvm *kvm);unsigned long kvmppc_h_svm_init_done (struct kvm *kvm); +int kvmppc_send_page_to_uv (struct kvm *kvm,unsigned long gfn);#else static inline int kvmppc_uvmem_init (void ) {
@@ -58,5 +59,10 @@ static inline unsigned long kvmppc_h_svm_init_done(struct kvm *kvm) {return H_UNSUPPORTED ; } + +static inline int kvmppc_send_page_to_uv (struct kvm *kvm,unsigned long gfn) +{ +return -EFAULT ; +}#endif /* CONFIG_PPC_UV */ #endif /* __ASM_KVM_BOOK3S_UVMEM_H__ */
arch/powerpc/include/asm/ultravisor-api.h +1 -0
@@ -32,5 +32,6 @@#define UV_SHARE_PAGE 0xF130#define UV_UNSHARE_PAGE 0xF134#define UV_UNSHARE_ALL_PAGES 0xF140 +#define UV_PAGE_INVAL 0xF138#endif /* _ASM_POWERPC_ULTRAVISOR_API_H */
arch/powerpc/include/asm/ultravisor.h +5 -0
@@ -67,4 +67,9 @@ static inline int uv_register_mem_slot(u64 lpid, u64 start_gpa, u64 size, size, flags, slotid); } +static inline int uv_page_inval (u64 lpid,u64 gpa,u64 page_shift) +{ +return ucall_norets (UV_PAGE_INVAL , lpid, gpa, page_shift); +} +#endif /* _ASM_POWERPC_ULTRAVISOR_H */
arch/powerpc/kvm/book3s_64_mmu_radix.c +22 -0
@@ -19,6 +19,8 @@#include <asm/pgtable.h> #include <asm/pgalloc.h> #include <asm/pte-walk.h> +#include <asm/ultravisor.h> +#include <asm/kvm_book3s_uvmem.h> /* * Supported radix tree geometry.
@@ -915,6 +917,9 @@ int kvmppc_book3s_radix_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,if (!(dsisr &DSISR_PRTABLE_FAULT )) gpa |= ea &0xfff ; +if (kvm->arch.secure_guest &KVMPPC_SECURE_INIT_DONE ) +return kvmppc_send_page_to_uv (kvm, gfn); +/* Get the corresponding memslot */ memslot =gfn_to_memslot (kvm, gfn);
@@ -972,6 +977,11 @@ int kvm_unmap_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,unsigned long gpa = gfn <<PAGE_SHIFT ;unsigned int shift; +if (kvm->arch.secure_guest &KVMPPC_SECURE_INIT_DONE ) { +uv_page_inval (kvm->arch.lpid, gpa,PAGE_SHIFT ); +return 0 ; + } + ptep =__find_linux_pte (kvm->arch.pgtable, gpa,NULL , &shift);if (ptep &&pte_present (*ptep)) kvmppc_unmap_pte(kvm, ptep, gpa, shift, memslot,
@@ -989,6 +999,9 @@ int kvm_age_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,int ref =0 ;unsigned long old, *rmapp; +if (kvm->arch.secure_guest &KVMPPC_SECURE_INIT_DONE ) +return ref; + ptep =__find_linux_pte (kvm->arch.pgtable, gpa,NULL , &shift);if (ptep &&pte_present (*ptep) &&pte_young (*ptep)) { old = kvmppc_radix_update_pte(kvm, ptep, _PAGE_ACCESSED, 0,
@@ -1013,6 +1026,9 @@ int kvm_test_age_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,unsigned int shift;int ref =0 ; +if (kvm->arch.secure_guest &KVMPPC_SECURE_INIT_DONE ) +return ref; + ptep =__find_linux_pte (kvm->arch.pgtable, gpa,NULL , &shift);if (ptep &&pte_present (*ptep) &&pte_young (*ptep)) ref =1 ;
@@ -1030,6 +1046,9 @@ static int kvm_radix_test_clear_dirty(struct kvm *kvm,int ret =0 ;unsigned long old, *rmapp; +if (kvm->arch.secure_guest &KVMPPC_SECURE_INIT_DONE ) +return ret; + ptep =__find_linux_pte (kvm->arch.pgtable, gpa,NULL , &shift);if (ptep &&pte_present (*ptep) &&pte_dirty (*ptep)) { ret =1 ;
@@ -1082,6 +1101,9 @@ void kvmppc_radix_flush_memslot(struct kvm *kvm,unsigned long gpa;unsigned int shift; +if (kvm->arch.secure_guest &KVMPPC_SECURE_INIT_DONE ) +return ; + gpa = memslot->base_gfn <<PAGE_SHIFT ;spin_lock (&kvm->mmu_lock);for (n = memslot->npages; n; --n) {
arch/powerpc/kvm/book3s_hv_uvmem.c +32 -0
@@ -70,6 +70,17 @@* Shared pages: Whenever guest shares a secure page, UV will split and * remap the 2MB page if required and issue H_SVM_PAGE_IN with 64K page size. * +* HV invalidating a page: When a regular page belonging to secure +* guest gets unmapped, HV informs UV with UV_PAGE_INVAL of 64K +* page size. Using 64K page size is correct here because any non-secure +* page will essentially be of 64K page size. Splitting by UV during sharing +* and page-out ensures this. +* +* Page fault handling: When HV handles page fault of a page belonging +* to secure guest, it sends that to UV with a 64K UV_PAGE_IN request. +* Using 64K size is correct here too as UV would have split the 2MB page +* into 64k mappings and would have done page-outs earlier. +* * In summary, the current secure pages handling code in HV assumes * 64K page size and in fact fails any page-in/page-out requests of * non-64K size upfront. If and when UV starts supporting multiple
@@ -619,6 +630,27 @@ kvmppc_h_svm_page_out(struct kvm *kvm, unsigned long gpa,return ret; } +int kvmppc_send_page_to_uv (struct kvm *kvm,unsigned long gfn) +{ +unsigned long pfn; +int ret =U_SUCCESS ; + + pfn =gfn_to_pfn (kvm, gfn); +if (is_error_noslot_pfn (pfn)) +return -EFAULT ; + +mutex_lock (&kvm->arch.uvmem_lock); +if (kvmppc_gfn_is_uvmem_pfn (gfn, kvm,NULL )) + goto out; + + ret =uv_page_in (kvm->arch.lpid, pfn <<PAGE_SHIFT , gfn <<PAGE_SHIFT , +0 ,PAGE_SHIFT ); +out: +kvm_release_pfn_clean (pfn); +mutex_unlock (&kvm->arch.uvmem_lock); +return (ret ==U_SUCCESS ) ?RESUME_GUEST : -EFAULT ; +} +static u64 kvmppc_get_secmem_size (void ) {struct device_node *np;
Signature · 1 line
2.21.0
PATCH v11 5/7 KVM: PPC: 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. In addition, release all the device pages during unplug.
--- arch/powerpc/include/asm/kvm_book3s_uvmem.h | 6 ++++ arch/powerpc/include/asm/ultravisor-api.h | 1 + arch/powerpc/include/asm/ultravisor.h | 5 +++ arch/powerpc/kvm/book3s_64_mmu_radix.c | 3 ++ arch/powerpc/kvm/book3s_hv.c | 24 +++++++++++++ arch/powerpc/kvm/book3s_hv_uvmem.c | 37 +++++++++++++++++++++ 6 files changed, 76 insertions(+)
arch/powerpc/include/asm/kvm_book3s_uvmem.h +6 -0
@@ -19,6 +19,8 @@ unsigned long kvmppc_h_svm_page_out(struct kvm *kvm,unsigned long kvmppc_h_svm_init_start (struct kvm *kvm);unsigned long kvmppc_h_svm_init_done (struct kvm *kvm);int kvmppc_send_page_to_uv (struct kvm *kvm,unsigned long gfn); +void kvmppc_uvmem_drop_pages (const struct kvm_memory_slot *free, +struct kvm *kvm);#else static inline int kvmppc_uvmem_init (void ) {
@@ -64,5 +66,9 @@ static inline int kvmppc_send_page_to_uv(struct kvm *kvm, unsigned long gfn) {return -EFAULT ; } + +static inline void +kvmppc_uvmem_drop_pages (const struct kvm_memory_slot *free, +struct kvm *kvm) { }#endif /* CONFIG_PPC_UV */ #endif /* __ASM_KVM_BOOK3S_UVMEM_H__ */
arch/powerpc/include/asm/ultravisor-api.h +1 -0
@@ -27,6 +27,7 @@#define UV_RETURN 0xF11C#define UV_ESM 0xF110#define UV_REGISTER_MEM_SLOT 0xF120 +#define UV_UNREGISTER_MEM_SLOT 0xF124#define UV_PAGE_IN 0xF128#define UV_PAGE_OUT 0xF12C#define UV_SHARE_PAGE 0xF130
arch/powerpc/include/asm/ultravisor.h +5 -0
@@ -67,6 +67,11 @@ static inline int uv_register_mem_slot(u64 lpid, u64 start_gpa, u64 size, size, flags, slotid); } +static inline int uv_unregister_mem_slot (u64 lpid,u64 slotid) +{ +return ucall_norets (UV_UNREGISTER_MEM_SLOT , lpid, slotid); +} +static inline int uv_page_inval (u64 lpid,u64 gpa,u64 page_shift) {return ucall_norets (UV_PAGE_INVAL , lpid, gpa, page_shift);
arch/powerpc/kvm/book3s_64_mmu_radix.c +3 -0
@@ -1101,6 +1101,9 @@ void kvmppc_radix_flush_memslot(struct kvm *kvm,unsigned long gpa;unsigned int shift; +if (kvm->arch.secure_guest &KVMPPC_SECURE_INIT_START ) +kvmppc_uvmem_drop_pages (memslot, kvm); +if (kvm->arch.secure_guest &KVMPPC_SECURE_INIT_DONE )return ;
arch/powerpc/kvm/book3s_hv.c +24 -0
@@ -74,6 +74,7 @@#include <asm/hw_breakpoint.h> #include <asm/kvm_host.h> #include <asm/kvm_book3s_uvmem.h> +#include <asm/ultravisor.h> #include "book3s.h"
@@ -4532,6 +4533,29 @@ static void kvmppc_core_commit_memory_region_hv(struct kvm *kvm,if (change ==KVM_MR_FLAGS_ONLY &&kvm_is_radix (kvm) && ((new->flags ^ old->flags) &KVM_MEM_LOG_DIRTY_PAGES ))kvmppc_radix_flush_memslot (kvm, old); +/* +* If UV hasn't yet called H_SVM_INIT_START, don't register memslots. +*/ +if (!kvm->arch.secure_guest) +return ; + +switch (change) { +case KVM_MR_CREATE : +if (kvmppc_uvmem_slot_init (kvm, new)) +return ; +uv_register_mem_slot (kvm->arch.lpid, + new->base_gfn <<PAGE_SHIFT , + new->npages *PAGE_SIZE , +0 , new->id); +break ; +case KVM_MR_DELETE : +uv_unregister_mem_slot (kvm->arch.lpid, old->id); +kvmppc_uvmem_slot_free (kvm, old); +break ; +default : +/* TODO: Handle KVM_MR_MOVE */ +break ; + } }/*
arch/powerpc/kvm/book3s_hv_uvmem.c +37 -0
@@ -250,6 +250,43 @@ unsigned long kvmppc_h_svm_init_done(struct kvm *kvm)return H_SUCCESS ; } +/* +* Drop device pages that we maintain for the secure guest +* +* We first mark the pages to be skipped from UV_PAGE_OUT when there +* is HV side fault on these pages. Next we *get* these pages, forcing +* fault on them, do fault time migration to replace the device PTEs in +* QEMU page table with normal PTEs from newly allocated pages. +*/ +void kvmppc_uvmem_drop_pages (const struct kvm_memory_slot *free, +struct kvm *kvm) +{ +int i; +struct kvmppc_uvmem_page_pvt *pvt; +unsigned long pfn, uvmem_pfn; +unsigned long gfn = free->base_gfn; + +for (i = free->npages; i; --i, ++gfn) { +struct page *uvmem_page; + +mutex_lock (&kvm->arch.uvmem_lock); +if (!kvmppc_gfn_is_uvmem_pfn (gfn, kvm, &uvmem_pfn)) { +mutex_unlock (&kvm->arch.uvmem_lock); +continue ; + } + + uvmem_page =pfn_to_page (uvmem_pfn); + pvt = uvmem_page->zone_device_data; + pvt->skip_page_out = true; +mutex_unlock (&kvm->arch.uvmem_lock); + + pfn =gfn_to_pfn (kvm, gfn); +if (is_error_noslot_pfn (pfn)) +continue ; +kvm_release_pfn_clean (pfn); + } +} +/* * Get a free device PFN from the pool *
Signature · 1 line
2.21.0
PATCH v11 6/7 KVM: PPC: Support reset of secure guest
In reply to Bharata B RaoAdd support for reset of secure guest via a new ioctl KVM_PPC_SVM_OFF. This ioctl will be issued by QEMU during reset and includes the the following steps:
- Release all device pages of the secure guest.
- Ask UV to terminate the guest via UV_SVM_TERMINATE ucall
- Unpin the VPA pages so that they can be migrated back to secure side when guest becomes secure again. This is required because pinned pages can't be migrated.
- Reinit the partition scoped page tables
After these steps, guest is ready to issue UV_ESM call once again to switch to secure mode.
[Implementation of uv_svm_terminate() and its call from guest shutdown path]
--- Documentation/virt/kvm/api.txt | 18 +++++ arch/powerpc/include/asm/kvm_ppc.h | 1 + arch/powerpc/include/asm/ultravisor-api.h | 1 + arch/powerpc/include/asm/ultravisor.h | 5 ++ arch/powerpc/kvm/book3s_hv.c | 90 +++++++++++++++++++++++ arch/powerpc/kvm/powerpc.c | 12 +++ include/uapi/linux/kvm.h | 1 + 7 files changed, 128 insertions(+)
Documentation/virt/kvm/api.txt +18 -0
@@ -4126,6 +4126,24 @@ Valid values for 'action': #define KVM_PMU_EVENT_ALLOW 0 #define KVM_PMU_EVENT_DENY 1 +4.121 KVM_PPC_SVM_OFF + +Capability: basic +Architectures: powerpc +Type: vm ioctl +Parameters: none +Returns: 0 on successful completion, +Errors: + EINVAL: if ultravisor failed to terminate the secure guest + ENOMEM: if hypervisor failed to allocate new radix page tables for guest + +This ioctl is used to turn off the secure mode of the guest or transition +the guest from secure mode to normal mode. This is invoked when the guest +is reset. This has no effect if called for a normal guest. + +This ioctl issues an ultravisor call to terminate the secure guest, +unpins the VPA pages and releases all the device pages that are used to +track the secure pages by hypervisor. 5. The kvm_run structure ------------------------
arch/powerpc/include/asm/kvm_ppc.h +1 -0
@@ -321,6 +321,7 @@ struct kvmppc_ops { int size);int (*store_to_eaddr)(struct kvm_vcpu *vcpu,ulong *eaddr,void *ptr,int size); +int (*svm_off)(struct kvm *kvm); };extern struct kvmppc_ops *kvmppc_hv_ops;
arch/powerpc/include/asm/ultravisor-api.h +1 -0
@@ -34,5 +34,6 @@#define UV_UNSHARE_PAGE 0xF134#define UV_UNSHARE_ALL_PAGES 0xF140#define UV_PAGE_INVAL 0xF138 +#define UV_SVM_TERMINATE 0xF13C#endif /* _ASM_POWERPC_ULTRAVISOR_API_H */
arch/powerpc/include/asm/ultravisor.h +5 -0
@@ -77,4 +77,9 @@ static inline int uv_page_inval(u64 lpid, u64 gpa, u64 page_shift) return ucall_norets(UV_PAGE_INVAL, lpid, gpa, page_shift); } +static inline int uv_svm_terminate (u64 lpid) +{ +return ucall_norets (UV_SVM_TERMINATE , lpid); +} +#endif /* _ASM_POWERPC_ULTRAVISOR_H */
arch/powerpc/kvm/book3s_hv.c +90 -0
108 lines not on this page · raw message
arch/powerpc/kvm/powerpc.c +12 -0
@@ -31,6 +31,8 @@#include <asm/hvcall.h> #include <asm/plpar_wrappers.h> #endif +#include <asm/ultravisor.h> +#include <asm/kvm_host.h> #include "timing.h" #include "irq.h"
@@ -2411,6 +2413,16 @@ long kvm_arch_vm_ioctl(struct file *filp, r = -EFAULT ;break ; } +case KVM_PPC_SVM_OFF : { +struct kvm *kvm = filp->private_data; + + r =0 ; +if (!kvm->arch.kvm_ops->svm_off) + goto out; + + r = kvm->arch.kvm_ops->svm_off (kvm); +break ; + }default : {struct kvm *kvm = filp->private_data; r = kvm->arch.kvm_ops->arch_vm_ioctl (filp, ioctl, arg);
include/uapi/linux/kvm.h +1 -0
@@ -1337,6 +1337,7 @@ struct kvm_s390_ucas_mapping {#define KVM_PPC_GET_CPU_CHAR _IOR(KVMIO, 0xb1, struct kvm_ppc_cpu_char)/* Available with KVM_CAP_PMU_EVENT_FILTER */ #define KVM_SET_PMU_EVENT_FILTER _IOW(KVMIO, 0xb2, struct kvm_pmu_event_filter) +#define KVM_PPC_SVM_OFF _IO(KVMIO, 0xb3)/* ioctl for vm fd */ #define KVM_CREATE_DEVICE _IOWR(KVMIO, 0xe0, struct kvm_create_device)
Signature · 1 line
2.21.0
PATCH v11 7/7 KVM: PPC: Ultravisor: Add PPC_UV config option
In reply to Bharata B RaoFrom: Anshuman Khandual <[email protected]>
CONFIG_PPC_UV adds support for ultravisor.
--- arch/powerpc/Kconfig | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
arch/powerpc/Kconfig +17 -0
@@ -452,6 +452,23 @@ config PPC_TRANSACTIONAL_MEM help Support user-mode Transactional Memory on POWERPC. +config PPC_UV + bool "Ultravisor support" + depends on KVM_BOOK3S_HV_POSSIBLE + select ZONE_DEVICE + select DEV_PAGEMAP_OPS + select DEVICE_PRIVATE + select MEMORY_HOTPLUG + select MEMORY_HOTREMOVE + default n + help + This option paravirtualizes the kernel to run in POWER platforms that + supports the Protected Execution Facility (PEF). On such platforms, + the ultravisor firmware runs at a privilege level above the + hypervisor. + + If unsure, say "N". + config LD_HEAD_STUB_CATCH bool "Reserve 256 bytes to cope with linker stubs in HEAD text" if EXPERT depends on PPC64
Signature · 1 line
2.21.0
Re: [PATCH v11 1/7] mm: ksm: Export ksm_madvise()
In reply to Bharata B RaoQuoted 10 lines · Bharata B Rao
On PEF-enabled POWER platforms that support running of secure guests, secure pages of the guest are represented by device private pages in the host. Such pages needn't participate in KSM merging. This is achieved by using
ksm_madvise()call which need to be exported since KVM PPC can be a kernel module.Signed-off-by Bharata B Rao <[email protected]>Acked-by Paul Mackerras <[email protected]>Cc Andrea Arcangeli <[email protected]>Cc Hugh Dickins <[email protected]>
Just want to point out that I observe a kernel crash when KSM is dealing with device private pages. More details about the crash here:
https://lore.kernel.org/linuxppc-dev/[email protected]/
Regards,
Bharata.
Re: [PATCH v11 1/7] mm: ksm: Export ksm_madvise()
In reply to Bharata B RaoQuoted 10 lines · Bharata B Rao
On PEF-enabled POWER platforms that support running of secure guests, secure pages of the guest are represented by device private pages in the host. Such pages needn't participate in KSM merging. This is achieved by using
ksm_madvise()call which need to be exported since KVM PPC can be a kernel module.Signed-off-by Bharata B Rao <[email protected]>Acked-by Paul Mackerras <[email protected]>Cc Andrea Arcangeli <[email protected]>Cc Hugh Dickins <[email protected]>
I can say
to this one.
But not to your 2/7 which actually makes use of it: because sadly it needs down_write(&kvm->mm->mmap_sem) for the case when it switches off VM_MERGEABLE in vma->vm_flags. That's frustrating, since I think it's the only operation for which down_read() is not good enough.
I have no idea how contended that mmap_sem is likely to be, nor how many to-be-secured pages that vma is likely to contain: you might find it okay simply to go with it down_write throughout, or you might want to start out with it down_read, and only restart with down_write (then perhaps downgrade_write later) when you see VM_MERGEABLE is set.
The crash you got (thanks for the link): that will be because your migrate_vma_pages() had already been applied to a page that was already being shared via KSM.
But if these secure pages are expected to be few and far between, maybe you'd prefer to keep VM_MERGEABLE, and add per-page checks of some kind into mm/ksm.c, to skip over these surprising hybrids.
Hugh
Quoted 18 lines
--- mm/ksm.c | 1 + 1 file changed, 1 insertion(+)mm/ksm.c +1
-0@@ -2478,6 +2478,7 @@ int ksm_madvise(struct vm_area_struct *vma, unsigned long start,return 0 ; } +EXPORT_SYMBOL_GPL (ksm_madvise);int __ksm_enter (struct mm_struct *mm) {Signature · 1 line
2.21.0
Re: [PATCH v11 1/7] mm: ksm: Export ksm_madvise()
Quoted 13 lines · Hugh Dickins
Quoted 10 lines · Bharata B Rao
On PEF-enabled POWER platforms that support running of secure guests, secure pages of the guest are represented by device private pages in the host. Such pages needn't participate in KSM merging. This is achieved by using
ksm_madvise()call which need to be exported since KVM PPC can be a kernel module.Signed-off-by Bharata B Rao <[email protected]>Acked-by Paul Mackerras <[email protected]>Cc Andrea Arcangeli <[email protected]>Cc Hugh Dickins <[email protected]>
Quoted 8 lines
I can say
Acked-by Hugh Dickins <[email protected]>to this one.
But not to your 2/7 which actually makes use of it: because sadly it needs
down_write(&kvm->mm->mmap_sem)for the case when it switches offVM_MERGEABLEinvma->vm_flags. That's frustrating, since I think it's the only operation for whichdown_read()is not good enough.
Oh ok! Thanks for pointing this out.
Quoted 6 lines
I have no idea how contended that
mmap_semis likely to be, nor how many to-be-secured pages that vma is likely to contain: you might find it okay simply to go with itdown_writethroughout, or you might want to start out with itdown_read, and only restart withdown_write(then perhapsdowngrade_writelater) when you seeVM_MERGEABLEis set.
Using down_write throughtout is not easy as we do migrate_vma_pages() from fault path (->migrate_to_ram()) too. Here we come with down_read already held.
Starting with down_read and restarting with down_write if VM_MERGEABLE is set -- this also looks a bit difficult as we will have challenges with locking order if we release mmap_sem in between and re-acquire.
So I think I will start with down_write in this particular case and will downgrade_write as soon as ksm_madvise() is complete.
Quoted 8 lines
The crash you got (thanks for the link): that will be because your
migrate_vma_pages()had already been applied to a page that was already being shared via KSM.But if these secure pages are expected to be few and far between, maybe you'd prefer to keep
VM_MERGEABLE, and add per-page checks of some kind intomm/ksm.c, to skip over these surprising hybrids.
I did bail out from a few routines in mm/ksm.c with is_device_private_page(page) check, but that wasn't good enough and I encountered crashes in different code paths. Guess a bit more understanding of KSM internals would be required before retrying that.
However since all the pages of the guest except for a few will be turned into secure pages early during boot, it appears better if secure guests don't participate in in KSM merging at all.
Regards,
Bharata.
Quoted 5 lines · Bharata B Rao
Hi,
This is the next version of the patchset that adds required support in the KVM hypervisor to run secure guests on PEF-enabled POWER platforms.
Here is a fix for the issue Hugh identified with the usage of ksm_madvise() in this patchset. It applies on top of this patchset.
----
From 8a4d769bf4c61f921c79ce68923be3c403bd5862 Mon Sep 17 00:00:00 2001
From: Bharata B Rao <[email protected]>
Date: Thu, 28 Nov 2019 09:31:54 +0530
Subject: [PATCH 1/1] KVM: PPC: Book3S HV: Take write mmap_sem when calling
ksm_madvise
In order to prevent the device private pages (that correspond to pages of secure guest) from participating in KSM merging, H_SVM_PAGE_IN calls ksm_madvise() under read version of mmap_sem. However ksm_madvise() needs to be under write lock, fix this.
--- arch/powerpc/kvm/book3s_hv_uvmem.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-)
arch/powerpc/kvm/book3s_hv_uvmem.c +20 -9
@@ -46,11 +46,10 @@* * Locking order * -* 1. srcu_read_lock(&kvm->srcu) - Protects KVM memslots -* 2. down_read(&kvm->mm->mmap_sem) - find_vma, migrate_vma_pages and helpers -* 3. mutex_lock(&kvm->arch.uvmem_lock) - protects read/writes to uvmem slots -* thus acting as sync-points -* for page-in/out +* 1. kvm->srcu - Protects KVM memslots +* 2. kvm->mm->mmap_sem - find_vma, migrate_vma_pages and helpers, ksm_madvise +* 3. kvm->arch.uvmem_lock - protects read/writes to uvmem slots thus acting +* as sync-points for page-in/out */ /*
@@ -344,7 +343,7 @@ static struct page *kvmppc_uvmem_get_page(unsigned long gpa, struct kvm *kvm)static int kvmppc_svm_page_in (struct vm_area_struct *vma,unsigned long start,unsigned long end,unsigned long gpa,struct kvm *kvm, -unsigned long page_shift) +unsigned long page_shift,bool *downgrade) {unsigned long src_pfn, dst_pfn =0 ;struct migrate_vma mig;
@@ -360,8 +359,15 @@ kvmppc_svm_page_in(struct vm_area_struct *vma, unsigned long start, mig.src = &src_pfn; mig.dst = &dst_pfn; +/* +* We come here with mmap_sem write lock held just for +* ksm_madvise(), otherwise we only need read mmap_sem. +* Hence downgrade to read lock once ksm_madvise() is done. +*/ ret =ksm_madvise (vma, vma->vm_start, vma->vm_end,MADV_UNMERGEABLE , &vma->vm_flags); +downgrade_write (&kvm->mm->mmap_sem); + *downgrade = true;if (ret)return ret;
@@ -456,6 +462,7 @@ unsigned long kvmppc_h_svm_page_in(struct kvm *kvm, unsigned long gpa, unsigned long flags, unsigned long page_shift) { + bool downgrade = false;unsigned long start, end;struct vm_area_struct *vma;int srcu_idx;
@@ -476,7 +483,7 @@ kvmppc_h_svm_page_in(struct kvm *kvm, unsigned long gpa, ret =H_PARAMETER ; srcu_idx =srcu_read_lock (&kvm->srcu); -down_read (&kvm->mm->mmap_sem); +down_write (&kvm->mm->mmap_sem); start =gfn_to_hva (kvm, gfn);if (kvm_is_error_hva (start))
@@ -492,12 +499,16 @@ kvmppc_h_svm_page_in(struct kvm *kvm, unsigned long gpa,if (!vma || vma->vm_start > start || vma->vm_end < end) goto out_unlock; -if (!kvmppc_svm_page_in (vma, start, end, gpa, kvm, page_shift)) +if (!kvmppc_svm_page_in (vma, start, end, gpa, kvm, page_shift, + &downgrade)) ret =H_SUCCESS ; out_unlock:mutex_unlock (&kvm->arch.uvmem_lock); out: -up_read (&kvm->mm->mmap_sem); +if (downgrade) +up_read (&kvm->mm->mmap_sem); +else +up_write (&kvm->mm->mmap_sem);srcu_read_unlock (&kvm->srcu, srcu_idx);return ret; }
Signature · 1 line
2.21.0
Quoted 9 lines · Bharata B Rao
Quoted 5 lines · Bharata B Rao
Hi,
This is the next version of the patchset that adds required support in the KVM hypervisor to run secure guests on PEF-enabled POWER platforms.
Here is a fix for the issue Hugh identified with the usage of
ksm_madvise()in this patchset. It applies on top of this patchset.
It looks correct to me, and I hope will not spoil your performance in any way that matters. But I have to say, the patch would be so much clearer, if you just named your bool "downgraded" instead of "downgrade".
Hugh
Quoted 101 lines
----
From
8a4d769bf4c61f921c79ce68923be3c403bd5862Mon Sep 17 00:00:00 2001
From: Bharata B Rao <[email protected]>
Date: Thu, 28 Nov 2019 09:31:54 +0530
Subject: [PATCH 1/1] KVM: PPC: Book3S HV: Take writemmap_semwhen calling
ksm_madviseIn order to prevent the device private pages (that correspond to pages of secure guest) from participating in KSM merging,
H_SVM_PAGE_INcallsksm_madvise()under read version ofmmap_sem. Howeverksm_madvise()needs to be under write lock, fix this.Signed-off-by Bharata B Rao <[email protected]>--- arch/powerpc/kvm/book3s_hv_uvmem.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-)arch/powerpc/kvm/book3s_hv_uvmem.c +20
-9@@ -46,11 +46,10 @@* * Locking order * -* 1. srcu_read_lock(&kvm->srcu) - Protects KVM memslots -* 2. down_read(&kvm->mm->mmap_sem) - find_vma, migrate_vma_pages and helpers -* 3. mutex_lock(&kvm->arch.uvmem_lock) - protects read/writes to uvmem slots -* thus acting as sync-points -* for page-in/out +* 1. kvm->srcu - Protects KVM memslots +* 2. kvm->mm->mmap_sem - find_vma, migrate_vma_pages and helpers, ksm_madvise +* 3. kvm->arch.uvmem_lock - protects read/writes to uvmem slots thus acting +* as sync-points for page-in/out */ /* @@ -344,7 +343,7 @@ static struct page *kvmppc_uvmem_get_page(unsigned long gpa, struct kvm *kvm)static int kvmppc_svm_page_in (struct vm_area_struct *vma,unsigned long start,unsigned long end,unsigned long gpa,struct kvm *kvm, -unsigned long page_shift) +unsigned long page_shift,bool *downgrade) {unsigned long src_pfn, dst_pfn =0 ;struct migrate_vma mig;@@ -360,8 +359,15 @@ kvmppc_svm_page_in(struct vm_area_struct *vma, unsigned long start, mig.src = &src_pfn; mig.dst = &dst_pfn; +/* +* We come here with mmap_sem write lock held just for +* ksm_madvise(), otherwise we only need read mmap_sem. +* Hence downgrade to read lock once ksm_madvise() is done. +*/ ret =ksm_madvise (vma, vma->vm_start, vma->vm_end,MADV_UNMERGEABLE , &vma->vm_flags); +downgrade_write (&kvm->mm->mmap_sem); + *downgrade = true;if (ret)return ret;@@ -456,6 +462,7 @@ unsigned long kvmppc_h_svm_page_in(struct kvm *kvm, unsigned long gpa, unsigned long flags, unsigned long page_shift) { + bool downgrade = false;unsigned long start, end;struct vm_area_struct *vma;int srcu_idx;@@ -476,7 +483,7 @@ kvmppc_h_svm_page_in(struct kvm *kvm, unsigned long gpa, ret =H_PARAMETER ; srcu_idx =srcu_read_lock (&kvm->srcu); -down_read (&kvm->mm->mmap_sem); +down_write (&kvm->mm->mmap_sem); start =gfn_to_hva (kvm, gfn);if (kvm_is_error_hva (start))@@ -492,12 +499,16 @@ kvmppc_h_svm_page_in(struct kvm *kvm, unsigned long gpa,if (!vma || vma->vm_start > start || vma->vm_end < end) goto out_unlock; -if (!kvmppc_svm_page_in (vma, start, end, gpa, kvm, page_shift)) +if (!kvmppc_svm_page_in (vma, start, end, gpa, kvm, page_shift, + &downgrade)) ret =H_SUCCESS ; out_unlock:mutex_unlock (&kvm->arch.uvmem_lock); out: -up_read (&kvm->mm->mmap_sem); +if (downgrade) +up_read (&kvm->mm->mmap_sem); +else +up_write (&kvm->mm->mmap_sem);srcu_read_unlock (&kvm->srcu, srcu_idx);return ret; }Signature · 1 line
2.21.0
Quoted 8 lines · Hugh Dickins
Quoted 7 lines · Bharata B Rao
Quoted 5 lines · Bharata B Rao
Hi,
This is the next version of the patchset that adds required support in the KVM hypervisor to run secure guests on PEF-enabled POWER platforms.
Quoted 6 lines
Quoted 2 lines
Here is a fix for the issue Hugh identified with the usage of
ksm_madvise()in this patchset. It applies on top of this patchset.It looks correct to me, and I hope will not spoil your performance in any way that matters. But I have to say, the patch would be so much clearer, if you just named your bool "downgraded" instead of "downgrade".
Thanks for confirming. Yes "downgraded" would have been more appropriate, will probably change it when we do any next change in this part of the code.
Regards,
Bharata.