Commit ceeb373a authored by Damien Le Moal's avatar Damien Le Moal Committed by Jens Axboe
Browse files

block: Simplify report zones execution 



All kernel users of blkdev_report_zones() as well as applications use
through ioctl(BLKZONEREPORT) expect to potentially get less zone
descriptors than requested. As such, the use of the internal report
zones command execution loop implemented by blk_report_zones() is
not necessary and can even be harmful to performance by causing the
execution of inefficient small zones report command to service the
reminder of a requested zone array.

This patch removes blk_report_zones(), simplifying the code. Also
remove a now incorrect comment in dm_blk_report_zones().

Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJavier Gonzalez <javier@javigon.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c98c3d09

block/blk-zoned.c

+5 −29
Original line number Diff line number Diff line
@@ -119,31 +119,6 @@ static bool blkdev_report_zone(struct block_device *bdev, struct blk_zone *rep) 
	return true;

}



static int blk_report_zones(struct gendisk *disk, sector_t sector,

			    struct blk_zone *zones, unsigned int *nr_zones)

{

	struct request_queue *q = disk->queue;

	unsigned int z = 0, n, nrz = *nr_zones;

	sector_t capacity = get_capacity(disk);

	int ret;



	while (z < nrz && sector < capacity) {

		n = nrz - z;

		ret = disk->fops->report_zones(disk, sector, &zones[z], &n);

		if (ret)

			return ret;

		if (!n)

			break;

		sector += blk_queue_zone_sectors(q) * n;

		z += n;

	}



	WARN_ON(z > *nr_zones);

	*nr_zones = z;



	return 0;

}



/**

 * blkdev_report_zones - Get zones information

 * @bdev:	Target block device
@@ -164,6 +139,7 @@ int blkdev_report_zones(struct block_device *bdev, sector_t sector, 
			struct blk_zone *zones, unsigned int *nr_zones)

{

	struct request_queue *q = bdev_get_queue(bdev);

	struct gendisk *disk = bdev->bd_disk;

	unsigned int i, nrz;

	int ret;
@@ -175,7 +151,7 @@ int blkdev_report_zones(struct block_device *bdev, sector_t sector, 
	 * report_zones method. If it does not have one defined, the device

	 * driver has a bug. So warn about that.

	 */

	if (WARN_ON_ONCE(!bdev->bd_disk->fops->report_zones))

	if (WARN_ON_ONCE(!disk->fops->report_zones))

		return -EOPNOTSUPP;



	if (!*nr_zones || sector >= bdev->bd_part->nr_sects) {
@@ -185,7 +161,7 @@ int blkdev_report_zones(struct block_device *bdev, sector_t sector, 


	nrz = min(*nr_zones,

		  __blkdev_nr_zones(q, bdev->bd_part->nr_sects - sector));

	ret = blk_report_zones(bdev->bd_disk, get_start_sect(bdev) + sector,

	ret = disk->fops->report_zones(disk, get_start_sect(bdev) + sector,

				       zones, &nrz);

	if (ret)

		return ret;
@@ -561,7 +537,7 @@ int blk_revalidate_disk_zones(struct gendisk *disk) 


	while (z < nr_zones) {

		nrz = min(nr_zones - z, rep_nr_zones);

		ret = blk_report_zones(disk, sector, zones, &nrz);

		ret = disk->fops->report_zones(disk, sector, zones, &nrz);

		if (ret)

			goto out;

		if (!nrz)

drivers/md/dm.c

+0 −6
Original line number Diff line number Diff line
@@ -473,12 +473,6 @@ static int dm_blk_report_zones(struct gendisk *disk, sector_t sector, 
		goto out;

	}



	/*

	 * blkdev_report_zones() will loop and call this again to cover all the

	 * zones of the target, eventually moving on to the next target.

	 * So there is no need to loop here trying to fill the entire array

	 * of zones.

	 */

	ret = tgt->type->report_zones(tgt, sector, zones, nr_zones);



out:

CRA Git | Maintained and supported by SUSTech CRA and CCSE