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

Commit c91ff721 authored by Radim Krčmář's avatar Radim Krčmář
Browse files

Merge tag 'kvm-ppc-fixes-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

KVM/PPC fix for 5.3

- Fix bug which could leave locks locked in the host on return
  to a guest.
parents a55aa89a ddfd151f

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,