From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: [PATCH -rt] kvm: lockdep annotate mmu_lock wait_lock Date: Tue, 18 Jul 2017 09:03:47 -0300 Message-ID: <20170718120347.GA25342@amt.cnet> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: kvm@vger.kernel.org To: linux-rt-users@vger.kernel.org, Peter Zijlstra Return-path: Content-Disposition: inline Sender: linux-rt-users-owner@vger.kernel.org List-Id: kvm.vger.kernel.org wait_lock for mmu_lock, being allocated in kmalloc memory, can't be tracked by LOCKDEP. Disable LOCKDEP verification for it. Fixes INFO: trying to register non-static key. the code is fine but needs lockdep annotation. turning off the locking correctness validator. CPU: 0 PID: 12386 Comm: qemu-kvm Not tainted 3.10.0-631.rt56.546.el7.x86_64.debug #1 Hardware name: To be filled by O.E.M. To be filled by O.E.M./PMH61ML, BIOS 4.6.4 07/14/2011 0000000000000002 00000000ee340fa8 ffff88008e2d7bc0 ffffffffa57534fc ffff88008e2d7bd0 ffffffffa574ce9f ffff88008e2d7c50 ffffffffa510e565 ffff88008e2d7bf8 00000001a50cf83d 0000000000000000 ffff880000000000 Call Trace: [] dump_stack+0x19/0x1b [] register_lock_class.part.27+0x38/0x3c [] __lock_acquire+0xcc5/0xdc0 [] lock_acquire+0xb2/0x230 [] ? rt_spin_lock_slowlock+0x6d/0x3c0 [] _raw_spin_lock_irqsave+0x70/0xc0 [] ? rt_spin_lock_slowlock+0x6d/0x3c0 [] rt_spin_lock_slowlock+0x6d/0x3c0 [] rt_spin_lock+0x2c/0x60 [] kvm_page_track_register_notifier+0x1f/0x60 [kvm] [] kvm_mmu_init_vm+0x2b/0x30 [kvm] [] kvm_arch_init_vm+0x264/0x290 [kvm] [] kvm_dev_ioctl+0xde/0x740 [kvm] [] do_vfs_ioctl+0x365/0x5b0 [] SyS_ioctl+0xa1/0xc0 [] tracesys+0xdd/0xe2 --------------------------- | preempt count: 00000001 ] | 1-level deep critical section nesting: ---------------------------------------- .. [] .... _raw_spin_lock_irqsave+0x4d/0xc0 .....[] .. ( <= rt_spin_lock_slowlock+0x6d/0x3c0) Signed-off-by: Marcelo Tosatti diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 7e80f62..6375db8 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -613,6 +613,8 @@ static struct kvm *kvm_create_vm(unsigned long type) return ERR_PTR(-ENOMEM); spin_lock_init(&kvm->mmu_lock); + + lockdep_set_novalidate_class(&kvm->mmu_lock.lock.wait_lock); mmgrab(current->mm); kvm->mm = current->mm; kvm_eventfd_init(kvm);