dm: core: put device mapper block device synchronously
Subsystems (3)
PATCH 1/1 dm: core: put device mapper block device synchronously
'dmsetup remove_all' actually depends on sync bdev release since dm_lock_for_deletion() may return -EBUSY if the open count is > 0, and the open count is dropped in dm_blk_close().
So if dm_blk_close() is delayed because of fput(), this device mapper device is skipped in remove_all, and cause regression.
Fix the issue by using __fput_sync().
--- drivers/md/dm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/md/dm.c +2 -2
@@ -765,7 +765,7 @@ static struct table_device *open_table_device(struct mapped_device *md,return td; out_blkdev_put: -fput (bdev_file); +__fput_sync (bdev_file); out_free_td:kfree (td);return ERR_PTR (r);
@@ -778,7 +778,7 @@ static void close_table_device(struct table_device *td, struct mapped_device *md {if (md->disk->slave_dir)bd_unlink_disk_holder (td->dm_dev.bdev, md->disk); -fput (td->dm_dev.bdev_file); +__fput_sync (td->dm_dev.bdev_file);put_dax (td->dm_dev.dax_dev);list_del (&td->list);kfree (td);
Signature · 1 line
2.44.0
Mike Snitzer
maintainerPATCH v2 1/1 dm: restore synchronous close of device mapper block device
From: Ming Lei <[email protected]>
'dmsetup remove' and 'dmsetup remove_all' require synchronous bdev release. Otherwise dm_lock_for_deletion() may return -EBUSY if the open count is > 0, because the open count is dropped in dm_blk_close() which occurs after fput() completes.
So if dm_blk_close() is delayed because of asynchronous fput(), this device mapper device is skipped during remove, which is a regression.
Fix the issue by using __fput_sync().
Also: DM device removal has long supported being made asynchronous by setting the DMF_DEFERRED_REMOVE flag on the DM device. So leverage using async fput() in close_table_device() if DMF_DEFERRED_REMOVE flag is set.
--- drivers/md/dm.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/md/dm.c +8 -2
@@ -765,7 +765,7 @@ static struct table_device *open_table_device(struct mapped_device *md,return td; out_blkdev_put: -fput (bdev_file); +__fput_sync (bdev_file); out_free_td:kfree (td);return ERR_PTR (r);
@@ -778,7 +778,13 @@ static void close_table_device(struct table_device *td, struct mapped_device *md {if (md->disk->slave_dir)bd_unlink_disk_holder (td->dm_dev.bdev, md->disk); -fput (td->dm_dev.bdev_file); + +/* Leverage async fput() if DMF_DEFERRED_REMOVE set */ +if (unlikely (test_bit (DMF_DEFERRED_REMOVE , &md->flags))) +fput (td->dm_dev.bdev_file); +else +__fput_sync (td->dm_dev.bdev_file); +put_dax (td->dm_dev.dax_dev);list_del (&td->list);kfree (td);
Signature · 1 line
2.40.0
Re: [PATCH v2] dm: restore synchronous close of device mapper block device
Quoted 10 lines · Mike Snitzer
From: Ming Lei <[email protected]>
'dmsetup remove' and 'dmsetup
remove_all' require synchronous bdev release. Otherwisedm_lock_for_deletion()may return-EBUSYif the open count is > 0, because the open count is dropped indm_blk_close()which occurs afterfput()completes.So if
dm_blk_close()is delayed because of asynchronousfput(), this device mapper device is skipped during remove, which is a regression.
Quoted 6 lines
Fix the issue by using
__fput_sync().Also: DM device removal has long supported being made asynchronous by setting the
DMF_DEFERRED_REMOVEflag on the DM device. So leverage using asyncfput()inclose_table_device()ifDMF_DEFERRED_REMOVEflag is set.
IMO, this way isn't necessary, because the patch is one bug fix, and we are supposed to recover into exact previous behavior before commit a28d893eb327 ("md: port block device access to file") for minimizing regression risk.
But the extra change seems work.
thanks,
Ming
Mike Snitzer
maintainerRe: [PATCH v2] dm: restore synchronous close of device mapper block device
Quoted 18 lines · Ming Lei
Quoted 10 lines · Mike Snitzer
From: Ming Lei <[email protected]>
'dmsetup remove' and 'dmsetup
remove_all' require synchronous bdev release. Otherwisedm_lock_for_deletion()may return-EBUSYif the open count is > 0, because the open count is dropped indm_blk_close()which occurs afterfput()completes.So if
dm_blk_close()is delayed because of asynchronousfput(), this device mapper device is skipped during remove, which is a regression.Quoted 6 lines
Fix the issue by using
__fput_sync().Also: DM device removal has long supported being made asynchronous by setting the
DMF_DEFERRED_REMOVEflag on the DM device. So leverage using asyncfput()inclose_table_device()ifDMF_DEFERRED_REMOVEflag is set.
Quoted 5 lines
IMO, this way isn't necessary, because the patch is one bug fix, and we are supposed to recover into exact previous behavior before commit
a28d893eb327("md: port block device access to file") for minimizing regression risk.But the extra change seems work.
I normally would agree but I see no real reason to avoid leveraging async fput() for the async DM device removal use-case ;)
Mike
Re: [PATCH v2] dm: restore synchronous close of device mapper block device
In reply to Mike SnitzerQuoted 57 lines · Mike Snitzer
From: Ming Lei <[email protected]>
'dmsetup remove' and 'dmsetup
remove_all' require synchronous bdev release. Otherwisedm_lock_for_deletion()may return-EBUSYif the open count is > 0, because the open count is dropped indm_blk_close()which occurs afterfput()completes.So if
dm_blk_close()is delayed because of asynchronousfput(), this device mapper device is skipped during remove, which is a regression.Fix the issue by using
__fput_sync().Also: DM device removal has long supported being made asynchronous by setting the
DMF_DEFERRED_REMOVEflag on the DM device. So leverage using asyncfput()inclose_table_device()ifDMF_DEFERRED_REMOVEflag is set.Reported-by Zhong Changhui <[email protected]>Fixes a28d893eb327 ("md: port block device access to file")Suggested-by Christian Brauner <[email protected]>Signed-off-by Ming Lei <[email protected]>[snitzer: editted commit header, use fput() if DMF_DEFERRED_REMOVE set]Signed-off-by Mike Snitzer <[email protected]>--- drivers/md/dm.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)drivers/md/dm.c +8
-3@@ -765,7 +765,7 @@ static struct table_device *open_table_device(struct mapped_device *md,return td; out_blkdev_put: -fput (bdev_file); +__fput_sync (bdev_file); out_free_td:kfree (td);return ERR_PTR (r);@@ -778,7 +778,13 @@ static void close_table_device(struct table_device *td, struct mapped_device *md {if (md->disk->slave_dir)bd_unlink_disk_holder (td->dm_dev.bdev, md->disk); -fput (td->dm_dev.bdev_file); + +/* Leverage async fput() if DMF_DEFERRED_REMOVE set */ +if (unlikely (test_bit (DMF_DEFERRED_REMOVE , &md->flags))) +fput (td->dm_dev.bdev_file); +else +__fput_sync (td->dm_dev.bdev_file); +put_dax (td->dm_dev.dax_dev);list_del (&td->list);kfree (td); --
Quoted 2 lines
2.40.0
I tried to apply this patch and looks this issue has solved by this patch