Commit f79846ca authored by Damien Le Moal's avatar Damien Le Moal Committed by Martin K. Petersen
Browse files

scsi: sd_zbc: Set zone limits before revalidating zones 



In sd_zbc_revalidate_zones(), execute blk_queue_chunk_sectors() and
blk_queue_max_zone_append_sectors() to respectively set a ZBC device
zone size and maximum zone append sector limit before executing
blk_revalidate_disk_zones(). This is to allow the block layer zone
reavlidation to check these device characteristics prior to checking all
zones of the device.

Since blk_queue_max_zone_append_sectors() already caps the device
maximum zone append limit to the zone size and to the maximum command
size, the max_append value passed to blk_queue_max_zone_append_sectors()
is simplified to the maximum number of segments times the number of
sectors per page.

Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20230703024812.76778-2-dlemoal@kernel.org


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 24033d71

drivers/scsi/sd_zbc.c

+5 −7
Original line number Diff line number Diff line
@@ -831,7 +831,6 @@ int sd_zbc_revalidate_zones(struct scsi_disk *sdkp) 
	struct request_queue *q = disk->queue;

	u32 zone_blocks = sdkp->early_zone_info.zone_blocks;

	unsigned int nr_zones = sdkp->early_zone_info.nr_zones;

	u32 max_append;

	int ret = 0;

	unsigned int flags;
@@ -876,6 +875,11 @@ int sd_zbc_revalidate_zones(struct scsi_disk *sdkp) 
		goto unlock;

	}



	blk_queue_chunk_sectors(q,

			logical_to_sectors(sdkp->device, zone_blocks));

	blk_queue_max_zone_append_sectors(q,

			q->limits.max_segments << PAGE_SECTORS_SHIFT);



	ret = blk_revalidate_disk_zones(disk, sd_zbc_revalidate_zones_cb);



	memalloc_noio_restore(flags);
@@ -888,12 +892,6 @@ int sd_zbc_revalidate_zones(struct scsi_disk *sdkp) 
		goto unlock;

	}



	max_append = min_t(u32, logical_to_sectors(sdkp->device, zone_blocks),

			   q->limits.max_segments << PAGE_SECTORS_SHIFT);

	max_append = min_t(u32, max_append, queue_max_hw_sectors(q));



	blk_queue_max_zone_append_sectors(q, max_append);



	sd_zbc_print_zones(sdkp);



unlock: