From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>, Tejun Heo <tj@kernel.org>,
Josef Bacik <josef@toxicpanda.com>, Coly Li <colyli@suse.de>,
Mike Snitzer <snitzer@redhat.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jan Kara <jack@suse.cz>,
Johannes Thumshirn <johannes.thumshirn@wdc.com>,
dm-devel@redhat.com, Jan Kara <jack@suse.com>,
linux-block@vger.kernel.org, linux-bcache@vger.kernel.org,
linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org,
linux-mm@kvack.org, Chao Yu <yuchao0@huawei.com>
Subject: Re: [PATCH 04/45] fs: simplify freeze_bdev/thaw_bdev
Date: Mon, 30 Nov 2020 09:55:26 -0800 [thread overview]
Message-ID: <20201130175526.GA143012@magnolia> (raw)
In-Reply-To: <20201128161510.347752-5-hch@lst.de>
On Sat, Nov 28, 2020 at 05:14:29PM +0100, Christoph Hellwig wrote:
> Store the frozen superblock in struct block_device to avoid the awkward
> interface that can return a sb only used a cookie, an ERR_PTR or NULL.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Reviewed-by: Jan Kara <jack@suse.cz>
> Acked-by: Chao Yu <yuchao0@huawei.com> [f2fs]
> ---
> drivers/md/dm-core.h | 5 -----
> drivers/md/dm.c | 20 ++++++--------------
> fs/block_dev.c | 37 +++++++++++++++----------------------
> fs/buffer.c | 2 +-
> fs/ext4/ioctl.c | 2 +-
> fs/f2fs/file.c | 14 +++++---------
> fs/xfs/xfs_fsops.c | 7 ++-----
For the xfs part:
Acked-by: Darrick J. Wong <darrick.wong@oracle.com>
(I did glance at the other 44 patches and didn't see anything that
screamed 'wrong' but I wouldn't call that a strong review...)
--D
> include/linux/blk_types.h | 1 +
> include/linux/blkdev.h | 4 ++--
> 9 files changed, 33 insertions(+), 59 deletions(-)
>
> diff --git a/drivers/md/dm-core.h b/drivers/md/dm-core.h
> index d522093cb39dda..aace147effcacb 100644
> --- a/drivers/md/dm-core.h
> +++ b/drivers/md/dm-core.h
> @@ -96,11 +96,6 @@ struct mapped_device {
> */
> struct workqueue_struct *wq;
>
> - /*
> - * freeze/thaw support require holding onto a super block
> - */
> - struct super_block *frozen_sb;
> -
> /* forced geometry settings */
> struct hd_geometry geometry;
>
> diff --git a/drivers/md/dm.c b/drivers/md/dm.c
> index 54739f1b579bc8..50541d336c719b 100644
> --- a/drivers/md/dm.c
> +++ b/drivers/md/dm.c
> @@ -2392,27 +2392,19 @@ static int lock_fs(struct mapped_device *md)
> {
> int r;
>
> - WARN_ON(md->frozen_sb);
> + WARN_ON(test_bit(DMF_FROZEN, &md->flags));
>
> - md->frozen_sb = freeze_bdev(md->bdev);
> - if (IS_ERR(md->frozen_sb)) {
> - r = PTR_ERR(md->frozen_sb);
> - md->frozen_sb = NULL;
> - return r;
> - }
> -
> - set_bit(DMF_FROZEN, &md->flags);
> -
> - return 0;
> + r = freeze_bdev(md->bdev);
> + if (!r)
> + set_bit(DMF_FROZEN, &md->flags);
> + return r;
> }
>
> static void unlock_fs(struct mapped_device *md)
> {
> if (!test_bit(DMF_FROZEN, &md->flags))
> return;
> -
> - thaw_bdev(md->bdev, md->frozen_sb);
> - md->frozen_sb = NULL;
> + thaw_bdev(md->bdev);
> clear_bit(DMF_FROZEN, &md->flags);
> }
>
> diff --git a/fs/block_dev.c b/fs/block_dev.c
> index d8664f5c1ff669..33c29106c98907 100644
> --- a/fs/block_dev.c
> +++ b/fs/block_dev.c
> @@ -548,55 +548,47 @@ EXPORT_SYMBOL(fsync_bdev);
> * count down in thaw_bdev(). When it becomes 0, thaw_bdev() will unfreeze
> * actually.
> */
> -struct super_block *freeze_bdev(struct block_device *bdev)
> +int freeze_bdev(struct block_device *bdev)
> {
> struct super_block *sb;
> int error = 0;
>
> mutex_lock(&bdev->bd_fsfreeze_mutex);
> - if (++bdev->bd_fsfreeze_count > 1) {
> - /*
> - * We don't even need to grab a reference - the first call
> - * to freeze_bdev grab an active reference and only the last
> - * thaw_bdev drops it.
> - */
> - sb = get_super(bdev);
> - if (sb)
> - drop_super(sb);
> - mutex_unlock(&bdev->bd_fsfreeze_mutex);
> - return sb;
> - }
> + if (++bdev->bd_fsfreeze_count > 1)
> + goto done;
>
> sb = get_active_super(bdev);
> if (!sb)
> - goto out;
> + goto sync;
> if (sb->s_op->freeze_super)
> error = sb->s_op->freeze_super(sb);
> else
> error = freeze_super(sb);
> + deactivate_super(sb);
> +
> if (error) {
> - deactivate_super(sb);
> bdev->bd_fsfreeze_count--;
> - mutex_unlock(&bdev->bd_fsfreeze_mutex);
> - return ERR_PTR(error);
> + goto done;
> }
> - deactivate_super(sb);
> - out:
> + bdev->bd_fsfreeze_sb = sb;
> +
> +sync:
> sync_blockdev(bdev);
> +done:
> mutex_unlock(&bdev->bd_fsfreeze_mutex);
> - return sb; /* thaw_bdev releases s->s_umount */
> + return error;
> }
> EXPORT_SYMBOL(freeze_bdev);
>
> /**
> * thaw_bdev -- unlock filesystem
> * @bdev: blockdevice to unlock
> - * @sb: associated superblock
> *
> * Unlocks the filesystem and marks it writeable again after freeze_bdev().
> */
> -int thaw_bdev(struct block_device *bdev, struct super_block *sb)
> +int thaw_bdev(struct block_device *bdev)
> {
> + struct super_block *sb;
> int error = -EINVAL;
>
> mutex_lock(&bdev->bd_fsfreeze_mutex);
> @@ -607,6 +599,7 @@ int thaw_bdev(struct block_device *bdev, struct super_block *sb)
> if (--bdev->bd_fsfreeze_count > 0)
> goto out;
>
> + sb = bdev->bd_fsfreeze_sb;
> if (!sb)
> goto out;
>
> diff --git a/fs/buffer.c b/fs/buffer.c
> index 23f645657488ba..a7595ada9400ff 100644
> --- a/fs/buffer.c
> +++ b/fs/buffer.c
> @@ -523,7 +523,7 @@ static int osync_buffers_list(spinlock_t *lock, struct list_head *list)
>
> void emergency_thaw_bdev(struct super_block *sb)
> {
> - while (sb->s_bdev && !thaw_bdev(sb->s_bdev, sb))
> + while (sb->s_bdev && !thaw_bdev(sb->s_bdev))
> printk(KERN_WARNING "Emergency Thaw on %pg\n", sb->s_bdev);
> }
>
> diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
> index f0381876a7e5b0..524e134324475e 100644
> --- a/fs/ext4/ioctl.c
> +++ b/fs/ext4/ioctl.c
> @@ -624,7 +624,7 @@ static int ext4_shutdown(struct super_block *sb, unsigned long arg)
> case EXT4_GOING_FLAGS_DEFAULT:
> freeze_bdev(sb->s_bdev);
> set_bit(EXT4_FLAGS_SHUTDOWN, &sbi->s_ext4_flags);
> - thaw_bdev(sb->s_bdev, sb);
> + thaw_bdev(sb->s_bdev);
> break;
> case EXT4_GOING_FLAGS_LOGFLUSH:
> set_bit(EXT4_FLAGS_SHUTDOWN, &sbi->s_ext4_flags);
> diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
> index ee861c6d9ff026..a9fc482a0e60a5 100644
> --- a/fs/f2fs/file.c
> +++ b/fs/f2fs/file.c
> @@ -2230,16 +2230,12 @@ static int f2fs_ioc_shutdown(struct file *filp, unsigned long arg)
>
> switch (in) {
> case F2FS_GOING_DOWN_FULLSYNC:
> - sb = freeze_bdev(sb->s_bdev);
> - if (IS_ERR(sb)) {
> - ret = PTR_ERR(sb);
> + ret = freeze_bdev(sb->s_bdev);
> + if (ret)
> goto out;
> - }
> - if (sb) {
> - f2fs_stop_checkpoint(sbi, false);
> - set_sbi_flag(sbi, SBI_IS_SHUTDOWN);
> - thaw_bdev(sb->s_bdev, sb);
> - }
> + f2fs_stop_checkpoint(sbi, false);
> + set_sbi_flag(sbi, SBI_IS_SHUTDOWN);
> + thaw_bdev(sb->s_bdev);
> break;
> case F2FS_GOING_DOWN_METASYNC:
> /* do checkpoint only */
> diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
> index ef1d5bb88b93ab..b7c5783a031c69 100644
> --- a/fs/xfs/xfs_fsops.c
> +++ b/fs/xfs/xfs_fsops.c
> @@ -433,13 +433,10 @@ xfs_fs_goingdown(
> {
> switch (inflags) {
> case XFS_FSOP_GOING_FLAGS_DEFAULT: {
> - struct super_block *sb = freeze_bdev(mp->m_super->s_bdev);
> -
> - if (sb && !IS_ERR(sb)) {
> + if (!freeze_bdev(mp->m_super->s_bdev)) {
> xfs_force_shutdown(mp, SHUTDOWN_FORCE_UMOUNT);
> - thaw_bdev(sb->s_bdev, sb);
> + thaw_bdev(mp->m_super->s_bdev);
> }
> -
> break;
> }
> case XFS_FSOP_GOING_FLAGS_LOGFLUSH:
> diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
> index d9b69bbde5cc54..ebfb4e7c1fd125 100644
> --- a/include/linux/blk_types.h
> +++ b/include/linux/blk_types.h
> @@ -46,6 +46,7 @@ struct block_device {
> int bd_fsfreeze_count;
> /* Mutex for freeze */
> struct mutex bd_fsfreeze_mutex;
> + struct super_block *bd_fsfreeze_sb;
> } __randomize_layout;
>
> /*
> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> index 05b346a68c2eee..12810a19edebc4 100644
> --- a/include/linux/blkdev.h
> +++ b/include/linux/blkdev.h
> @@ -2020,7 +2020,7 @@ static inline int sync_blockdev(struct block_device *bdev)
> #endif
> int fsync_bdev(struct block_device *bdev);
>
> -struct super_block *freeze_bdev(struct block_device *bdev);
> -int thaw_bdev(struct block_device *bdev, struct super_block *sb);
> +int freeze_bdev(struct block_device *bdev);
> +int thaw_bdev(struct block_device *bdev);
>
> #endif /* _LINUX_BLKDEV_H */
> --
> 2.29.2
>
next prev parent reply other threads:[~2020-11-30 17:55 UTC|newest]
Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-28 16:14 merge struct block_device and struct hd_struct v4 Christoph Hellwig
2020-11-28 16:14 ` [PATCH 01/45] blk-cgroup: fix a hd_struct leak in blkcg_fill_root_iostats Christoph Hellwig
2020-11-28 16:14 ` [PATCH 02/45] filemap: consistently use ->f_mapping over ->i_mapping Christoph Hellwig
2020-11-30 9:20 ` Johannes Thumshirn
2020-11-28 16:14 ` [PATCH 03/45] fs: remove get_super_thawed and get_super_exclusive_thawed Christoph Hellwig
2020-11-28 16:14 ` [PATCH 04/45] fs: simplify freeze_bdev/thaw_bdev Christoph Hellwig
2020-11-30 17:55 ` Darrick J. Wong [this message]
2020-11-28 16:14 ` [PATCH 05/45] mtip32xx: remove the call to fsync_bdev on removal Christoph Hellwig
2020-11-30 7:07 ` Hannes Reinecke
2020-11-30 14:48 ` Johannes Thumshirn
2020-11-28 16:14 ` [PATCH 06/45] zram: do not call set_blocksize Christoph Hellwig
2020-11-28 16:14 ` [PATCH 07/45] loop: " Christoph Hellwig
2020-11-30 7:07 ` Hannes Reinecke
2020-11-30 11:26 ` Johannes Thumshirn
2020-11-28 16:14 ` [PATCH 08/45] dm: simplify flush_bio initialization in __send_empty_flush Christoph Hellwig
2020-11-30 7:08 ` Hannes Reinecke
2020-11-28 16:14 ` [PATCH 09/45] dm: remove the block_device reference in struct mapped_device Christoph Hellwig
2020-11-28 16:14 ` [PATCH 10/45] block: remove a duplicate __disk_get_part prototype Christoph Hellwig
2020-11-28 16:14 ` [PATCH 11/45] block: remove a superflous check in blkpg_do_ioctl Christoph Hellwig
2020-11-30 9:20 ` Johannes Thumshirn
2020-11-28 16:14 ` [PATCH 12/45] block: add a bdev_kobj helper Christoph Hellwig
2020-11-28 16:14 ` [PATCH 13/45] block: use disk_part_iter_exit in disk_part_iter_next Christoph Hellwig
2020-11-28 16:14 ` [PATCH 14/45] block: use put_device in put_disk Christoph Hellwig
2020-11-30 7:09 ` Hannes Reinecke
2020-11-28 16:14 ` [PATCH 15/45] block: change the hash used for looking up block devices Christoph Hellwig
2020-11-30 7:10 ` Hannes Reinecke
2020-11-28 16:14 ` [PATCH 16/45] block: switch bdgrab to use igrab Christoph Hellwig
2020-11-30 7:14 ` Hannes Reinecke
2020-11-30 9:09 ` Jan Kara
2020-11-30 14:52 ` Johannes Thumshirn
2020-11-28 16:14 ` [PATCH 17/45] init: refactor name_to_dev_t Christoph Hellwig
2020-11-30 7:15 ` Hannes Reinecke
2020-11-28 16:14 ` [PATCH 18/45] init: refactor devt_from_partuuid Christoph Hellwig
2020-11-30 7:16 ` Hannes Reinecke
2020-11-28 16:14 ` [PATCH 19/45] init: cleanup match_dev_by_uuid and match_dev_by_label Christoph Hellwig
2020-11-30 7:17 ` Hannes Reinecke
2020-11-28 16:14 ` [PATCH 20/45] block: refactor __blkdev_put Christoph Hellwig
2020-11-30 7:17 ` Hannes Reinecke
2020-11-28 16:14 ` [PATCH 21/45] block: refactor blkdev_get Christoph Hellwig
2020-11-30 7:28 ` Hannes Reinecke
2020-11-28 16:14 ` [PATCH 22/45] block: move bdput() to the callers of __blkdev_get Christoph Hellwig
2020-11-30 7:29 ` Hannes Reinecke
2020-11-28 16:14 ` [PATCH 23/45] block: opencode devcgroup_inode_permission Christoph Hellwig
2020-11-30 7:30 ` Hannes Reinecke
2020-11-28 16:14 ` [PATCH 24/45] block: remove i_bdev Christoph Hellwig
2020-11-30 7:31 ` Hannes Reinecke
2020-11-28 16:14 ` [PATCH 25/45] block: simplify bdev/disk lookup in blkdev_get Christoph Hellwig
2020-11-30 7:36 ` Hannes Reinecke
2020-11-30 9:24 ` Jan Kara
2020-12-02 21:52 ` Tejun Heo
2020-11-28 16:14 ` [PATCH 26/45] block: remove ->bd_contains Christoph Hellwig
2020-11-30 7:37 ` Hannes Reinecke
2020-11-28 16:14 ` [PATCH 27/45] block: simplify the block device claiming interface Christoph Hellwig
2020-11-30 7:37 ` Hannes Reinecke
2020-11-28 16:14 ` [PATCH 28/45] block: simplify part_to_disk Christoph Hellwig
2020-11-30 7:38 ` Hannes Reinecke
2020-11-28 16:14 ` [PATCH 29/45] block: initialize struct block_device in bdev_alloc Christoph Hellwig
2020-11-30 7:38 ` Hannes Reinecke
2020-11-28 16:14 ` [PATCH 30/45] block: remove the nr_sects field in struct hd_struct Christoph Hellwig
2020-11-30 7:39 ` Hannes Reinecke
2020-11-30 9:44 ` Jan Kara
2020-11-30 14:51 ` Christoph Hellwig
2020-11-30 15:17 ` Jan Kara
2020-11-28 16:14 ` [PATCH 31/45] block: move disk stat accounting to struct block_device Christoph Hellwig
2020-11-30 7:40 ` Hannes Reinecke
2020-11-28 16:14 ` [PATCH 32/45] block: move the start_sect field " Christoph Hellwig
2020-11-30 7:41 ` Hannes Reinecke
2020-11-28 16:14 ` [PATCH 33/45] block: move the partition_meta_info " Christoph Hellwig
2020-11-30 7:41 ` Hannes Reinecke
2020-11-28 16:14 ` [PATCH 34/45] block: move holder_dir " Christoph Hellwig
2020-11-30 7:42 ` Hannes Reinecke
2020-11-28 16:15 ` [PATCH 35/45] block: move make_it_fail " Christoph Hellwig
2020-11-30 7:43 ` Hannes Reinecke
2020-11-28 16:15 ` [PATCH 36/45] block: move the policy field " Christoph Hellwig
2020-11-30 7:44 ` Hannes Reinecke
2020-11-28 16:15 ` [PATCH 37/45] block: allocate struct hd_struct as part of struct bdev_inode Christoph Hellwig
2020-11-30 7:46 ` Hannes Reinecke
2020-11-30 9:53 ` Jan Kara
2020-11-28 16:15 ` [PATCH 38/45] block: switch partition lookup to use struct block_device Christoph Hellwig
2020-11-30 7:47 ` Hannes Reinecke
2020-11-28 16:15 ` [PATCH 39/45] block: remove the partno field from struct hd_struct Christoph Hellwig
2020-11-30 7:47 ` Hannes Reinecke
2020-11-28 16:15 ` [PATCH 40/45] block: pass a block_device to blk_alloc_devt Christoph Hellwig
2020-11-30 7:48 ` Hannes Reinecke
2020-11-28 16:15 ` [PATCH 41/45] block: pass a block_device to invalidate_partition Christoph Hellwig
2020-11-30 7:49 ` Hannes Reinecke
2020-11-28 16:15 ` [PATCH 42/45] block: switch disk_part_iter_* to use a struct block_device Christoph Hellwig
2020-11-30 7:50 ` Hannes Reinecke
2020-11-30 10:20 ` Jan Kara
2020-11-28 16:15 ` [PATCH 43/45] f2fs: remove a few bd_part checks Christoph Hellwig
2020-11-30 7:50 ` Hannes Reinecke
2020-11-28 16:15 ` [PATCH 44/45] block: merge struct block_device and struct hd_struct Christoph Hellwig
2020-11-30 7:51 ` Hannes Reinecke
2020-11-30 10:29 ` Jan Kara
2020-11-28 16:15 ` [PATCH 45/45] block: stop using bdget_disk for partition 0 Christoph Hellwig
2020-11-30 7:51 ` Hannes Reinecke
2020-11-30 17:19 ` merge struct block_device and struct hd_struct v4 Christoph Hellwig
2020-11-30 17:51 ` Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2020-11-24 13:27 merge struct block_device and struct hd_struct v2 Christoph Hellwig
2020-11-24 13:27 ` [PATCH 04/45] fs: simplify freeze_bdev/thaw_bdev Christoph Hellwig
2020-11-25 6:07 ` Chao Yu
2020-11-25 12:29 ` Jan Kara
2020-11-25 16:22 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201130175526.GA143012@magnolia \
--to=darrick.wong@oracle.com \
--cc=axboe@kernel.dk \
--cc=colyli@suse.de \
--cc=dm-devel@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=jack@suse.com \
--cc=jack@suse.cz \
--cc=johannes.thumshirn@wdc.com \
--cc=josef@toxicpanda.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-mtd@lists.infradead.org \
--cc=snitzer@redhat.com \
--cc=tj@kernel.org \
--cc=yuchao0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).