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

Commit df6909e5 authored by Paul Mackerras's avatar Paul Mackerras Committed by Avi Kivity
Browse files

KVM: PPC: Move guest enter/exit down into subarch-specific code 



Instead of doing the kvm_guest_enter/exit() and local_irq_dis/enable()
calls in powerpc.c, this moves them down into the subarch-specific
book3s_pr.c and booke.c.  This eliminates an extra local_irq_enable()
call in book3s_pr.c, and will be needed for when we do SMT4 guest
support in the book3s hypervisor mode code.

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

arch/powerpc/include/asm/kvm_ppc.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ enum emulation_result { 
	EMULATE_AGAIN,        /* something went wrong. go again */

};



extern int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu);

extern int __kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu);

extern char kvmppc_handlers_start[];

extern unsigned long kvmppc_handler_len;

arch/powerpc/kvm/book3s_interrupts.S

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
 *  r3: kvm_run pointer

 *  r4: vcpu pointer

 */

_GLOBAL(__kvmppc_vcpu_entry)

_GLOBAL(__kvmppc_vcpu_run)



kvm_start_entry:

	/* Write correct stack frame */

arch/powerpc/kvm/book3s_pr.c

+6 −6
Original line number Diff line number Diff line
@@ -891,8 +891,7 @@ void kvmppc_core_vcpu_free(struct kvm_vcpu *vcpu) 
	vfree(vcpu_book3s);

}



extern int __kvmppc_vcpu_entry(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu);

int __kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)

int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)

{

	int ret;

	double fpr[32][TS_FPRWIDTH];
@@ -944,14 +943,15 @@ int __kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) 
	/* Remember the MSR with disabled extensions */

	ext_msr = current->thread.regs->msr;



	/* XXX we get called with irq disabled - change that! */

	local_irq_enable();



	/* Preload FPU if it's enabled */

	if (vcpu->arch.shared->msr & MSR_FP)

		kvmppc_handle_ext(vcpu, BOOK3S_INTERRUPT_FP_UNAVAIL, MSR_FP);



	ret = __kvmppc_vcpu_entry(kvm_run, vcpu);

	kvm_guest_enter();



	ret = __kvmppc_vcpu_run(kvm_run, vcpu);



	kvm_guest_exit();



	local_irq_disable();

arch/powerpc/kvm/booke.c

+13 −0
Original line number Diff line number Diff line
@@ -312,6 +312,19 @@ void kvmppc_core_deliver_interrupts(struct kvm_vcpu *vcpu) 
		vcpu->arch.shared->int_pending = 0;

}



int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)

{

	int ret;



	local_irq_disable();

	kvm_guest_enter();

	ret = __kvmppc_vcpu_run(kvm_run, vcpu);

	kvm_guest_exit();

	local_irq_enable();



	return ret;

}



/**

 * kvmppc_handle_exit

 *

arch/powerpc/kvm/powerpc.c

+1 −5
Original line number Diff line number Diff line
@@ -500,11 +500,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 


	kvmppc_core_deliver_interrupts(vcpu);



	local_irq_disable();

	kvm_guest_enter();

	r = __kvmppc_vcpu_run(run, vcpu);

	kvm_guest_exit();

	local_irq_enable();

	r = kvmppc_vcpu_run(run, vcpu);



	if (vcpu->sigset_active)

		sigprocmask(SIG_SETMASK, &sigsaved, NULL);