FAILED: patch "[PATCH] btrfs: enhance unsupported compat RO flags handling" failed to apply to 5.10-stable tree

The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

81d5d61454c3 ("btrfs: enhance unsupported compat RO flags handling") dfe8aec4520b ("btrfs: add a btrfs_block_group_root() helper") b6e9f16c5fda ("btrfs: replace open coded while loop with proper construct") 42437a6386ff ("btrfs: introduce mount option rescue=ignorebadroots")

68319c18cb21 ("btrfs: show rescue=usebackuproot in /proc/mounts") ab0b4a3ebf14 ("btrfs: add a helper to print out rescue= options") ceafe3cc3992 ("btrfs: sysfs: export supported rescue= mount options") 334c16d82cfe ("btrfs: push the NODATASUM check into btrfs_lookup_bio_sums") d70bf7484f72 ("btrfs: unify the ro checking for mount options")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 81d5d61454c365718655cfc87d8200c84e25d596 Mon Sep 17 00:00:00 2001
From: Qu Wenruo <[email protected]>
Date: Tue, 9 Aug 2022 13:02:16 +0800
Subject: [PATCH] btrfs: enhance unsupported compat RO flags handling

Currently there are two corner cases not handling compat RO flags correctly:

- Remount
We can still mount the fs RO with compat RO flags, then remount it RW. We should not allow any write into a fs with unsupported RO flags.

- Still try to search block group items
In fact, behavior/on-disk format change to extent tree should not need a full incompat flag.

And since we can ensure fs with unsupported RO flags never got any writes (with above case fixed), then we can even skip block group items search at mount time.

This patch will enhance the unsupported RO compat flags by:

- Reject read-write remount if there are unsupported RO compat flags

- Go dummy block group items directly for unsupported RO compat flags In fact, only changes to chunk/subvolume/root/csum trees should go incompat flags.

The latter part should allow future change to extent tree to be compat RO flags.

Thus this patch also needs to be backported to all stable trees.

CC [email protected] # 4.9+

Reviewed-by Nikolay Borisov <[email protected]>

Signed-off-by Qu Wenruo <[email protected]>

Reviewed-by David Sterba <[email protected]>

Signed-off-by David Sterba <[email protected]>

fs/btrfs/block-group.c +10 -1

index 53c44c52cb79..e7b5a54c8258 100644
@@ -2164,7 +2164,16 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info)
  	int need_clear = 0;
  	u64 cache_gen;
 
-	if (!root)
+	/*
+	 * Either no extent root (with ibadroots rescue option) or we have
+	 * unsupported RO options. The fs can never be mounted read-write, so no
+	 * need to waste time searching block group items.
+	 *
+	 * This also allows new extent tree related changes to be RO compat,
+	 * no need for a full incompat flag.
+	 */
+	if (!root || (btrfs_super_compat_ro_flags(info->super_copy) &
+		      ~BTRFS_FEATURE_COMPAT_RO_SUPP))
  		return fill_dummy_bgs(info);
 
  	key.objectid = 0;

fs/btrfs/super.c +9 -0

index 7291e9d67e92..eb0ae7e396ef 100644
@@ -2117,6 +2117,15 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data)
  			ret = -EINVAL;
  			goto restore;
  		}
+		if (btrfs_super_compat_ro_flags(fs_info->super_copy) &
+		    ~BTRFS_FEATURE_COMPAT_RO_SUPP) {
+			btrfs_err(fs_info,
+		"can not remount read-write due to unsupported optional flags 0x%llx",
+				btrfs_super_compat_ro_flags(fs_info->super_copy) &
+				~BTRFS_FEATURE_COMPAT_RO_SUPP);
+			ret = -EINVAL;
+			goto restore;
+		}
  		if (fs_info->fs_devices->rw_devices == 0) {
  			ret = -EACCES;
  			goto restore;

Quoted 6 lines · On 2022/10/16 20:24, [email protected] wrote:

The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 6 lines

Possible dependencies:

81d5d61454c3 ("btrfs: enhance unsupported compat RO flags handling") dfe8aec4520b ("btrfs: add a btrfs_block_group_root() helper") b6e9f16c5fda ("btrfs: replace open coded while loop with proper construct") 42437a6386ff ("btrfs: introduce mount option rescue=ignorebadroots")

Hi Greg and btrfs guys,

I'm not confident enough to continue backporting this patch (and its dependency) for older branches.

This patch itself relies on the new function fill_dummy_bgs() to skip the full block group items search.

That function is the core functionality to allow us to mount fses read-only with unsupported compat_ro flags.

But if we backport 42437a6386ff ("btrfs: introduce mount option rescue=ignorebadroots"), we need the "rescue=" mount option series, which can be super large, especially for older and older branches.

The other solution is to still implement that fill_dummy_bgs(), but not introducing the "rescue=" mount option.
This means, we will have some moderate changes to 42437a6386ff ("btrfs:
introduce mount option rescue=ignorebadroots"), but at least no full dependency on the "rescue=" mount options.

I'm wondering which solution would be more acceptable from the POV of stable kernels?

Quoted 37 lines · Qu Wenruo

Quoted 6 lines · On 2022/10/16 20:24, [email protected] wrote:

The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 6 lines

Possible dependencies:

81d5d61454c3 ("btrfs: enhance unsupported compat RO flags handling") dfe8aec4520b ("btrfs: add a btrfs_block_group_root() helper") b6e9f16c5fda ("btrfs: replace open coded while loop with proper construct") 42437a6386ff ("btrfs: introduce mount option rescue=ignorebadroots")

Hi Greg and btrfs guys,

I'm not confident enough to continue backporting this patch (and its dependency) for older branches.

This patch itself relies on the new function fill_dummy_bgs() to skip the full block group items search.

That function is the core functionality to allow us to mount fses read-only with unsupported compat_ro flags.

But if we backport 42437a6386ff ("btrfs: introduce mount option rescue=ignorebadroots"), we need the "rescue=" mount option series, which can be super large, especially for older and older branches.

The other solution is to still implement that fill_dummy_bgs(), but not introducing the "rescue=" mount option.
This means, we will have some moderate changes to 42437a6386ff ("btrfs:
introduce mount option rescue=ignorebadroots"), but at least no full dependency on the "rescue=" mount options.

Quoted 2 lines

I'm wondering which solution would be more acceptable from the POV of stable kernels?

First off, is this really needed in older kernels? It was marked as such, but that's up to you all to decide if it's true or not.

So I'll defer to you and the btrfs maintainers on what to do, just let us know.

thanks,

greg k-h