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

Commit 592f5d87 authored by Alexander Graf's avatar Alexander Graf Committed by Paul Mackerras
Browse files

KVM: PPC: Book3S: PR: Fix preemption 



We were leaking preemption counters. Fix the code to always toggle
between preempt and non-preempt properly.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent e1f8acf8

arch/powerpc/kvm/book3s_pr.c

+1 −2
Original line number Diff line number Diff line
@@ -777,6 +777,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, 
	}

	}



	preempt_disable();

	if (!(r & RESUME_HOST)) {

		/* To avoid clobbering exit_reason, only check for signals if

		 * we aren't already exiting to userspace for some other
@@ -798,8 +799,6 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, 
			run->exit_reason = KVM_EXIT_INTR;

			r = -EINTR;

		} else {

			preempt_disable();



			/* In case an interrupt came in that was triggered

			 * from userspace (like DEC), we need to check what

			 * to inject now! */