mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-06 02:50:49 +09:00
block: fix revalidate performance regression
commit47fe1c3064upstream. The scsi driver function sd_read_block_characteristics() always calls disk_set_zoned() to a disk zoned model correctly, in case the device model changed. This is done even for regular disks to set the zoned model to BLK_ZONED_NONE and free any zone related resources if the drive previously was zoned. This behavior significantly impact the time it takes to revalidate disks on a large system as the call to disk_clear_zone_settings() done from disk_set_zoned() for the BLK_ZONED_NONE case results in the device request queued to be frozen, even if there are no zone resources to free. Avoid this overhead for non-zoned devices by not calling disk_clear_zone_settings() in disk_set_zoned() if the device model was already set to BLK_ZONED_NONE, which is always the case for regular devices. Reported by: Brian Bunker <brian@purestorage.com> Fixes:508aebb805("block: introduce blk_queue_clear_zone_settings()") Cc: stable@vger.kernel.org Signed-off-by: Damien Le Moal <dlemoal@kernel.org> Reviewed-by: Ming Lei <ming.lei@redhat.com> Link: https://lore.kernel.org/r/20230529073237.1339862-1-dlemoal@kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
867ad8cba2
commit
2a72e6814f
@@ -909,6 +909,7 @@ static bool disk_has_partitions(struct gendisk *disk)
|
|||||||
void disk_set_zoned(struct gendisk *disk, enum blk_zoned_model model)
|
void disk_set_zoned(struct gendisk *disk, enum blk_zoned_model model)
|
||||||
{
|
{
|
||||||
struct request_queue *q = disk->queue;
|
struct request_queue *q = disk->queue;
|
||||||
|
unsigned int old_model = q->limits.zoned;
|
||||||
|
|
||||||
switch (model) {
|
switch (model) {
|
||||||
case BLK_ZONED_HM:
|
case BLK_ZONED_HM:
|
||||||
@@ -946,7 +947,7 @@ void disk_set_zoned(struct gendisk *disk, enum blk_zoned_model model)
|
|||||||
*/
|
*/
|
||||||
blk_queue_zone_write_granularity(q,
|
blk_queue_zone_write_granularity(q,
|
||||||
queue_logical_block_size(q));
|
queue_logical_block_size(q));
|
||||||
} else {
|
} else if (old_model != BLK_ZONED_NONE) {
|
||||||
disk_clear_zone_settings(disk);
|
disk_clear_zone_settings(disk);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user