Route opens through fs_bdev_file_open_by_path() so each external device is registered against the correct superblock, and convert the matching releases.
Signed-off-by: Christian Brauner (Amutable) <[email protected]> --- fs/erofs/data.c | 6 +++++ fs/erofs/internal.h | 10 ++++++++ fs/erofs/super.c | 66 +++++++++++++++++++++++++++++++++++++++++++---------- fs/erofs/zdata.c | 10 +++++--- 4 files changed, 77 insertions(+), 15 deletions(-) diff --git a/fs/erofs/data.c b/fs/erofs/data.c index 44da21c9d777..5220585293df 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -69,6 +69,9 @@ int erofs_init_metabuf(struct erofs_buf *buf, struct super_block *sb, { struct erofs_sb_info *sbi = EROFS_SB(sb); + if (erofs_is_shutdown(sb)) + return -EIO; + buf->file = NULL; if (in_metabox) { if (unlikely(!sbi->metabox_inode)) @@ -236,6 +239,9 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map) } up_read(&devs->rwsem); } + if (erofs_is_shutdown(sb) || + (map->m_dif && READ_ONCE(map->m_dif->dead))) + return -EIO; return 0; } diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 4792490161ec..ca1ed7ce3961 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -48,6 +48,7 @@ struct erofs_device_info { erofs_blk_t blocks; erofs_blk_t uniaddr; + bool dead; /* backing device gone; fence I/O */ }; enum { @@ -104,6 +105,7 @@ struct erofs_xattr_prefix_item { struct erofs_sb_info { struct erofs_device_info dif0; struct erofs_mount_opts opt; /* options */ + unsigned long flags; /* see EROFS_SB_* */ #ifdef CONFIG_EROFS_FS_ZIP /* list for all registered superblocks, mainly for shrinker */ struct list_head list; @@ -195,6 +197,14 @@ static inline bool erofs_is_fscache_mode(struct super_block *sb) !erofs_is_fileio_mode(EROFS_SB(sb)) && !sb->s_bdev; } +/* erofs_sb_info->flags */ +#define EROFS_SB_SHUTDOWN 0 /* primary device gone; fail all I/O */ + +static inline bool erofs_is_shutdown(struct super_block *sb) +{ + return test_bit(EROFS_SB_SHUTDOWN, &EROFS_SB(sb)->flags); +} + enum { EROFS_ZIP_CACHE_DISABLED, EROFS_ZIP_CACHE_READAHEAD, diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 802add6652fd..e03cb95be96b 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -153,8 +153,8 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb, } else if (!sbi->devs->flatdev) { file = erofs_is_fileio_mode(sbi) ? filp_open(dif->path, O_RDONLY | O_LARGEFILE, 0) : - bdev_file_open_by_path(dif->path, - BLK_OPEN_READ, sb->s_type, NULL); + fs_bdev_file_open_by_path(dif->path, + BLK_OPEN_READ, sb->s_type, sb); if (IS_ERR(file)) { if (file == ERR_PTR(-ENOTBLK)) return -EINVAL; @@ -843,11 +843,16 @@ static int erofs_fc_reconfigure(struct fs_context *fc) static int erofs_release_device_info(int id, void *ptr, void *data) { + struct super_block *sb = data; struct erofs_device_info *dif = ptr; fs_put_dax(dif->dax_dev, NULL); - if (dif->file) - fput(dif->file); + if (dif->file) { + if (S_ISBLK(file_inode(dif->file)->i_mode)) + fs_bdev_file_release(dif->file, sb); + else + fput(dif->file); + } erofs_fscache_unregister_cookie(dif->fscache); dif->fscache = NULL; kfree(dif->path); @@ -855,18 +860,19 @@ static int erofs_release_device_info(int id, void *ptr, void *data) return 0; } -static void erofs_free_dev_context(struct erofs_dev_context *devs) +static void erofs_free_dev_context(struct erofs_dev_context *devs, + struct super_block *sb) { if (!devs) return; - idr_for_each(&devs->tree, &erofs_release_device_info, NULL); + idr_for_each(&devs->tree, &erofs_release_device_info, sb); idr_destroy(&devs->tree); kfree(devs); } -static void erofs_sb_free(struct erofs_sb_info *sbi) +static void erofs_sb_free(struct erofs_sb_info *sbi, struct super_block *sb) { - erofs_free_dev_context(sbi->devs); + erofs_free_dev_context(sbi->devs, sb); kfree(sbi->fsid); kfree_sensitive(sbi->domain_id); if (sbi->dif0.file) @@ -879,8 +885,13 @@ static void erofs_fc_free(struct fs_context *fc) { struct erofs_sb_info *sbi = fc->s_fs_info; - if (sbi) /* free here if an error occurs before transferring to sb */ - erofs_sb_free(sbi); + /* + * Freed here only if an error occurs before the sb is set up; at that + * point no block-backed device has been claimed (that happens in + * fill_super), so the NULL sb never reaches fs_bdev_file_release(). + */ + if (sbi) + erofs_sb_free(sbi, NULL); } static const struct fs_context_operations erofs_context_ops = { @@ -936,7 +947,7 @@ static void erofs_kill_sb(struct super_block *sb) erofs_drop_internal_inodes(sbi); fs_put_dax(sbi->dif0.dax_dev, NULL); erofs_fscache_unregister_fs(sb); - erofs_sb_free(sbi); + erofs_sb_free(sbi, sb); sb->s_fs_info = NULL; } @@ -948,7 +959,7 @@ static void erofs_put_super(struct super_block *sb) erofs_shrinker_unregister(sb); erofs_xattr_prefixes_cleanup(sb); erofs_drop_internal_inodes(sbi); - erofs_free_dev_context(sbi->devs); + erofs_free_dev_context(sbi->devs, sb); sbi->devs = NULL; erofs_fscache_unregister_fs(sb); } @@ -1121,6 +1132,35 @@ static void erofs_evict_inode(struct inode *inode) clear_inode(inode); } +/* + * A blob device may back several erofs superblocks; fence only the affected + * one and keep the rest of the mount alive. The primary device falls back to + * the generic teardown (return non-zero). + */ +static int erofs_remove_bdev(struct super_block *sb, struct block_device *bdev) +{ + struct erofs_dev_context *devs = EROFS_SB(sb)->devs; + struct erofs_device_info *dif; + int id; + + if (bdev == sb->s_bdev) + return 1; + + down_read(&devs->rwsem); + idr_for_each_entry(&devs->tree, dif, id) { + if (dif->file && S_ISBLK(file_inode(dif->file)->i_mode) && + file_bdev(dif->file)->bd_dev == bdev->bd_dev) + WRITE_ONCE(dif->dead, true); + } + up_read(&devs->rwsem); + return 0; +} + +static void erofs_shutdown(struct super_block *sb) +{ + set_bit(EROFS_SB_SHUTDOWN, &EROFS_SB(sb)->flags); +} + const struct super_operations erofs_sops = { .put_super = erofs_put_super, .alloc_inode = erofs_alloc_inode, @@ -1128,6 +1168,8 @@ const struct super_operations erofs_sops = { .evict_inode = erofs_evict_inode, .statfs = erofs_statfs, .show_options = erofs_show_options, + .remove_bdev = erofs_remove_bdev, + .shutdown = erofs_shutdown, }; module_init(erofs_module_init); diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c index 43bb5a6a9924..89ae91935364 100644 --- a/fs/erofs/zdata.c +++ b/fs/erofs/zdata.c @@ -1697,11 +1697,15 @@ static void z_erofs_submit_queue(struct z_erofs_frontend *f, continue; } - /* no device id here, thus it will always succeed */ mdev = (struct erofs_map_dev) { .m_pa = round_down(pcl->pos, sb->s_blocksize), }; - (void)erofs_map_dev(sb, &mdev); + if (erofs_map_dev(sb, &mdev)) { + /* the backing device is gone; fail the batch */ + q[JQ_SUBMIT]->eio = true; + qtail[JQ_SUBMIT] = &pcl->next; + continue; + } cur = mdev.m_pa; end = round_up(cur + pcl->pageofs_in + pcl->pclustersize, @@ -1785,7 +1789,7 @@ static void z_erofs_submit_queue(struct z_erofs_frontend *f, * although background is preferred, no one is pending for submission. * don't issue decompression but drop it directly instead. */ - if (!*force_fg && !nr_bios) { + if (!*force_fg && !nr_bios && !q[JQ_SUBMIT]->eio) { kvfree(q[JQ_SUBMIT]); return; } -- 2.47.3
