xfs: fix number of GC bvecs
PATCH 1/1 xfs: fix number of GC bvecs
GC scratch allocations can wrap around and use the same buffer twice, and the current code fails to account for that. So far this worked due to rounding in the block layer, but changes to the bio allocator drop the over-provisioning and generic/256 or generic/361 will not usually fail when running against the current block tree.
Simply the allocation to always pass the maximum value that is easier to verify, as a saving of up to one bvec per allocation isn't worth the effort to verify a complicated calculated value.
--- fs/xfs/xfs_zone_gc.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
fs/xfs/xfs_zone_gc.c +10 -9
@@ -670,7 +670,6 @@ xfs_zone_gc_start_chunk(struct xfs_inode *ip;struct bio *bio;xfs_daddr_t daddr; -unsigned int len;bool is_seq;if (xfs_is_shutdown (mp))
@@ -685,15 +684,16 @@ xfs_zone_gc_start_chunk(return false; } - len =XFS_FSB_TO_B (mp, irec.rm_blockcount); - bio =bio_alloc_bioset (bdev, -min (howmany (len,XFS_GC_BUF_SIZE ) +1 ,XFS_GC_NR_BUFS ), -REQ_OP_READ ,GFP_NOFS , &data->bio_set); - +/* +* Scratch allocation can wrap around to the same buffer again, +* provision an extra bvec for that case. +*/ + bio =bio_alloc_bioset (bdev,XFS_GC_NR_BUFS +1 ,REQ_OP_READ ,GFP_NOFS , + &data->bio_set); chunk = container_of(bio, struct xfs_gc_bio, bio); chunk->ip = ip; chunk->offset =XFS_FSB_TO_B (mp, irec.rm_offset); - chunk->len = len; + chunk->len =XFS_FSB_TO_B (mp, irec.rm_blockcount); chunk->old_startblock =xfs_rgbno_to_rtb (iter->victim_rtg, irec.rm_startblock); chunk->new_daddr = daddr;
@@ -707,8 +707,9 @@ xfs_zone_gc_start_chunk( bio->bi_iter.bi_sector =xfs_rtb_to_daddr (mp, chunk->old_startblock); bio->bi_end_io = xfs_zone_gc_end_io;xfs_zone_gc_add_data (chunk); - data->scratch_head = (data->scratch_head + len) % data->scratch_size; - data->scratch_available -= len; + data->scratch_head = + (data->scratch_head + chunk->len) % data->scratch_size; + data->scratch_available -= chunk->len;XFS_STATS_INC (mp, xs_gc_read_calls);
Signature · 1 line
2.47.3
Quoted 7 lines · Christoph Hellwig
GC scratch allocations can wrap around and use the same buffer twice, and the current code fails to account for that. So far this worked due to rounding in the block layer, but changes to the bio allocator drop the over-provisioning and generic/256 or generic/361 will not usually fail when running against the current block tree.
Simply the allocation to always pass the maximum value that is easier to
s/Simply/Simplify
Quoted 5 lines
verify, as a saving of up to one bvec per allocation isn't worth the effort to verify a complicated calculated value.
Fixes 102f444b57b3 ("xfs: rework zone GC buffer management")Signed-off-by Christoph Hellwig <[email protected]>
Looks OK to me.
Signature · 2 lines
Damien Le Moal Western Digital Research
Quoted 5 lines · Christoph Hellwig
GC scratch allocations can wrap around and use the same buffer twice, and the current code fails to account for that. So far this worked due to rounding in the block layer, but changes to the bio allocator drop the over-provisioning and generic/256 or generic/361 will not usually fail when running against the current block tree.
I have a hard time understanding the "will not usually fail" part, but apart from that, the patch looks good:
Quoted 58 lines
Simply the allocation to always pass the maximum value that is easier to verify, as a saving of up to one bvec per allocation isn't worth the effort to verify a complicated calculated value.
Fixes 102f444b57b3 ("xfs: rework zone GC buffer management")Signed-off-by Christoph Hellwig <[email protected]>--- fs/xfs/xfs_zone_gc.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)fs/xfs/xfs_zone_gc.c +10
-9@@ -670,7 +670,6 @@ xfs_zone_gc_start_chunk(struct xfs_inode *ip;struct bio *bio;xfs_daddr_t daddr; -unsigned int len;bool is_seq;if (xfs_is_shutdown (mp))@@ -685,15 +684,16 @@ xfs_zone_gc_start_chunk(return false; } - len =XFS_FSB_TO_B (mp, irec.rm_blockcount); - bio =bio_alloc_bioset (bdev, -min (howmany (len,XFS_GC_BUF_SIZE ) +1 ,XFS_GC_NR_BUFS ), -REQ_OP_READ ,GFP_NOFS , &data->bio_set); - +/* +* Scratch allocation can wrap around to the same buffer again, +* provision an extra bvec for that case. +*/ + bio =bio_alloc_bioset (bdev,XFS_GC_NR_BUFS +1 ,REQ_OP_READ ,GFP_NOFS , + &data->bio_set); chunk = container_of(bio, struct xfs_gc_bio, bio); chunk->ip = ip; chunk->offset =XFS_FSB_TO_B (mp, irec.rm_offset); - chunk->len = len; + chunk->len =XFS_FSB_TO_B (mp, irec.rm_blockcount); chunk->old_startblock =xfs_rgbno_to_rtb (iter->victim_rtg, irec.rm_startblock); chunk->new_daddr = daddr;@@ -707,8 +707,9 @@ xfs_zone_gc_start_chunk( bio->bi_iter.bi_sector =xfs_rtb_to_daddr (mp, chunk->old_startblock); bio->bi_end_io = xfs_zone_gc_end_io;xfs_zone_gc_add_data (chunk); - data->scratch_head = (data->scratch_head + len) % data->scratch_size; - data->scratch_available -= len; + data->scratch_head = + (data->scratch_head + chunk->len) % data->scratch_size; + data->scratch_available -= chunk->len;XFS_STATS_INC (mp, xs_gc_read_calls);
Quoted 9 lines · Hans Holmberg
Quoted 5 lines · Christoph Hellwig
GC scratch allocations can wrap around and use the same buffer twice, and the current code fails to account for that. So far this worked due to rounding in the block layer, but changes to the bio allocator drop the over-provisioning and generic/256 or generic/361 will not usually fail when running against the current block tree.
I have a hard time understanding the "will not usually fail" part, but apart from that, the patch looks good:
The not should be a now.
Hello Christoph,
Quoted 3 lines · Christoph Hellwig
GC scratch allocations can wrap around and use the same buffer twice, and the current code fails to account for that. So far this worked due to rounding in the block layer, but changes to the bio allocator drop the
Which change in the bio allocator?
If it is a commit that has landed already, I think it would be nice to mention the commit in the usual "commit + 12 character SHA1" format.
If it is a change in a series that has not landed yet, it would be nice if you could provide a link to the series, e.g. after the commit log (after the "---").
Kind regards,
Niklas
Quoted 11 lines · Niklas Cassel
Hello Christoph,
Quoted 3 lines · Christoph Hellwig
GC scratch allocations can wrap around and use the same buffer twice, and the current code fails to account for that. So far this worked due to rounding in the block layer, but changes to the bio allocator drop the
Which change in the bio allocator?
If it is a commit that has landed already, I think it would be nice to mention the commit in the usual "commit + 12 character SHA1" format.
We can't reference the other trees as we can't guarantee a stable commit ID before it hits mainline.