Anand Jain
1cec3f2716
btrfs: scrub: fix circular locking dependency warning ...
This fixes a longstanding lockdep warning triggered by
fstests/btrfs/011.
Circular locking dependency check reports warning[1], that's because the
btrfs_scrub_dev() calls the stack #0 below with, the fs_info::scrub_lock
held. The test case leading to this warning:
$ mkfs.btrfs -f /dev/sdb
$ mount /dev/sdb /btrfs
$ btrfs scrub start -B /btrfs
In fact we have fs_info::scrub_workers_refcnt to track if the init and destroy
of the scrub workers are needed. So once we have incremented and decremented
the fs_info::scrub_workers_refcnt value in the thread, its ok to drop the
scrub_lock, and then actually do the btrfs_destroy_workqueue() part. So this
patch drops the scrub_lock before calling btrfs_destroy_workqueue().
[359.258534] ======================================================
[359.260305] WARNING: possible circular locking dependency detected
[359.261938] 5.0.0-rc6-default #461 Not tainted
[359.263135] ------------------------------------------------------
[359.264672] btrfs/20975 is trying to acquire lock:
[359.265927] 00000000d4d32bea ((wq_completion)"%s-%s""btrfs", name){+.+.}, at: flush_workqueue+0x87/0x540
[359.268416]
[359.268416] but task is already holding lock:
[359.270061] 0000000053ea26a6 (&fs_info->scrub_lock){+.+.}, at: btrfs_scrub_dev+0x322/0x590 [btrfs]
[359.272418]
[359.272418] which lock already depends on the new lock.
[359.272418]
[359.274692]
[359.274692] the existing dependency chain (in reverse order) is:
[359.276671]
[359.276671] -> #3 (&fs_info->scrub_lock){+.+.}:
[359.278187] __mutex_lock+0x86/0x9c0
[359.279086] btrfs_scrub_pause+0x31/0x100 [btrfs]
[359.280421] btrfs_commit_transaction+0x1e4/0x9e0 [btrfs]
[359.281931] close_ctree+0x30b/0x350 [btrfs]
[359.283208] generic_shutdown_super+0x64/0x100
[359.284516] kill_anon_super+0x14/0x30
[359.285658] btrfs_kill_super+0x12/0xa0 [btrfs]
[359.286964] deactivate_locked_super+0x29/0x60
[359.288242] cleanup_mnt+0x3b/0x70
[359.289310] task_work_run+0x98/0xc0
[359.290428] exit_to_usermode_loop+0x83/0x90
[359.291445] do_syscall_64+0x15b/0x180
[359.292598] entry_SYSCALL_64_after_hwframe+0x49/0xbe
[359.294011]
[359.294011] -> #2 (sb_internal#2){.+.+}:
[359.295432] __sb_start_write+0x113/0x1d0
[359.296394] start_transaction+0x369/0x500 [btrfs]
[359.297471] btrfs_finish_ordered_io+0x2aa/0x7c0 [btrfs]
[359.298629] normal_work_helper+0xcd/0x530 [btrfs]
[359.299698] process_one_work+0x246/0x610
[359.300898] worker_thread+0x3c/0x390
[359.302020] kthread+0x116/0x130
[359.303053] ret_from_fork+0x24/0x30
[359.304152]
[359.304152] -> #1 ((work_completion)(&work->normal_work)){+.+.}:
[359.306100] process_one_work+0x21f/0x610
[359.307302] worker_thread+0x3c/0x390
[359.308465] kthread+0x116/0x130
[359.309357] ret_from_fork+0x24/0x30
[359.310229]
[359.310229] -> #0 ((wq_completion)"%s-%s""btrfs", name){+.+.}:
[359.311812] lock_acquire+0x90/0x180
[359.312929] flush_workqueue+0xaa/0x540
[359.313845] drain_workqueue+0xa1/0x180
[359.314761] destroy_workqueue+0x17/0x240
[359.315754] btrfs_destroy_workqueue+0x57/0x200 [btrfs]
[359.317245] scrub_workers_put+0x2c/0x60 [btrfs]
[359.318585] btrfs_scrub_dev+0x336/0x590 [btrfs]
[359.319944] btrfs_dev_replace_by_ioctl.cold.19+0x179/0x1bb [btrfs]
[359.321622] btrfs_ioctl+0x28a4/0x2e40 [btrfs]
[359.322908] do_vfs_ioctl+0xa2/0x6d0
[359.324021] ksys_ioctl+0x3a/0x70
[359.325066] __x64_sys_ioctl+0x16/0x20
[359.326236] do_syscall_64+0x54/0x180
[359.327379] entry_SYSCALL_64_after_hwframe+0x49/0xbe
[359.328772]
[359.328772] other info that might help us debug this:
[359.328772]
[359.330990] Chain exists of:
[359.330990] (wq_completion)"%s-%s""btrfs", name --> sb_internal#2 --> &fs_info->scrub_lock
[359.330990]
[359.334376] Possible unsafe locking scenario:
[359.334376]
[359.336020] CPU0 CPU1
[359.337070] ---- ----
[359.337821] lock(&fs_info->scrub_lock);
[359.338506] lock(sb_internal#2);
[359.339506] lock(&fs_info->scrub_lock);
[359.341461] lock((wq_completion)"%s-%s""btrfs", name);
[359.342437]
[359.342437] *** DEADLOCK ***
[359.342437]
[359.343745] 1 lock held by btrfs/20975:
[359.344788] #0 : 0000000053ea26a6 (&fs_info->scrub_lock){+.+.}, at: btrfs_scrub_dev+0x322/0x590 [btrfs]
[359.346778]
[359.346778] stack backtrace:
[359.347897] CPU: 0 PID: 20975 Comm: btrfs Not tainted 5.0.0-rc6-default #461
[359.348983] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.11.2-0-gf9626cc-prebuilt.qemu-project.org 04/01/2014
[359.350501] Call Trace:
[359.350931] dump_stack+0x67/0x90
[359.351676] print_circular_bug.isra.37.cold.56+0x15c/0x195
[359.353569] check_prev_add.constprop.44+0x4f9/0x750
[359.354849] ? check_prev_add.constprop.44+0x286/0x750
[359.356505] __lock_acquire+0xb84/0xf10
[359.357505] lock_acquire+0x90/0x180
[359.358271] ? flush_workqueue+0x87/0x540
[359.359098] flush_workqueue+0xaa/0x540
[359.359912] ? flush_workqueue+0x87/0x540
[359.360740] ? drain_workqueue+0x1e/0x180
[359.361565] ? drain_workqueue+0xa1/0x180
[359.362391] drain_workqueue+0xa1/0x180
[359.363193] destroy_workqueue+0x17/0x240
[359.364539] btrfs_destroy_workqueue+0x57/0x200 [btrfs]
[359.365673] scrub_workers_put+0x2c/0x60 [btrfs]
[359.366618] btrfs_scrub_dev+0x336/0x590 [btrfs]
[359.367594] ? start_transaction+0xa1/0x500 [btrfs]
[359.368679] btrfs_dev_replace_by_ioctl.cold.19+0x179/0x1bb [btrfs]
[359.369545] btrfs_ioctl+0x28a4/0x2e40 [btrfs]
[359.370186] ? __lock_acquire+0x263/0xf10
[359.370777] ? kvm_clock_read+0x14/0x30
[359.371392] ? kvm_sched_clock_read+0x5/0x10
[359.372248] ? sched_clock+0x5/0x10
[359.372786] ? sched_clock_cpu+0xc/0xc0
[359.373662] ? do_vfs_ioctl+0xa2/0x6d0
[359.374552] do_vfs_ioctl+0xa2/0x6d0
[359.375378] ? do_sigaction+0xff/0x250
[359.376233] ksys_ioctl+0x3a/0x70
[359.376954] __x64_sys_ioctl+0x16/0x20
[359.377772] do_syscall_64+0x54/0x180
[359.378841] entry_SYSCALL_64_after_hwframe+0x49/0xbe
[359.380422] RIP: 0033:0x7f5429296a97
Backporting to older kernels: scrub_nocow_workers must be freed the same
way as the others.
CC: stable@vger.kernel.org # 4.4+
Signed-off-by: Anand Jain <anand.jain@oracle.com>
[ update changelog ]
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
2019-02-25 14:13:37 +01:00
2018-11-01 19:58:52 -07:00
2018-08-22 10:52:51 -07:00
2018-05-28 12:36:41 +02:00
2019-01-17 15:17:28 +00:00
2019-02-01 15:46:24 -08:00
2018-06-15 18:10:01 -03:00
2019-01-04 13:13:47 -08:00
2019-02-25 14:13:37 +01:00
2018-11-30 16:00:58 +00:00
2019-02-18 18:08:29 +01:00
2019-01-31 07:05:06 -06:00
2018-06-05 16:57:31 -07:00
2018-07-17 06:14:07 -07:00
2018-10-30 12:46:25 -07:00
2019-01-06 08:36:21 -05:00
2019-01-30 12:39:49 +01:00
2018-08-21 23:54:17 -04:00
2018-12-03 15:30:24 -06:00
2018-10-09 23:33:17 -04:00
2018-07-22 14:13:44 +02:00
2018-12-17 18:36:33 -05:00
2018-11-23 09:08:17 -05:00
2018-12-27 17:00:35 -08:00
2019-01-31 23:41:11 -05:00
2018-12-31 09:41:37 -08:00
2019-01-05 09:16:18 -08:00
2018-05-22 14:27:51 -04:00
2018-11-30 15:57:31 +00:00
2019-01-16 10:27:59 +01:00
2019-02-14 09:52:51 -08:00
2018-11-30 14:56:14 -08:00
2019-01-04 13:13:47 -08:00
2018-08-17 16:20:28 -07:00
2018-08-25 12:42:33 -07:00
2019-01-08 17:15:11 -08:00
2018-09-29 22:47:48 -04:00
2018-12-04 00:20:10 -05:00
2018-12-02 09:20:34 +01:00
2018-09-20 09:28:49 -05:00
2018-11-27 11:59:33 +01:00
2019-01-02 16:35:23 -08:00
2018-05-22 14:27:52 -04:00
2019-02-20 09:09:33 -08:00
2019-02-14 12:33:19 -05:00
2018-11-05 14:57:05 -05:00
2019-01-02 18:28:37 +01:00
2018-12-28 12:11:47 -08:00
2019-01-05 09:16:18 -08:00
2018-05-22 14:27:58 -04:00
2018-11-18 13:35:19 -08:00
2019-01-04 13:13:48 -08:00
2018-12-04 11:31:30 +01:00
2019-02-21 09:01:00 -08:00
2019-01-20 14:44:52 -08:00
2018-05-22 14:27:52 -04:00
2018-05-22 14:27:54 -04:00
2018-12-18 18:29:15 +01:00
2018-10-31 08:54:14 -07:00
2018-05-22 14:27:55 -04:00
2018-08-02 09:34:02 -07:00
2019-01-07 08:53:32 +01:00
2018-11-10 08:02:40 -05:00
2018-07-31 11:32:44 -04:00
2018-12-28 12:11:51 -08:00
2018-12-27 17:00:35 -08:00
2018-08-17 16:20:27 -07:00
2019-02-03 14:03:59 -08:00
2019-02-06 08:04:22 -07:00
2018-07-12 10:04:27 -04:00
2018-07-03 16:44:45 -04:00
2018-07-12 10:04:20 -04:00
2019-01-03 18:57:57 -08:00
2018-06-12 16:19:22 -07:00
2018-10-03 16:47:43 +02:00
2018-07-10 23:29:03 -04:00
2019-02-18 16:49:36 -08:00
2019-01-15 07:30:56 -07:00
2019-02-06 12:58:56 -07:00
2018-08-27 14:48:48 +02:00
2018-10-29 14:29:58 -07:00
2018-06-05 19:23:26 +02:00
2018-10-03 16:47:43 +02:00
2018-12-31 09:46:39 -08:00
2019-01-30 11:02:11 -08:00
2019-01-22 08:26:44 -07:00
2019-02-01 15:46:24 -08:00
2018-06-28 10:40:47 -07:00
2019-01-05 09:16:18 -08:00
2019-01-05 13:18:59 -08:00
2018-10-03 16:47:43 +02:00
2018-12-28 12:11:47 -08:00
2018-12-28 20:54:57 -08:00
2019-01-22 14:39:38 -07:00
2019-02-12 16:33:18 -08:00
2018-08-21 18:19:09 -07:00
2019-01-03 18:57:57 -08:00
2019-01-27 08:47:42 -08:00
2018-06-11 08:22:34 -07:00
2018-08-02 08:06:55 +09:00
2019-01-02 20:14:50 -05:00
2018-06-11 08:22:34 -07:00
2018-06-12 16:19:22 -07:00
2018-08-17 16:20:29 -07:00
2018-12-22 14:18:34 -08:00
2019-01-05 13:25:58 -08:00
2018-08-21 18:19:09 -07:00
2018-08-13 19:58:36 -07:00
2018-12-20 16:32:56 +00:00
2019-01-03 18:57:57 -08:00
2019-01-03 18:57:57 -08:00
2019-01-03 18:57:57 -08:00
2018-08-17 16:20:28 -07:00
2018-10-03 16:47:43 +02:00
2018-12-04 08:50:49 -08:00
2018-08-29 15:42:20 +02:00
2018-07-12 14:49:48 +01:00
2018-12-21 11:51:23 -05:00
2018-08-27 14:48:48 +02:00
2018-12-28 12:11:51 -08:00
2018-08-29 15:42:23 +02:00
2018-09-18 07:30:48 -04:00
1cec3f2716