Re: [PART1 RFC v3 04/12] KVM: split kvm_vcpu_wake_up from kvm_vcpu_kick

Paolo Bonzini
2016-03-18T10:11:55Z

On 18/03/2016 07:09, Suravee Suthikulpanit wrote:
> From: Radim Krčmář <rkrcmar@redhat.com>
>
> AVIC has a use for kvm_vcpu_wake_up.
>
> Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
> Tested-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
> ---
> include/linux/kvm_host.h | 1 +
> virt/kvm/kvm_main.c | 19 +++++++++++++------
> 2 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
> index 5276fe0..673749d 100644
> --- a/include/linux/kvm_host.h
> +++ b/include/linux/kvm_host.h
> @@ -651,6 +651,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);
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index 5460325..e8fe787 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -2048,13 +2048,8 @@ out:
> 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);
> @@ -2063,6 +2058,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))
>

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>