Skip to contentSkip to conversation

btrfs: Add assert to catch nested transaction commit

PATCH In review Nikolay Borisov 3 participants 3 messages Sep 12, 2019 – Sep 23, 2019 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btrfs: Add assert to catch nested transaction commit

A recent patch to btrfs showed that there was at least 1 case where a nesed transaction was committed. Nested transaction in this case means a code which has a transaction handle calls some function which in turn obtains a copy of the same transaction handle. In such cases the correct thing to do is for the lower callee to call btrfs_end_transaction which contains appropriate checks so as to not commit the transaction which will result in stale trans handler for the caller.

To catch such cases add an assert in btrfs_commit_transaction ensuring btrfs_trans_handle::use_count is always 1.

---

A full xfs test run didn't trigger this assert.

 fs/btrfs/transaction.c | 2 ++
 1 file changed, 2 insertions(+)
fs/btrfs/transaction.c +2 -0
index 8624bdee8c5b..8b75426c349e 100644
@@ -1949,6 +1949,8 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)
 	struct btrfs_transaction *prev_trans = NULL;
 	int ret;
 
+	ASSERT(refcount_read(&trans->use_count) == 1);
+
 	/* Stop the commit early if ->aborted is set */
 	if (unlikely(READ_ONCE(cur_trans->aborted))) {
 		ret = cur_trans->aborted;
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Nikolay Borisov

A recent patch to btrfs showed that there was at least 1 case where a nesed transaction was committed. Nested transaction in this case means a code which has a transaction handle calls some function which in turn obtains a copy of the same transaction handle. In such cases the correct thing to do is for the lower callee to call btrfs_end_transaction which contains appropriate checks so as to not commit the transaction which will result in stale trans handler for the caller.

Quoted 4 lines

To catch such cases add an assert in btrfs_commit_transaction ensuring btrfs_trans_handle::use_count is always 1.

Thanks,

Josef

#2 lore raw
In reply to Nikolay Borisov
Quoted 8 lines · Nikolay Borisov

A recent patch to btrfs showed that there was at least 1 case where a nesed transaction was committed. Nested transaction in this case means a code which has a transaction handle calls some function which in turn obtains a copy of the same transaction handle. In such cases the correct thing to do is for the lower callee to call btrfs_end_transaction which contains appropriate checks so as to not commit the transaction which will result in stale trans handler for the caller.

Quoted 4 lines

To catch such cases add an assert in btrfs_commit_transaction ensuring btrfs_trans_handle::use_count is always 1.

Added to misc-next, thanks.