From 657fe9c4f08355da51dc035547f221be3e79454f Mon Sep 17 00:00:00 2001 From: John Garry Date: Mon, 14 Sep 2026 14:23:23 +0100 Subject: [PATCH] block: cap atomic write size by PI buffer size constraints Commit 1418b5633ca9 ("block: cap atomic write size by PI buffer size constraints") attempted to fix atomic writes limits according to integrity limits. However, it just reduced the atomic_write_max_sectors. The other atomic write limits - unit min and unit max - are not derived directly from this value. Update blk_atomic_writes_update_limits() to properly set the atomic write limits according to integrity limits. Signed-off-by: John Garry Reviewed-by: Christoph Hellwig Link: https://patch.msgid.link/20260914132323.208321-1-john.garry@linux.dev Signed-off-by: Jens Axboe --- block/blk-settings.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/block/blk-settings.c b/block/blk-settings.c index e469baa1f08b..1f5ee2453269 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -206,12 +206,6 @@ static int blk_validate_integrity_limits(struct queue_limits *lim) lim->max_sectors = min(lim->max_sectors, max_integrity_io_size(lim) >> SECTOR_SHIFT); - if (lim->features & BLK_FEAT_ATOMIC_WRITES) { - lim->atomic_write_max_sectors = - min(lim->atomic_write_max_sectors, - max_integrity_io_size(lim) >> SECTOR_SHIFT); - } - return 0; } @@ -236,14 +230,20 @@ static unsigned int blk_queue_max_guaranteed_bio(struct queue_limits *lim) static void blk_atomic_writes_update_limits(struct queue_limits *lim) { + unsigned int integrity_max = lim->integrity.metadata_size ? + max_integrity_io_size(lim) : 0; unsigned int unit_limit = min(lim->max_hw_sectors << SECTOR_SHIFT, blk_queue_max_guaranteed_bio(lim)); + unit_limit = min_not_zero(unit_limit, integrity_max); unit_limit = rounddown_pow_of_two(unit_limit); lim->atomic_write_max_sectors = min(lim->atomic_write_hw_max >> SECTOR_SHIFT, lim->max_hw_sectors); + lim->atomic_write_max_sectors = + min_not_zero(lim->atomic_write_max_sectors, + integrity_max >> SECTOR_SHIFT); lim->atomic_write_unit_min = min(lim->atomic_write_hw_unit_min, unit_limit); lim->atomic_write_unit_max = @@ -511,11 +511,13 @@ int blk_validate_limits(struct queue_limits *lim) if (!(lim->features & BLK_FEAT_WRITE_CACHE)) lim->features &= ~BLK_FEAT_FUA; - blk_validate_atomic_write_limits(lim); - err = blk_validate_integrity_limits(lim); if (err) return err; + + /* atomics limits depend on integrity limits */ + blk_validate_atomic_write_limits(lim); + return blk_validate_zoned_limits(lim); } EXPORT_SYMBOL_GPL(blk_validate_limits);