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

Commit 78671ab4 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-ppc-fixes-5.1-1' of... 

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

KVM/PPC fixes for 5.1

- Fix host hang in the HTM assist code for POWER9
- Take srcu read lock around memslot lookup
parents 7a223e06 345077c8

arch/powerpc/kvm/book3s_64_vio.c

+3 −3
Original line number Diff line number Diff line
@@ -543,14 +543,14 @@ long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn, 
	if (ret != H_SUCCESS)

		return ret;



	idx = srcu_read_lock(&vcpu->kvm->srcu);



	ret = kvmppc_tce_validate(stt, tce);

	if (ret != H_SUCCESS)

		return ret;

		goto unlock_exit;



	dir = iommu_tce_direction(tce);



	idx = srcu_read_lock(&vcpu->kvm->srcu);



	if ((dir != DMA_NONE) && kvmppc_tce_to_ua(vcpu->kvm, tce, &ua, NULL)) {

		ret = H_PARAMETER;

		goto unlock_exit;

arch/powerpc/kvm/book3s_hv.c

+3 −1
Original line number Diff line number Diff line
@@ -3423,7 +3423,9 @@ static int kvmhv_load_hv_regs_and_go(struct kvm_vcpu *vcpu, u64 time_limit, 
	vcpu->arch.shregs.sprg2 = mfspr(SPRN_SPRG2);

	vcpu->arch.shregs.sprg3 = mfspr(SPRN_SPRG3);



	mtspr(SPRN_PSSCR, host_psscr);

	/* Preserve PSSCR[FAKE_SUSPEND] until we've called kvmppc_save_tm_hv */

	mtspr(SPRN_PSSCR, host_psscr |

	      (local_paca->kvm_hstate.fake_suspend << PSSCR_FAKE_SUSPEND_LG));

	mtspr(SPRN_HFSCR, host_hfscr);

	mtspr(SPRN_CIABR, host_ciabr);

	mtspr(SPRN_DAWR, host_dawr);