Commit 25051b5a authored by Scott Wood's avatar Scott Wood Committed by Avi Kivity
Browse files

KVM: PPC: Move prepare_to_enter call site into subarch code 



This function should be called with interrupts disabled, to avoid
a race where an exception is delivered after we check, but the
resched kick is received before we disable interrupts (and thus doesn't
actually trigger the exit code that would recheck exceptions).

booke already does this properly in the lightweight exit case, but
not on initial entry.

For now, move the call of prepare_to_enter into subarch-specific code so
that booke can do the right thing here.  Ideally book3s would do the same
thing, but I'm having a hard time seeing where it does any interrupt
disabling of this sort (plus it has several additional call sites), so
I'm deferring the book3s fix to someone more familiar with that code.
book3s behavior should be unchanged by this patch.

Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 7e28e60e

arch/powerpc/kvm/book3s_hv.c

+2 −0
Original line number Diff line number Diff line
@@ -836,6 +836,8 @@ int kvmppc_vcpu_run(struct kvm_run *run, struct kvm_vcpu *vcpu) 
		return -EINVAL;

	}



	kvmppc_core_prepare_to_enter(vcpu);



	/* No need to go into the guest when all we'll do is come back out */

	if (signal_pending(current)) {

		run->exit_reason = KVM_EXIT_INTR;

arch/powerpc/kvm/book3s_pr.c

+2 −0
Original line number Diff line number Diff line
@@ -929,6 +929,8 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) 
		return -EINVAL;

	}



	kvmppc_core_prepare_to_enter(vcpu);



	/* No need to go into the guest when all we do is going out */

	if (signal_pending(current)) {

		kvm_run->exit_reason = KVM_EXIT_INTR;

arch/powerpc/kvm/booke.c

+4 −0
Original line number Diff line number Diff line
@@ -295,6 +295,8 @@ void kvmppc_core_prepare_to_enter(struct kvm_vcpu *vcpu) 
	unsigned long old_pending = vcpu->arch.pending_exceptions;

	unsigned int priority;



	WARN_ON_ONCE(!irqs_disabled());



	priority = __ffs(*pending);

	while (priority <= BOOKE_IRQPRIO_MAX) {

		if (kvmppc_booke_irqprio_deliver(vcpu, priority))
@@ -323,6 +325,8 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) 


	local_irq_disable();



	kvmppc_core_prepare_to_enter(vcpu);



	if (signal_pending(current)) {

		kvm_run->exit_reason = KVM_EXIT_INTR;

		ret = -EINTR;

arch/powerpc/kvm/powerpc.c

+0 −2
Original line number Diff line number Diff line
@@ -559,8 +559,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 
		vcpu->arch.hcall_needed = 0;

	}



	kvmppc_core_prepare_to_enter(vcpu);



	r = kvmppc_vcpu_run(run, vcpu);



	if (vcpu->sigset_active)

CRA Git | Maintained and supported by SUSTech CRA and CCSE