Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

bcachefs: update alloc cursor in early bucket allocator

A recent bug report uncovered a scenario where a filesystem never
runs with freespace_initialized, and therefore the user observes
significantly degraded write performance by virtue of running the
early bucket allocator. The associated bug aside, the primary cause
of the performance drop in this particular instance is that the
early bucket allocator does not update the allocation cursor. This
means that every allocation walks the alloc btree from the first
bucket of the associated device looking for a bucket marked as free
space.

Update the early allocator code to set the alloc cursor to the last
processed position in the tree, similar to how the freelist
allocator behaves. With the alloc_cursor being updated, the retry
logic also needs to be updated to restart from the beginning of the
device when a free bucket is not available between the cursor and
the end of the device. Track the restart position in a first_bucket
variable to make the code a bit more easily readable and consistent
with the freelist allocator.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

authored by

Brian Foster and committed by
Kent Overstreet
e0fb0dcc 385a82f6

+6 -4
+6 -4
fs/bcachefs/alloc_foreground.c
··· 402 402 struct btree_iter iter, citer; 403 403 struct bkey_s_c k, ck; 404 404 struct open_bucket *ob = NULL; 405 - u64 alloc_start = max_t(u64, ca->mi.first_bucket, ca->new_fs_bucket_idx); 406 - u64 alloc_cursor = max(alloc_start, READ_ONCE(ca->alloc_cursor)); 405 + u64 first_bucket = max_t(u64, ca->mi.first_bucket, ca->new_fs_bucket_idx); 406 + u64 alloc_start = max(first_bucket, READ_ONCE(ca->alloc_cursor)); 407 + u64 alloc_cursor = alloc_start; 407 408 int ret; 408 409 409 410 /* ··· 454 453 } 455 454 bch2_trans_iter_exit(trans, &iter); 456 455 456 + alloc_cursor = iter.pos.offset; 457 457 ca->alloc_cursor = alloc_cursor; 458 458 459 459 if (!ob && ret) 460 460 ob = ERR_PTR(ret); 461 461 462 - if (!ob && alloc_cursor > alloc_start) { 463 - alloc_cursor = alloc_start; 462 + if (!ob && alloc_start > first_bucket) { 463 + alloc_cursor = alloc_start = first_bucket; 464 464 goto again; 465 465 } 466 466