Browse Source

btrfs: Fix possible softlock on single core machines

do_chunk_alloc implements a loop checking whether there is a pending
chunk allocation and if so causes the caller do loop. Generally this
loop is executed only once, however testing with btrfs/072 on a single
core vm machines uncovered an extreme case where the system could loop
indefinitely. This is due to a missing cond_resched when loop which
doesn't give a chance to the previous chunk allocator finish its job.

The fix is to simply add the missing cond_resched.

Fixes: 6d74119f1a3e ("Btrfs: avoid taking the chunk_mutex in do_chunk_alloc")
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Nikolay Borisov 7 years ago
parent
commit
1e1c50a929
1 changed files with 1 additions and 0 deletions
  1. 1 0
      fs/btrfs/extent-tree.c

+ 1 - 0
fs/btrfs/extent-tree.c

@@ -4643,6 +4643,7 @@ again:
 	if (wait_for_alloc) {
 	if (wait_for_alloc) {
 		mutex_unlock(&fs_info->chunk_mutex);
 		mutex_unlock(&fs_info->chunk_mutex);
 		wait_for_alloc = 0;
 		wait_for_alloc = 0;
+		cond_resched();
 		goto again;
 		goto again;
 	}
 	}