Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 834354f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM fixes from Radim Krčmář:
 "PPC:
   - Fix bug which could leave locks held in the host on return to a
     guest.

  x86:
   - Prevent infinitely looping emulation of a failing syscall while
     single stepping.

   - Do not crash the host when nesting is disabled"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: Don't update RIP or do single-step on faulting emulation
  KVM: x86: hyper-v: don't crash on KVM_GET_SUPPORTED_HV_CPUID when kvm_intel.nested is disabled
  KVM: PPC: Book3S: Fix incorrect guest-to-user-translation error handling
parents 31bb5feb 75ee23b3

arch/powerpc/kvm/book3s_64_vio.c

+4 −2
Original line number Diff line number Diff line
@@ -660,8 +660,10 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu, 
		}

		tce = be64_to_cpu(tce);



		if (kvmppc_tce_to_ua(vcpu->kvm, tce, &ua))

			return H_PARAMETER;

		if (kvmppc_tce_to_ua(vcpu->kvm, tce, &ua)) {

			ret = H_PARAMETER;

			goto unlock_exit;

		}



		list_for_each_entry_lockless(stit, &stt->iommu_tables, next) {

			ret = kvmppc_tce_iommu_map(vcpu->kvm, stt,

arch/powerpc/kvm/book3s_64_vio_hv.c

+4 −2
Original line number Diff line number Diff line
@@ -556,8 +556,10 @@ long kvmppc_rm_h_put_tce_indirect(struct kvm_vcpu *vcpu, 
		unsigned long tce = be64_to_cpu(((u64 *)tces)[i]);



		ua = 0;

		if (kvmppc_rm_tce_to_ua(vcpu->kvm, tce, &ua, NULL))

			return H_PARAMETER;

		if (kvmppc_rm_tce_to_ua(vcpu->kvm, tce, &ua, NULL)) {

			ret = H_PARAMETER;

			goto unlock_exit;

		}



		list_for_each_entry_lockless(stit, &stt->iommu_tables, next) {

			ret = kvmppc_rm_tce_iommu_map(vcpu->kvm, stt,

arch/x86/kvm/hyperv.c

+4 −1
Original line number Diff line number Diff line
@@ -1781,7 +1781,7 @@ int kvm_vm_ioctl_hv_eventfd(struct kvm *kvm, struct kvm_hyperv_eventfd *args) 
int kvm_vcpu_ioctl_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid,

				struct kvm_cpuid_entry2 __user *entries)

{

	uint16_t evmcs_ver = kvm_x86_ops->nested_get_evmcs_version(vcpu);

	uint16_t evmcs_ver = 0;

	struct kvm_cpuid_entry2 cpuid_entries[] = {

		{ .function = HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS },

		{ .function = HYPERV_CPUID_INTERFACE },
@@ -1793,6 +1793,9 @@ int kvm_vcpu_ioctl_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, 
	};

	int i, nent = ARRAY_SIZE(cpuid_entries);



	if (kvm_x86_ops->nested_get_evmcs_version)

		evmcs_ver = kvm_x86_ops->nested_get_evmcs_version(vcpu);



	/* Skip NESTED_FEATURES if eVMCS is not supported */

	if (!evmcs_ver)

		--nent;

arch/x86/kvm/svm.c

+1 −7
Original line number Diff line number Diff line
@@ -7128,12 +7128,6 @@ static int svm_unregister_enc_region(struct kvm *kvm, 
	return ret;

}



static uint16_t nested_get_evmcs_version(struct kvm_vcpu *vcpu)

{

	/* Not supported */

	return 0;

}



static int nested_enable_evmcs(struct kvm_vcpu *vcpu,

				   uint16_t *vmcs_version)

{
@@ -7332,7 +7326,7 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = { 
	.mem_enc_unreg_region = svm_unregister_enc_region,



	.nested_enable_evmcs = nested_enable_evmcs,

	.nested_get_evmcs_version = nested_get_evmcs_version,

	.nested_get_evmcs_version = NULL,



	.need_emulation_on_page_fault = svm_need_emulation_on_page_fault,

};

arch/x86/kvm/vmx/vmx.c

+1 −0
Original line number Diff line number Diff line
@@ -7797,6 +7797,7 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = { 
	.set_nested_state = NULL,

	.get_vmcs12_pages = NULL,

	.nested_enable_evmcs = NULL,

	.nested_get_evmcs_version = NULL,

	.need_emulation_on_page_fault = vmx_need_emulation_on_page_fault,

};