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

Commit b83aea88 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fix from Gleb Natapov.

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: Enable pvspinlock after jump_label_init() to avoid VM hang
parents 36704263 3dbef3e3

arch/x86/kernel/kvm.c

+14 −3
Original line number Diff line number Diff line
@@ -775,11 +775,22 @@ void __init kvm_spinlock_init(void) 
	if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT))

		return;



	printk(KERN_INFO "KVM setup paravirtual spinlock\n");

	pv_lock_ops.lock_spinning = PV_CALLEE_SAVE(kvm_lock_spinning);

	pv_lock_ops.unlock_kick = kvm_unlock_kick;

}



static __init int kvm_spinlock_init_jump(void)

{

	if (!kvm_para_available())

		return 0;

	if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT))

		return 0;



	static_key_slow_inc(&paravirt_ticketlocks_enabled);

	printk(KERN_INFO "KVM setup paravirtual spinlock\n");



	pv_lock_ops.lock_spinning = PV_CALLEE_SAVE(kvm_lock_spinning);

	pv_lock_ops.unlock_kick = kvm_unlock_kick;

	return 0;

}

early_initcall(kvm_spinlock_init_jump);



#endif	/* CONFIG_PARAVIRT_SPINLOCKS */