Skip to contentSkip to conversation

btrfs: don't BUG_ON() NOCOW ordered-extents with checksum list

PATCH Superseded Johannes Thumshirn 3 participants 3 messages Oct 4, 2024 Btrfs file system

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btrfs: don't BUG_ON() NOCOW ordered-extents with checksum list

From: Johannes Thumshirn <[email protected]>

Curretnly we BUG_ON() in btrfs_finish_one_ordered() if we finishing an ordered-extent that is flagged as NOCOW, but it's checsum list is non-empty.

This is clearly a logic error which we can recover from by aborting the transaction.

For developer builds which enable CONFIG_BTRFS_ASSERT, also ASSERT() that the list is empty.

---
 fs/btrfs/inode.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
fs/btrfs/inode.c +4 -1
index 103ec917ca9d..19ba101dc09c 100644
@@ -3088,7 +3088,10 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)
 
 	if (test_bit(BTRFS_ORDERED_NOCOW, &ordered_extent->flags)) {
 		/* Logic error */
-		BUG_ON(!list_empty(&ordered_extent->list));
+		if (list_empty(&ordered_extent->list)) {
+			ASSERT(list_empty(&ordered_extent->list));
+			btrfs_abort_transaction(trans, -EINVAL);
+		}
 
 		btrfs_inode_safe_disk_i_size_write(inode, 0);
 		ret = btrfs_update_inode_fallback(trans, inode);
Signature · 1 line
2.43.0
#1 lore raw
Quoted 22 lines · Johannes Thumshirn

From: Johannes Thumshirn <[email protected]>

Curretnly we BUG_ON() in btrfs_finish_one_ordered() if we finishing an ordered-extent that is flagged as NOCOW, but it's checsum list is non-empty.

This is clearly a logic error which we can recover from by aborting the transaction.

For developer builds which enable CONFIG_BTRFS_ASSERT, also ASSERT() that the list is empty.

---
  fs/btrfs/inode.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
fs/btrfs/inode.c +0 -0
index 103ec917ca9d..19ba101dc09c 100644

fs/btrfs/inode.c int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent) · line 3092

Quoted 6 lines
fs/btrfs/inode.c +2 -1
@@ -3088,7 +3088,10 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)
 
  	if (test_bit(BTRFS_ORDERED_NOCOW, &ordered_extent->flags)) {
  		/* Logic error */
-		BUG_ON(!list_empty(&ordered_extent->list));
+		if (list_empty(&ordered_extent->list)) {
+			ASSERT(list_empty(&ordered_extent->list));

Will the ASSERT() really get triggered? We just checked the same list_empty() one line before.

I guess you mean ASSERT(!list_empty()) instead?

Otherwise changing it to ASSERT() and btrfs_abort_transaction() looks good to me.

Thanks,
Qu

Quoted 5 lines
fs/btrfs/inode.c +2 -0
+			btrfs_abort_transaction(trans, -EINVAL);
+		}
 
  		btrfs_inode_safe_disk_i_size_write(inode, 0);
  		ret = btrfs_update_inode_fallback(trans, inode);
#2 lore raw
Quoted 35 lines · Qu Wenruo
Quoted 22 lines · Johannes Thumshirn

From: Johannes Thumshirn <[email protected]>

Curretnly we BUG_ON() in btrfs_finish_one_ordered() if we finishing an ordered-extent that is flagged as NOCOW, but it's checsum list is non-empty.

This is clearly a logic error which we can recover from by aborting the transaction.

For developer builds which enable CONFIG_BTRFS_ASSERT, also ASSERT() that the list is empty.

---
   fs/btrfs/inode.c | 5 ++++-
   1 file changed, 4 insertions(+), 1 deletion(-)
fs/btrfs/inode.c +0 -0
index 103ec917ca9d..19ba101dc09c 100644

fs/btrfs/inode.c int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent) · line 3092

Quoted 6 lines
fs/btrfs/inode.c +2 -1
@@ -3088,7 +3088,10 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)
 
   	if (test_bit(BTRFS_ORDERED_NOCOW, &ordered_extent->flags)) {
   		/* Logic error */
-		BUG_ON(!list_empty(&ordered_extent->list));
+		if (list_empty(&ordered_extent->list)) {
+			ASSERT(list_empty(&ordered_extent->list));

Will the ASSERT() really get triggered? We just checked the same list_empty() one line before.

Quoted 4 lines

I guess you mean ASSERT(!list_empty()) instead?

Otherwise changing it to ASSERT() and btrfs_abort_transaction() looks good to me.

Of cause you're right! Seems like I need more coffee.