Merge tag 'kvm-ppc-next-5.6-2' of... (1d5920c3) · Commits · 戴 / test

Documentation/powerpc/ultravisor.rst

+60 −0

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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

+8 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,9 @@ 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);
		struct kvm *kvm, bool skip_page_out);
		#else
		static inline int kvmppc_uvmem_init(void)
		{
		@@ -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;
		@@ -69,6 +75,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/include/asm/kvm_host.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -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_64_mmu_hv.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -284,7 +284,7 @@ static long kvmppc_virtmode_do_h_enter(struct kvm *kvm, unsigned long flags,
		/* Protect linux PTE lookup from page table destruction */
		rcu_read_lock_sched(); /* this disables preemption too */
		ret = kvmppc_do_h_enter(kvm, flags, pte_index, pteh, ptel,
		current->mm->pgd, false, pte_idx_ret);
		kvm->mm->pgd, false, pte_idx_ret);
		rcu_read_unlock_sched();
		if (ret == H_TOO_HARD) {
		/* this can't happen */
		@@ -573,7 +573,7 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run run, struct kvm_vcpu vcpu,
		is_ci = false;
		pfn = 0;
		page = NULL;
		mm = current->mm;
		mm = kvm->mm;
		pte_size = PAGE_SIZE;
		writing = (dsisr & DSISR_ISSTORE) != 0;
		/* If writing != 0, then the HPTE must allow writing, if we get here */

Admin message