@@ -1123,6 +1123,7 @@ struct btrfs_fs_info {
spinlock_t eb_leak_lock;
struct list_head allocated_ebs;
+ int fail_stage;
#endif
};
@@ -3013,6 +3013,7 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_info)
INIT_LIST_HEAD(&fs_info->allocated_roots);
INIT_LIST_HEAD(&fs_info->allocated_ebs);
spin_lock_init(&fs_info->eb_leak_lock);
+ fs_info->fail_stage = -1;
#endif
extent_map_tree_init(&fs_info->mapping_tree);
btrfs_init_block_rsv(&fs_info->global_block_rsv,
@@ -3922,6 +3923,19 @@ int __cold open_ctree(struct super_block *sb, char *options)
if (ret < 0)
goto fail;
open_ctree_res[i] = true;
+#ifdef CONFIG_BTRFS_DEBUG
+ /*
+ * This is not the best timing, as fail_stage will only be
+ * initialized after open_ctree_features_init().
+ * But this is still better to cover more error paths.
+ */
+ if (fs_info->fail_stage >= 0 && i >= fs_info->fail_stage) {
+ btrfs_info(fs_info,
+ "error injected at open ctree stage %u", i);
+ ret = -ECANCELED;
+ goto fail;
+ }
+#endif
}
if (btrfs_build_ref_tree(fs_info))
@@ -447,6 +447,7 @@ enum {
Opt_enospc_debug, Opt_noenospc_debug,
#ifdef CONFIG_BTRFS_DEBUG
Opt_fragment_data, Opt_fragment_metadata, Opt_fragment_all,
+ Opt_fail_mount,
#endif
#ifdef CONFIG_BTRFS_FS_REF_VERIFY
Opt_ref_verify,
@@ -521,6 +522,7 @@ static const match_table_t tokens = {
{Opt_fragment_data, "fragment=data"},
{Opt_fragment_metadata, "fragment=metadata"},
{Opt_fragment_all, "fragment=all"},
+ {Opt_fail_mount, "fail_mount=%u"},
#endif
#ifdef CONFIG_BTRFS_FS_REF_VERIFY
{Opt_ref_verify, "ref_verify"},
@@ -1106,6 +1108,17 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options,
btrfs_info(info, "fragmenting data");
btrfs_set_opt(info->mount_opt, FRAGMENT_DATA);
break;
+ case Opt_fail_mount:
+ ret = match_int(&args[0], &intarg);
+ if (ret) {
+ btrfs_err(info, "unrecognized fail_mount value %s",
+ args[0].from);
+ goto out;
+ }
+ btrfs_info(info, "fail mount at open_ctree() stage %u",
+ intarg);
+ info->fail_stage = intarg;
+ break;
#endif
#ifdef CONFIG_BTRFS_FS_REF_VERIFY
case Opt_ref_verify:
With the new open_ctree_seq[] array, we can afford a debug mount option to do all the error inject at different stages to have a much better coverage for the error path. The new "fail_mount=%u" mount option will be hidden behind CONFIG_BTRFS_DEBUG option, and when enabled it will cause mount failure just after the init function of specified stage. This can be verified by the following script: mkfs.btrfs -f $dev for (( i=0;; i++ )) do mount -o fail_mount=$i $dev $mnt ret=$? if [ $ret -eq 0 ]; then umount $mnt exit fi done umount $mnt Signed-off-by: Qu Wenruo <wqu@suse.com> --- fs/btrfs/ctree.h | 1 + fs/btrfs/disk-io.c | 14 ++++++++++++++ fs/btrfs/super.c | 13 +++++++++++++ 3 files changed, 28 insertions(+)