Skip to contentSkip to conversation

fix async ordered operations flush deadlock

RFC New Josef Bacik 1 participant 1 message Feb 12, 2013 Btrfs file system

lore
Share & tools
lore
#0 lore raw

RFC 1/1 fix async ordered operations flush deadlock

Hello,

So btrfs_commit_transaction does this

ret = btrfs_run_ordered_operations(root, 0);

which async flushes all inodes on the ordered operations list. The problem with this is that we wait for this flushing to finish, so we end up with this

Task 1 Task 2 Task 3

start transaction
set trans_no_join
wait forever
commit
btrfs_run_ordered_operations
async flush inode cow_file_range
join_transaction wait forever
wait forever

Task1 is waiting for the flushint to finish, task 2 is waiting for task 1 to give up its num_writers, and task 3 is waiting to join the transaction. This used to work fine because the flushing was done inline so we just took on the current journal info of the guy who managed to race in and get a ref on the transaction, but now we've gotten rid of that by doing it async. Here is a basic bullshit patch that just moves the flushing below the "is somebody else committing right now?" logic which will hopefully fix the problem, but it's a shit patch but its 5:10 and I need to go make Liam dinner. I'll try to think of a better solution between now and tomorrow, but I'm open to suggestions. Thanks,

Josef

fs/btrfs/transaction.c +4 -7
index 49c79b3..8c50495 100644
@@ -1480,13 +1480,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
 	int should_grow = 0;
 	unsigned long now = get_seconds();
 
-	ret = btrfs_run_ordered_operations(root, 0);
-	if (ret) {
-		btrfs_abort_transaction(trans, root, ret);
-		btrfs_end_transaction(trans, root);
-		return ret;
-	}
-
 	/* Stop the commit early if ->aborted is set */
 	if (unlikely(ACCESS_ONCE(cur_trans->aborted))) {
 		ret = cur_trans->aborted;
@@ -1541,6 +1534,10 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
 	spin_unlock(&cur_trans->commit_lock);
 	wake_up(&root->fs_info->transaction_blocked_wait);
 
+	ret = btrfs_run_ordered_operations(root, 0);
+	if (ret)
+		goto cleanup_transaction;
+
 	spin_lock(&root->fs_info->trans_lock);
 	if (cur_trans->list.prev != &root->fs_info->trans_list) {
 		prev_trans = list_entry(cur_trans->list.prev,