• B
    nvme: avoid that deleting a controller triggers a circular locking complaint · b9c77583
    Bart Van Assche 提交于
    Rework nvme_delete_ctrl_sync() such that it does not have to wait for
    queued work. This patch avoids that test nvme/008 triggers the following
    complaint:
    
    WARNING: possible circular locking dependency detected
    5.0.0-rc6-dbg+ #10 Not tainted
    ------------------------------------------------------
    nvme/7918 is trying to acquire lock:
    000000009a1a7b69 ((work_completion)(&ctrl->delete_work)){+.+.}, at: __flush_work+0x379/0x410
    
    but task is already holding lock:
    00000000ef5a45b4 (kn->count#389){++++}, at: kernfs_remove_self+0x196/0x210
    
    which lock already depends on the new lock.
    
    the existing dependency chain (in reverse order) is:
    
    -> #1 (kn->count#389){++++}:
           lock_acquire+0xc5/0x1e0
           __kernfs_remove+0x42a/0x4a0
           kernfs_remove_by_name_ns+0x45/0x90
           remove_files.isra.1+0x3a/0x90
           sysfs_remove_group+0x5c/0xc0
           sysfs_remove_groups+0x39/0x60
           device_remove_attrs+0x68/0xb0
           device_del+0x24d/0x570
           cdev_device_del+0x1a/0x50
           nvme_delete_ctrl_work+0xbd/0xe0
           process_one_work+0x4f1/0xa40
           worker_thread+0x67/0x5b0
           kthread+0x1cf/0x1f0
           ret_from_fork+0x24/0x30
    
    -> #0 ((work_completion)(&ctrl->delete_work)){+.+.}:
           __lock_acquire+0x1323/0x17b0
           lock_acquire+0xc5/0x1e0
           __flush_work+0x399/0x410
           flush_work+0x10/0x20
           nvme_delete_ctrl_sync+0x65/0x70
           nvme_sysfs_delete+0x4f/0x60
           dev_attr_store+0x3e/0x50
           sysfs_kf_write+0x87/0xa0
           kernfs_fop_write+0x186/0x240
           __vfs_write+0xd7/0x430
           vfs_write+0xfa/0x260
           ksys_write+0xab/0x130
           __x64_sys_write+0x43/0x50
           do_syscall_64+0x71/0x210
           entry_SYSCALL_64_after_hwframe+0x49/0xbe
    
    other info that might help us debug this:
    
     Possible unsafe locking scenario:
    
           CPU0                    CPU1
           ----                    ----
      lock(kn->count#389);
                                   lock((work_completion)(&ctrl->delete_work));
                                   lock(kn->count#389);
      lock((work_completion)(&ctrl->delete_work));
    
     *** DEADLOCK ***
    
    3 locks held by nvme/7918:
     #0: 00000000e2223b44 (sb_writers#6){.+.+}, at: vfs_write+0x1eb/0x260
     #1: 000000003404976f (&of->mutex){+.+.}, at: kernfs_fop_write+0x128/0x240
     #2: 00000000ef5a45b4 (kn->count#389){++++}, at: kernfs_remove_self+0x196/0x210
    
    stack backtrace:
    CPU: 4 PID: 7918 Comm: nvme Not tainted 5.0.0-rc6-dbg+ #10
    Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1 04/01/2014
    Call Trace:
     dump_stack+0x86/0xca
     print_circular_bug.isra.36.cold.54+0x173/0x1d5
     check_prev_add.constprop.45+0x996/0x1110
     __lock_acquire+0x1323/0x17b0
     lock_acquire+0xc5/0x1e0
     __flush_work+0x399/0x410
     flush_work+0x10/0x20
     nvme_delete_ctrl_sync+0x65/0x70
     nvme_sysfs_delete+0x4f/0x60
     dev_attr_store+0x3e/0x50
     sysfs_kf_write+0x87/0xa0
     kernfs_fop_write+0x186/0x240
     __vfs_write+0xd7/0x430
     vfs_write+0xfa/0x260
     ksys_write+0xab/0x130
     __x64_sys_write+0x43/0x50
     do_syscall_64+0x71/0x210
     entry_SYSCALL_64_after_hwframe+0x49/0xbe
    Signed-off-by: NBart Van Assche <bvanassche@acm.org>
    Reviewed-by: NKeith Busch <keith.busch@intel.com>
    Signed-off-by: NChristoph Hellwig <hch@lst.de>
    b9c77583
core.c 98.3 KB