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

Commit dd1a4cc1 authored by Radim Krčmář's avatar Radim Krčmář Committed by Paolo Bonzini
Browse files

KVM: split kvm_vcpu_wake_up from kvm_vcpu_kick 



AVIC has a use for kvm_vcpu_wake_up.

Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Tested-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d1ed092f

include/linux/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -657,6 +657,7 @@ void kvm_vcpu_mark_page_dirty(struct kvm_vcpu *vcpu, gfn_t gfn); 
void kvm_vcpu_block(struct kvm_vcpu *vcpu);

void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu);

void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu);

void kvm_vcpu_wake_up(struct kvm_vcpu *vcpu);

void kvm_vcpu_kick(struct kvm_vcpu *vcpu);

int kvm_vcpu_yield_to(struct kvm_vcpu *target);

void kvm_vcpu_on_spin(struct kvm_vcpu *vcpu);

virt/kvm/kvm_main.c

+13 −6
Original line number Diff line number Diff line
@@ -2076,13 +2076,8 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu) 
EXPORT_SYMBOL_GPL(kvm_vcpu_block);



#ifndef CONFIG_S390

/*

 * Kick a sleeping VCPU, or a guest VCPU in guest mode, into host kernel mode.

 */

void kvm_vcpu_kick(struct kvm_vcpu *vcpu)

void kvm_vcpu_wake_up(struct kvm_vcpu *vcpu)

{

	int me;

	int cpu = vcpu->cpu;

	struct swait_queue_head *wqp;



	wqp = kvm_arch_vcpu_wq(vcpu);
@@ -2091,6 +2086,18 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu) 
		++vcpu->stat.halt_wakeup;

	}



}

EXPORT_SYMBOL_GPL(kvm_vcpu_wake_up);



/*

 * Kick a sleeping VCPU, or a guest VCPU in guest mode, into host kernel mode.

 */

void kvm_vcpu_kick(struct kvm_vcpu *vcpu)

{

	int me;

	int cpu = vcpu->cpu;



	kvm_vcpu_wake_up(vcpu);

	me = get_cpu();

	if (cpu != me && (unsigned)cpu < nr_cpu_ids && cpu_online(cpu))

		if (kvm_arch_vcpu_should_kick(vcpu))