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

Commit 27bfc6cf authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Marcelo Tosatti
Browse files

Merge tag 'signed-for-4.0' of git://github.com/agraf/linux-2.6 

Patch queue for 4.0 - 2015-03-25

A few bug fixes for Book3S HV KVM:

  - Fix spinlock ordering
  - Fix idle guests on LE hosts
  - Fix instruction emulation
parents c875f421 2bf27601

arch/powerpc/kvm/book3s_hv.c

+4 −4
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ static int kvmppc_get_yield_count(struct kvm_vcpu *vcpu) 
	spin_lock(&vcpu->arch.vpa_update_lock);

	lppaca = (struct lppaca *)vcpu->arch.vpa.pinned_addr;

	if (lppaca)

		yield_count = lppaca->yield_count;

		yield_count = be32_to_cpu(lppaca->yield_count);

	spin_unlock(&vcpu->arch.vpa_update_lock);

	return yield_count;

}
@@ -942,20 +942,20 @@ static int kvm_arch_vcpu_ioctl_set_sregs_hv(struct kvm_vcpu *vcpu, 
static void kvmppc_set_lpcr(struct kvm_vcpu *vcpu, u64 new_lpcr,

		bool preserve_top32)

{

	struct kvm *kvm = vcpu->kvm;

	struct kvmppc_vcore *vc = vcpu->arch.vcore;

	u64 mask;



	mutex_lock(&kvm->lock);

	spin_lock(&vc->lock);

	/*

	 * If ILE (interrupt little-endian) has changed, update the

	 * MSR_LE bit in the intr_msr for each vcpu in this vcore.

	 */

	if ((new_lpcr & LPCR_ILE) != (vc->lpcr & LPCR_ILE)) {

		struct kvm *kvm = vcpu->kvm;

		struct kvm_vcpu *vcpu;

		int i;



		mutex_lock(&kvm->lock);

		kvm_for_each_vcpu(i, vcpu, kvm) {

			if (vcpu->arch.vcore != vc)

				continue;
@@ -964,7 +964,6 @@ static void kvmppc_set_lpcr(struct kvm_vcpu *vcpu, u64 new_lpcr, 
			else

				vcpu->arch.intr_msr &= ~MSR_LE;

		}

		mutex_unlock(&kvm->lock);

	}



	/*
@@ -981,6 +980,7 @@ static void kvmppc_set_lpcr(struct kvm_vcpu *vcpu, u64 new_lpcr, 
		mask &= 0xFFFFFFFF;

	vc->lpcr = (vc->lpcr & ~mask) | (new_lpcr & mask);

	spin_unlock(&vc->lock);

	mutex_unlock(&kvm->lock);

}



static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,

arch/powerpc/kvm/book3s_hv_rmhandlers.S

+1 −0
Original line number Diff line number Diff line
@@ -1005,6 +1005,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR) 
	/* Save HEIR (HV emulation assist reg) in emul_inst

	   if this is an HEI (HV emulation interrupt, e40) */

	li	r3,KVM_INST_FETCH_FAILED

	stw	r3,VCPU_LAST_INST(r9)

	cmpwi	r12,BOOK3S_INTERRUPT_H_EMUL_ASSIST

	bne	11f

	mfspr	r3,SPRN_HEIR