github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 08:33:17 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

xfs: refactor zone reset handling

Browse Source 
Include the actual bio submission in the common zone reset handler to
share more code and prepare for adding error injection for zone reset.

Note the I plan to refactor the block layer submit_bio_wait and
bio_await_chain code in the next merge window to remove some of the
code duplication added here.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Hans Holmberg <hans.holmberg@wdc.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
This commit is contained in:
Christoph Hellwig 2026-01-30 06:19:23 +01:00 committed by Carlos Maiolino
parent 32ae9b893a
commit 06873dbd94
1 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
fs/xfs/xfs_zone_gc.c
View File

@ -893,40 +893,55 @@ xfs_zone_gc_finish_reset(
bio_put(&chunk->bio); bio_put(&chunk->bio);
} }
static bool static void
xfs_zone_gc_prepare_reset( xfs_submit_zone_reset_bio(
struct bio *bio, struct xfs_rtgroup *rtg,
struct xfs_rtgroup *rtg) struct bio *bio)
{ {
trace_xfs_zone_reset(rtg); trace_xfs_zone_reset(rtg);
ASSERT(rtg_rmap(rtg)->i_used_blocks == 0); ASSERT(rtg_rmap(rtg)->i_used_blocks == 0);
bio->bi_iter.bi_sector = xfs_gbno_to_daddr(&rtg->rtg_group, 0); bio->bi_iter.bi_sector = xfs_gbno_to_daddr(&rtg->rtg_group, 0);
if (!bdev_zone_is_seq(bio->bi_bdev, bio->bi_iter.bi_sector)) { if (!bdev_zone_is_seq(bio->bi_bdev, bio->bi_iter.bi_sector)) {
if (!bdev_max_discard_sectors(bio->bi_bdev)) /*
return false; * Also use the bio to drive the state machine when neither
* zone reset nor discard is supported to keep things simple.
*/
if (!bdev_max_discard_sectors(bio->bi_bdev)) {
bio_endio(bio);
return;
}
bio->bi_opf &= ~REQ_OP_ZONE_RESET; bio->bi_opf &= ~REQ_OP_ZONE_RESET;
bio->bi_opf |= REQ_OP_DISCARD; bio->bi_opf |= REQ_OP_DISCARD;
bio->bi_iter.bi_size = bio->bi_iter.bi_size =
XFS_FSB_TO_B(rtg_mount(rtg), rtg_blocks(rtg)); XFS_FSB_TO_B(rtg_mount(rtg), rtg_blocks(rtg));
} }
return true; submit_bio(bio);
}
static void xfs_bio_wait_endio(struct bio *bio)
{
complete(bio->bi_private);
} }
int int
xfs_zone_gc_reset_sync( xfs_zone_gc_reset_sync(
struct xfs_rtgroup *rtg) struct xfs_rtgroup *rtg)
{ {
int error = 0; DECLARE_COMPLETION_ONSTACK(done);
struct bio bio; struct bio bio;
int error;
bio_init(&bio, rtg_mount(rtg)->m_rtdev_targp->bt_bdev, NULL, 0, bio_init(&bio, rtg_mount(rtg)->m_rtdev_targp->bt_bdev, NULL, 0,
REQ_OP_ZONE_RESET); REQ_OP_ZONE_RESET | REQ_SYNC);
if (xfs_zone_gc_prepare_reset(&bio, rtg)) bio.bi_private = &done;
error = submit_bio_wait(&bio); bio.bi_end_io = xfs_bio_wait_endio;
bio_uninit(&bio); xfs_submit_zone_reset_bio(rtg, &bio);
wait_for_completion_io(&done);
error = blk_status_to_errno(bio.bi_status);
bio_uninit(&bio);
return error; return error;
} }
@ -961,15 +976,7 @@ xfs_zone_gc_reset_zones(
chunk->data = data; chunk->data = data;
WRITE_ONCE(chunk->state, XFS_GC_BIO_NEW); WRITE_ONCE(chunk->state, XFS_GC_BIO_NEW);
list_add_tail(&chunk->entry, &data->resetting); list_add_tail(&chunk->entry, &data->resetting);
xfs_submit_zone_reset_bio(rtg, bio);
/*
* Also use the bio to drive the state machine when neither
* zone reset nor discard is supported to keep things simple.
*/
if (xfs_zone_gc_prepare_reset(bio, rtg))
submit_bio(bio);
else
bio_endio(bio);
} while (next); } while (next);
} }