KVM: PPC: Add skip_page_out parameter
Subsystems (4)
PATCH v4 1/2 KVM: PPC: Add skip_page_out parameter
Add 'skip_page_out' parameter to kvmppc_uvmem_drop_pages() so the callers can specify whetheter or not to skip paging out pages. This will be needed in a follow-on patch that implements H_SVM_INIT_ABORT hcall
--- arch/powerpc/include/asm/kvm_book3s_uvmem.h | 4 ++-- arch/powerpc/kvm/book3s_64_mmu_radix.c | 2 +- arch/powerpc/kvm/book3s_hv.c | 2 +- arch/powerpc/kvm/book3s_hv_uvmem.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)
arch/powerpc/include/asm/kvm_book3s_uvmem.h +2 -2
@@ -20,7 +20,7 @@ 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); +struct kvm *kvm,bool skip_page_out);#else static inline int kvmppc_uvmem_init (void ) {
@@ -69,6 +69,6 @@ static inline int kvmppc_send_page_to_uv(struct kvm *kvm, unsigned long gfn)static inline void kvmppc_uvmem_drop_pages (const struct kvm_memory_slot *free, -struct kvm *kvm) { } +struct kvm *kvm,bool skip_page_out) { }#endif /* CONFIG_PPC_UV */ #endif /* __ASM_KVM_BOOK3S_UVMEM_H__ */
arch/powerpc/kvm/book3s_64_mmu_radix.c +1 -1
@@ -1102,7 +1102,7 @@ void kvmppc_radix_flush_memslot(struct kvm *kvm,unsigned int shift;if (kvm->arch.secure_guest &KVMPPC_SECURE_INIT_START ) -kvmppc_uvmem_drop_pages (memslot, kvm); +kvmppc_uvmem_drop_pages (memslot, kvm, true);if (kvm->arch.secure_guest &KVMPPC_SECURE_INIT_DONE )return ;
arch/powerpc/kvm/book3s_hv.c +1 -1
@@ -5493,7 +5493,7 @@ static int kvmhv_svm_off(struct kvm *kvm)continue ;kvm_for_each_memslot (memslot, slots) { -kvmppc_uvmem_drop_pages (memslot, kvm); +kvmppc_uvmem_drop_pages (memslot, kvm, true);uv_unregister_mem_slot (kvm->arch.lpid, memslot->id); } }
arch/powerpc/kvm/book3s_hv_uvmem.c +2 -2
@@ -259,7 +259,7 @@ unsigned long kvmppc_h_svm_init_done(struct kvm *kvm)* QEMU page table with normal PTEs from newly allocated pages. */ void kvmppc_uvmem_drop_pages (const struct kvm_memory_slot *free, -struct kvm *kvm) +struct kvm *kvm,bool skip_page_out) {int i;struct kvmppc_uvmem_page_pvt *pvt;
@@ -277,7 +277,7 @@ void kvmppc_uvmem_drop_pages(const struct kvm_memory_slot *free, uvmem_page =pfn_to_page (uvmem_pfn); pvt = uvmem_page->zone_device_data; - pvt->skip_page_out = true; + pvt->skip_page_out = skip_page_out;mutex_unlock (&kvm->arch.uvmem_lock); pfn =gfn_to_pfn (kvm, gfn);
Signature · 1 line
2.17.2
PATCH v4 2/2 KVM: PPC: Implement H_SVM_INIT_ABORT hcall
Implement the H_SVM_INIT_ABORT hcall which the Ultravisor can use to abort an SVM after it has issued the H_SVM_INIT_START and before the H_SVM_INIT_DONE hcalls. This hcall could be used when Ultravisor encounters security violations or other errors when starting an SVM.
Note that this hcall is different from UV_SVM_TERMINATE ucall which is used by HV to terminate/cleanup an VM that has becore secure.
The H_SVM_INIT_ABORT should basically undo operations that were done since the H_SVM_INIT_START hcall - i.e page-out all the VM pages back to normal memory, and terminate the SVM.
(If we do not bring the pages back to normal memory, the text/data of the VM would be stuck in secure memory and since the SVM did not go secure, its MSR_S bit will be clear and the VM wont be able to access its pages even to do a clean exit).
Based on patches and discussion with Paul Mackerras, Ram Pai and Bharata Rao.
---
Changelog[v4]:
- [Bharata Rao] Add missing rcu locking
- [Paul Mackerras] simplify code that walks memslots
- Add a check to ensure that H_SVM_INIT_ABORT is called before H_SVM_INIT_DONE hcall (i.e the SVM is not already secure).
Changelog[v3]:
- Rather than pass the NIP/MSR as parameters, load them into SRR0/SRR1 (like we do with other registers) and terminate the VM after paging out pages
- Move the code to add a skip_page_out parameter into a separate patch.
Changelog[v2]:
[Paul Mackerras] avoid returning to UV "one last time" after the state is cleaned up. So, we now have H_SVM_INIT_ABORT:
- take the VM's NIP/MSR register states as parameters
- inherit the state of other registers as at UV_ESM call. After cleaning up the partial state, HV uses these to return directly to the VM with a failed UV_ESM call.
--- Documentation/powerpc/ultravisor.rst | 57 +++++++++++++++++++++ arch/powerpc/include/asm/hvcall.h | 1 + arch/powerpc/include/asm/kvm_book3s_uvmem.h | 6 +++ arch/powerpc/include/asm/kvm_host.h | 1 + arch/powerpc/kvm/book3s_hv.c | 3 ++ arch/powerpc/kvm/book3s_hv_uvmem.c | 26 ++++++++++ 6 files changed, 94 insertions(+)
Documentation/powerpc/ultravisor.rst +57 -0
@@ -948,6 +948,63 @@ Use cases up its internal state for this virtual machine. +H_SVM_INIT_ABORT +---------------- + + Abort the process of securing an SVM. + +Syntax +~~~~~~ + +.. code-block:: c + + uint64_t hypercall(const uint64_t H_SVM_INIT_ABORT) + +Return values +~~~~~~~~~~~~~ + + One of the following values: + + * H_PARAMETER on successfully cleaning up the state, + Hypervisor will return this value to the + **guest**, to indicate that the underlying + UV_ESM ultracall failed. + + * H_UNSUPPORTED if called from the wrong context (e.g. from + an SVM or before an H_SVM_INIT_START hypercall). + +Description +~~~~~~~~~~~ + + Abort the process of securing a virtual machine. This call must + be made after a prior call to ``H_SVM_INIT_START`` hypercall and + before a call to ``H_SVM_INIT_DONE``. + + On entry into this hypercall the non-volatile GPRs and FPRs are + expected to contain the values they had at the time the VM issued + the UV_ESM ultracall. Further ``SRR0`` is expected to contain the + address of the instruction after the ``UV_ESM`` ultracall and ``SRR1`` + the MSR value with which to return to the VM. + + This hypercall will cleanup any partial state that was established for + the VM since the prior ``H_SVM_INIT_START`` hypercall, including paging + out pages that were paged-into secure memory, and issue the + ``UV_SVM_TERMINATE`` ultracall to terminate the VM. + + After the partial state is cleaned up, control returns to the VM + (**not Ultravisor**), at the address specified in ``SRR0`` with the + MSR values set to the value in ``SRR1``. + +Use cases +~~~~~~~~~ + + If after a successful call to ``H_SVM_INIT_START``, the Ultravisor + encounters an error while securing a virtual machine, either due + to lack of resources or because the VM's security information could + not be validated, Ultravisor informs the Hypervisor about it. + Hypervisor should use this call to clean up any internal state for + this virtual machine and return to the VM. + H_SVM_PAGE_IN -------------
arch/powerpc/include/asm/hvcall.h +1 -0
@@ -350,6 +350,7 @@#define H_SVM_PAGE_OUT 0xEF04#define H_SVM_INIT_START 0xEF08#define H_SVM_INIT_DONE 0xEF0C +#define H_SVM_INIT_ABORT 0xEF14/* Values for 2nd argument to H_SET_MODE */ #define H_SET_MODE_RESOURCE_SET_CIABR 1
arch/powerpc/include/asm/kvm_book3s_uvmem.h +6 -0
@@ -19,6 +19,7 @@ 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); +unsigned long kvmppc_h_svm_init_abort (struct kvm *kvm);void kvmppc_uvmem_drop_pages (const struct kvm_memory_slot *free,struct kvm *kvm,bool skip_page_out);#else
@@ -62,6 +63,11 @@ static inline unsigned long kvmppc_h_svm_init_done(struct kvm *kvm)return H_UNSUPPORTED ; } +static inline unsigned long kvmppc_h_svm_init_abort (struct kvm *kvm) +{ +return H_UNSUPPORTED ; +} +static inline int kvmppc_send_page_to_uv (struct kvm *kvm,unsigned long gfn) {return -EFAULT ;
arch/powerpc/include/asm/kvm_host.h +1 -0
@@ -278,6 +278,7 @@ 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 */ +#define KVMPPC_SECURE_INIT_ABORT 0x4/* H_SVM_INIT_ABORT issued */ struct kvm_arch {unsigned int lpid;
arch/powerpc/kvm/book3s_hv.c +3 -0
@@ -1099,6 +1099,9 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)case H_SVM_INIT_DONE : ret =kvmppc_h_svm_init_done (vcpu->kvm);break ; +case H_SVM_INIT_ABORT : + ret =kvmppc_h_svm_init_abort (vcpu->kvm); +break ;default :return RESUME_HOST ;
arch/powerpc/kvm/book3s_hv_uvmem.c +26 -0
@@ -287,6 +287,32 @@ void kvmppc_uvmem_drop_pages(const struct kvm_memory_slot *free, } } +unsigned long kvmppc_h_svm_init_abort (struct kvm *kvm) +{ +int srcu_idx; +struct kvm_memory_slot *memslot; + +/* +* Expect to be called only after INIT_START and before INIT_DONE. +* If INIT_DONE was completed, use normal VM termination sequence. +*/ +if (!(kvm->arch.secure_guest &KVMPPC_SECURE_INIT_START ) || + (kvm->arch.secure_guest &KVMPPC_SECURE_INIT_DONE )) +return H_UNSUPPORTED ; + + srcu_idx =srcu_read_lock (&kvm->srcu); + +kvm_for_each_memslot (memslot,kvm_memslots (kvm)) +kvmppc_uvmem_drop_pages (memslot, kvm, false); + +srcu_read_unlock (&kvm->srcu, srcu_idx); + + kvm->arch.secure_guest =0 ; +uv_svm_terminate (kvm->arch.lpid); + +return H_PARAMETER ; +} +/* * Get a free device PFN from the pool *
Signature · 1 line
2.17.2
Re: [PATCH v4 2/2] KVM: PPC: Implement H_SVM_INIT_ABORT hcall
Quoted 5 lines · Sukadev Bhattiprolu
Implement the
H_SVM_INIT_ABORThcall which the Ultravisor can use to abort an SVM after it has issued theH_SVM_INIT_STARTand before theH_SVM_INIT_DONEhcalls. This hcall could be used when Ultravisor encounters security violations or other errors when starting an SVM.
..snip..
arch/powerpc/kvm/book3s_hv_uvmem.c void kvmppc_uvmem_drop_pages(const struct kvm_memory_slot *free, · line 301
Quoted 12 lines
arch/powerpc/kvm/book3s_hv_uvmem.c +12
-0+unsigned long kvmppc_h_svm_init_abort (struct kvm *kvm) +{ +int srcu_idx; +struct kvm_memory_slot *memslot; + +/* +* Expect to be called only after INIT_START and before INIT_DONE. +* If INIT_DONE was completed, use normal VM termination sequence. +*/ +if (!(kvm->arch.secure_guest &KVMPPC_SECURE_INIT_START ) || + (kvm->arch.secure_guest &KVMPPC_SECURE_INIT_DONE )) +return H_UNSUPPORTED ;
Ah.. this version has already incorporated my prior comment! I should have reviewed your v4 version first.
One small comment.. H_STATE is a better return code than H_UNSUPPORTED.
RP
Re: [PATCH v4 2/2] KVM: PPC: Implement H_SVM_INIT_ABORT hcall
Quoted 3 lines · Ram Pai [[email protected]] wrote:
One small comment..
H_STATEis a better return code thanH_UNSUPPORTED.
Here is the updated patch - we now return H_STATE if the abort call is made after the VM has gone secure.
---
From 73fe1fa5aff2829f2fae6a339169e56dc0bbae06 Mon Sep 17 00:00:00 2001
From: Sukadev Bhattiprolu <[email protected]>
Date: Fri, 27 Sep 2019 14:30:36 -0500
Subject: [PATCH 2/2] KVM: PPC: Implement H_SVM_INIT_ABORT hcall
Implement the H_SVM_INIT_ABORT hcall which the Ultravisor can use to abort an SVM after it has issued the H_SVM_INIT_START and before the H_SVM_INIT_DONE hcalls. This hcall could be used when Ultravisor encounters security violations or other errors when starting an SVM.
Note that this hcall is different from UV_SVM_TERMINATE ucall which is used by HV to terminate/cleanup an VM that has becore secure.
The H_SVM_INIT_ABORT should basically undo operations that were done since the H_SVM_INIT_START hcall - i.e page-out all the VM pages back to normal memory, and terminate the SVM.
(If we do not bring the pages back to normal memory, the text/data of the VM would be stuck in secure memory and since the SVM did not go secure, its MSR_S bit will be clear and the VM wont be able to access its pages even to do a clean exit).
Based on patches and discussion with Paul Mackerras, Ram Pai and Bharata Rao.
---
Changelog[v4]:
- [Bharata Rao] Add missing rcu locking
- [Paul Mackerras] simplify code that walks memslots
- Add a check to ensure that H_SVM_INIT_ABORT is called before H_SVM_INIT_DONE hcall (i.e the SVM is not already secure).
- [Ram Pai] Return H_STATE if hcall is called after *INIT_DONE.
Changelog[v3]:
- Rather than pass the NIP/MSR as parameters, load them into SRR0/SRR1 (like we do with other registers) and terminate the VM after paging out pages
- Move the code to add a skip_page_out parameter into a separate patch.
Changelog[v2]:
[Paul Mackerras] avoid returning to UV "one last time" after the state is cleaned up. So, we now have H_SVM_INIT_ABORT:
- take the VM's NIP/MSR register states as parameters
- inherit the state of other registers as at UV_ESM call. After cleaning up the partial state, HV uses these to return directly to the VM with a failed UV_ESM call.
--- Documentation/powerpc/ultravisor.rst | 60 +++++++++++++++++++++ arch/powerpc/include/asm/hvcall.h | 1 + arch/powerpc/include/asm/kvm_book3s_uvmem.h | 6 +++ arch/powerpc/include/asm/kvm_host.h | 1 + arch/powerpc/kvm/book3s_hv.c | 3 ++ arch/powerpc/kvm/book3s_hv_uvmem.c | 28 ++++++++++ 6 files changed, 99 insertions(+)
Documentation/powerpc/ultravisor.rst +60 -0
@@ -948,6 +948,66 @@ Use cases up its internal state for this virtual machine. +H_SVM_INIT_ABORT +---------------- + + Abort the process of securing an SVM. + +Syntax +~~~~~~ + +.. code-block:: c + + uint64_t hypercall(const uint64_t H_SVM_INIT_ABORT) + +Return values +~~~~~~~~~~~~~ + + One of the following values: + + * H_PARAMETER on successfully cleaning up the state, + Hypervisor will return this value to the + **guest**, to indicate that the underlying + UV_ESM ultracall failed. + + * H_STATE if called after a VM has gone secure (i.e + H_SVM_INIT_DONE hypercall was successful). + + * H_UNSUPPORTED if called from a wrong context (e.g. from a + normal VM). + +Description +~~~~~~~~~~~ + + Abort the process of securing a virtual machine. This call must + be made after a prior call to ``H_SVM_INIT_START`` hypercall and + before a call to ``H_SVM_INIT_DONE``. + + On entry into this hypercall the non-volatile GPRs and FPRs are + expected to contain the values they had at the time the VM issued + the UV_ESM ultracall. Further ``SRR0`` is expected to contain the + address of the instruction after the ``UV_ESM`` ultracall and ``SRR1`` + the MSR value with which to return to the VM. + + This hypercall will cleanup any partial state that was established for + the VM since the prior ``H_SVM_INIT_START`` hypercall, including paging + out pages that were paged-into secure memory, and issue the + ``UV_SVM_TERMINATE`` ultracall to terminate the VM. + + After the partial state is cleaned up, control returns to the VM + (**not Ultravisor**), at the address specified in ``SRR0`` with the + MSR values set to the value in ``SRR1``. + +Use cases +~~~~~~~~~ + + If after a successful call to ``H_SVM_INIT_START``, the Ultravisor + encounters an error while securing a virtual machine, either due + to lack of resources or because the VM's security information could + not be validated, Ultravisor informs the Hypervisor about it. + Hypervisor should use this call to clean up any internal state for + this virtual machine and return to the VM. + H_SVM_PAGE_IN -------------
arch/powerpc/include/asm/hvcall.h +1 -0
@@ -350,6 +350,7 @@#define H_SVM_PAGE_OUT 0xEF04#define H_SVM_INIT_START 0xEF08#define H_SVM_INIT_DONE 0xEF0C +#define H_SVM_INIT_ABORT 0xEF14/* Values for 2nd argument to H_SET_MODE */ #define H_SET_MODE_RESOURCE_SET_CIABR 1
arch/powerpc/include/asm/kvm_book3s_uvmem.h +6 -0
@@ -19,6 +19,7 @@ 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); +unsigned long kvmppc_h_svm_init_abort (struct kvm *kvm);void kvmppc_uvmem_drop_pages (const struct kvm_memory_slot *free,struct kvm *kvm,bool skip_page_out);#else
@@ -62,6 +63,11 @@ static inline unsigned long kvmppc_h_svm_init_done(struct kvm *kvm)return H_UNSUPPORTED ; } +static inline unsigned long kvmppc_h_svm_init_abort (struct kvm *kvm) +{ +return H_UNSUPPORTED ; +} +static inline int kvmppc_send_page_to_uv (struct kvm *kvm,unsigned long gfn) {return -EFAULT ;
arch/powerpc/include/asm/kvm_host.h +1 -0
@@ -278,6 +278,7 @@ 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 */ +#define KVMPPC_SECURE_INIT_ABORT 0x4/* H_SVM_INIT_ABORT issued */ struct kvm_arch {unsigned int lpid;
arch/powerpc/kvm/book3s_hv.c +3 -0
@@ -1099,6 +1099,9 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)case H_SVM_INIT_DONE : ret =kvmppc_h_svm_init_done (vcpu->kvm);break ; +case H_SVM_INIT_ABORT : + ret =kvmppc_h_svm_init_abort (vcpu->kvm); +break ;default :return RESUME_HOST ;
arch/powerpc/kvm/book3s_hv_uvmem.c +28 -0
@@ -287,6 +287,34 @@ void kvmppc_uvmem_drop_pages(const struct kvm_memory_slot *free, } } +unsigned long kvmppc_h_svm_init_abort (struct kvm *kvm) +{ +int srcu_idx; +struct kvm_memory_slot *memslot; + +/* +* Expect to be called only after INIT_START and before INIT_DONE. +* If INIT_DONE was completed, use normal VM termination sequence. +*/ +if (!(kvm->arch.secure_guest &KVMPPC_SECURE_INIT_START )) +return H_UNSUPPORTED ; + +if (kvm->arch.secure_guest &KVMPPC_SECURE_INIT_DONE ) +return H_STATE ; + + srcu_idx =srcu_read_lock (&kvm->srcu); + +kvm_for_each_memslot (memslot,kvm_memslots (kvm)) +kvmppc_uvmem_drop_pages (memslot, kvm, false); + +srcu_read_unlock (&kvm->srcu, srcu_idx); + + kvm->arch.secure_guest =0 ; +uv_svm_terminate (kvm->arch.lpid); + +return H_PARAMETER ; +} +/* * Get a free device PFN from the pool *
Signature · 1 line
2.17.2
Ram Pai
Reviewed-byRe: [PATCH v4 2/2] KVM: PPC: Implement H_SVM_INIT_ABORT hcall
Quoted 5 lines · Sukadev Bhattiprolu
Quoted 3 lines · Ram Pai [[email protected]] wrote:
One small comment..
H_STATEis a better return code thanH_UNSUPPORTED.
Quoted 7 lines
Here is the updated patch - we now return
H_STATEif the abort call is made after the VM has gone secure.
---Quoted 1 line
From
73fe1fa5aff2829f2fae6a339169e56dc0bbae06Mon Sep 17 00:00:00 2001From: Sukadev Bhattiprolu <[email protected]>
Date: Fri, 27 Sep 2019 14:30:36 -0500
Subject: [PATCH 2/2] KVM: PPC: ImplementH_SVM_INIT_ABORThcall
This patch looks good.
Thanks,
RP