Skip to contentSkip to conversation

btrfs: fix error handling in btrfs_dev_replace_start

PATCH Superseded [email protected] 2 participants 3 messages Sep 7, 2018 – Sep 14, 2018 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btrfs: fix error handling in btrfs_dev_replace_start

From: Jeff Mahoney <[email protected]>

When we fail to start a transaction in btrfs_dev_replace_start, we leave dev_replace->replace_start set to STARTED but clear ->srcdev and ->tgtdev. Later, that can result in an Oops in btrfs_dev_replace_progress when having state set to STARTED or SUSPENDED implies that ->srcdev is valid.

Also fix error handling when the state is already STARTED or SUSPENDED while starting. That, too, will clear ->srcdev and ->tgtdev even though it doesn't own them. This should be an impossible case to hit since we should be protected by the BTRFS_FS_EXCL_OP bit being set. Let's add an ASSERT there while we're at it.

Fixes e93c89c1aaaaa (Btrfs: add new sources for device replace code)
---
 fs/btrfs/dev-replace.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
fs/btrfs/dev-replace.c +5 -2
index e2ba0419297a..0581c8570a05 100644
@@ -445,6 +445,7 @@ int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
 		break;
 	case BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED:
 	case BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED:
+		ASSERT(0);
 		ret = BTRFS_IOCTL_DEV_REPLACE_RESULT_ALREADY_STARTED;
 		goto leave;
 	}
@@ -487,6 +488,10 @@ int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
 	if (IS_ERR(trans)) {
 		ret = PTR_ERR(trans);
 		btrfs_dev_replace_write_lock(dev_replace);
+		dev_replace->replace_state =
+			BTRFS_IOCTL_DEV_REPLACE_STATE_NEVER_STARTED;
+		dev_replace->srcdev = NULL;
+		dev_replace->tgtdev = NULL;
 		goto leave;
 	}
 
@@ -508,8 +513,6 @@ int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
 	return ret;
 
 leave:
-	dev_replace->srcdev = NULL;
-	dev_replace->tgtdev = NULL;
 	btrfs_dev_replace_write_unlock(dev_replace);
 	btrfs_destroy_dev_replace_tgtdev(fs_info, tgt_device);
 	return ret;
Signature · 1 line
2.12.3
#1 lore raw
Quoted 25 lines · On Thu, Sep 06, 2018 at 03:52:17PM -0400, [email protected] wrote:

From: Jeff Mahoney <[email protected]>

When we fail to start a transaction in btrfs_dev_replace_start, we leave dev_replace->replace_start set to STARTED but clear ->srcdev and ->tgtdev. Later, that can result in an Oops in btrfs_dev_replace_progress when having state set to STARTED or SUSPENDED implies that ->srcdev is valid.

Also fix error handling when the state is already STARTED or SUSPENDED while starting. That, too, will clear ->srcdev and ->tgtdev even though it doesn't own them. This should be an impossible case to hit since we should be protected by the BTRFS_FS_EXCL_OP bit being set. Let's add an ASSERT there while we're at it.

Fixes e93c89c1aaaaa (Btrfs: add new sources for device replace code)
---
 fs/btrfs/dev-replace.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
fs/btrfs/dev-replace.c +0 -0
index e2ba0419297a..0581c8570a05 100644

fs/btrfs/dev-replace.c int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info, · line 448

Quoted 4 lines
fs/btrfs/dev-replace.c +1 -0
@@ -445,6 +445,7 @@ int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
 		break;
 	case BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED:
 	case BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED:
+		ASSERT(0);

I don't like it fixed that way. The asserts get compiled in conditionally, so the behaviour might be differend dending on the config. If the cases are unreachable, then the two cases can be replaced by a default: and return EINVAL.

Otherwise ok.

#2 lore raw
Quoted 21 lines · David Sterba
Quoted 20 lines · On Thu, Sep 06, 2018 at 03:52:17PM -0400, [email protected] wrote:

From: Jeff Mahoney <[email protected]>

When we fail to start a transaction in btrfs_dev_replace_start, we leave dev_replace->replace_start set to STARTED but clear ->srcdev and ->tgtdev. Later, that can result in an Oops in btrfs_dev_replace_progress when having state set to STARTED or SUSPENDED implies that ->srcdev is valid.

Also fix error handling when the state is already STARTED or SUSPENDED while starting. That, too, will clear ->srcdev and ->tgtdev even though it doesn't own them. This should be an impossible case to hit since we should be protected by the BTRFS_FS_EXCL_OP bit being set. Let's add an ASSERT there while we're at it.

Fixes e93c89c1aaaaa (Btrfs: add new sources for device replace code)
---
 fs/btrfs/dev-replace.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
Quoted 14 lines

fs/btrfs/dev-replace.c int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info, · line 448

Quoted 9 lines
fs/btrfs/dev-replace.c +1 -0
index e2ba0419297a..0581c8570a05 100644
@@ -445,6 +445,7 @@ int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
 		break;
 	case BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED:
 	case BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED:
+		ASSERT(0);

I don't like it fixed that way. The asserts get compiled in conditionally, so the behaviour might be differend dending on the config. If the cases are unreachable, then the two cases can be replaced by a default: and return EINVAL.

As this is a minor issue and a matter of cleanup, I'm going to merge the patch as-is because it's a bugfix.