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

Commit 5f1c248f authored by Scott Wood's avatar Scott Wood Committed by Alexander Graf
Browse files

kvm/ppc: Call trace_hardirqs_on before entry 



Currently this is only being done on 64-bit.  Rather than just move it
out of the 64-bit ifdef, move it to kvm_lazy_ee_enable() so that it is
consistent with lazy ee state, and so that we don't track more host
code as interrupts-enabled than necessary.

Rename kvm_lazy_ee_enable() to kvm_fix_ee_before_entry() to reflect
that this function now has a role on 32-bit as well.

Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 4baa1d87

arch/powerpc/include/asm/kvm_ppc.h

+8 −3
Original line number Diff line number Diff line
@@ -394,10 +394,15 @@ static inline void kvmppc_mmu_flush_icache(pfn_t pfn) 
	}

}



/* Please call after prepare_to_enter. This function puts the lazy ee state

   back to normal mode, without actually enabling interrupts. */

static inline void kvmppc_lazy_ee_enable(void)

/*

 * Please call after prepare_to_enter. This function puts the lazy ee and irq

 * disabled tracking state back to normal mode, without actually enabling

 * interrupts.

 */

static inline void kvmppc_fix_ee_before_entry(void)

{

	trace_hardirqs_on();



#ifdef CONFIG_PPC64

	/* Only need to enable IRQs by hard enabling them after this */

	local_paca->irq_happened = 0;

arch/powerpc/kvm/book3s_pr.c

+2 −2
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, 
			local_irq_enable();

			r = s;

		} else {

			kvmppc_lazy_ee_enable();

			kvmppc_fix_ee_before_entry();

		}

	}
@@ -1161,7 +1161,7 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) 
	if (vcpu->arch.shared->msr & MSR_FP)

		kvmppc_handle_ext(vcpu, BOOK3S_INTERRUPT_FP_UNAVAIL, MSR_FP);



	kvmppc_lazy_ee_enable();

	kvmppc_fix_ee_before_entry();



	ret = __kvmppc_vcpu_run(kvm_run, vcpu);

arch/powerpc/kvm/booke.c

+2 −2
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) 
	kvmppc_load_guest_fp(vcpu);

#endif



	kvmppc_lazy_ee_enable();

	kvmppc_fix_ee_before_entry();



	ret = __kvmppc_vcpu_run(kvm_run, vcpu);
@@ -1168,7 +1168,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, 
			local_irq_enable();

			r = (s << 2) | RESUME_HOST | (r & RESUME_FLAG_NV);

		} else {

			kvmppc_lazy_ee_enable();

			kvmppc_fix_ee_before_entry();

		}

	}

arch/powerpc/kvm/powerpc.c

+0 −2
Original line number Diff line number Diff line
@@ -117,8 +117,6 @@ int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu) 
			kvm_guest_exit();

			continue;

		}



		trace_hardirqs_on();

#endif



		kvm_guest_enter();