Re: [PATCH 1/2] KVM: X86: Fix setup the virt_spin_lock_key before static key get initialized

From: Radim KrÄmÃÅ
Date: Wed Mar 28 2018 - 16:19:13 EST


2018-03-24 21:17-0700, Wanpeng Li:
> From: Wanpeng Li <wanpengli@xxxxxxxxxxx>
>
> static_key_disable_cpuslocked(): static key 'virt_spin_lock_key+0x0/0x20' used before call to jump_label_init()
> WARNING: CPU: 0 PID: 0 at kernel/jump_label.c:161 static_key_disable_cpuslocked+0x61/0x80
> RIP: 0010:static_key_disable_cpuslocked+0x61/0x80
> Call Trace:
> static_key_disable+0x16/0x20
> start_kernel+0x192/0x4b3
> secondary_startup_64+0xa5/0xb0
>
> Qspinlock will be choosed when dedicated pCPUs are available, however, the
> static virt_spin_lock_key is set in kvm_spinlock_init() before jump_label_init()
> has been called, which will result in a WARN(). This patch fixes it by delaying
> the virt_spin_lock_key setup to .smp_prepare_cpus().
>
> Reported-by: Davidlohr Bueso <dbueso@xxxxxxx>
> Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> Cc: Radim KrÄmÃÅ <rkrcmar@xxxxxxxxxx>
> Cc: Davidlohr Bueso <dbueso@xxxxxxx>
> Signed-off-by: Wanpeng Li <wanpengli@xxxxxxxxxxx>
> ---

Queued, thanks.