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

block: Remove REQ_OP_ZONE_RESET_ALL emulation 



Now that device mapper can handle resetting all zones of a mapped zoned
device using REQ_OP_ZONE_RESET_ALL, all zoned block device drivers
support this operation. With this, the request queue feature
BLK_FEAT_ZONE_RESETALL is not necessary and the emulation code in
blk-zone.c can be removed.

Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20240704052816.623865-5-dlemoal@kernel.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 81e77063

block/blk-core.c

+1 −4
Original line number Diff line number Diff line
@@ -830,11 +830,8 @@ void submit_bio_noacct(struct bio *bio) 
	case REQ_OP_ZONE_OPEN:

	case REQ_OP_ZONE_CLOSE:

	case REQ_OP_ZONE_FINISH:

		if (!bdev_is_zoned(bio->bi_bdev))

			goto not_supported;

		break;

	case REQ_OP_ZONE_RESET_ALL:

		if (!bdev_is_zoned(bio->bi_bdev) || !blk_queue_zone_resetall(q))

		if (!bdev_is_zoned(bio->bi_bdev))

			goto not_supported;

		break;

	case REQ_OP_DRV_IN:

block/blk-zoned.c

+3 −73
Original line number Diff line number Diff line
@@ -157,70 +157,6 @@ static inline unsigned long *blk_alloc_zone_bitmap(int node, 
			    GFP_NOIO, node);

}



static int blk_zone_need_reset_cb(struct blk_zone *zone, unsigned int idx,

				  void *data)

{

	/*

	 * For an all-zones reset, ignore conventional, empty, read-only

	 * and offline zones.

	 */

	switch (zone->cond) {

	case BLK_ZONE_COND_NOT_WP:

	case BLK_ZONE_COND_EMPTY:

	case BLK_ZONE_COND_READONLY:

	case BLK_ZONE_COND_OFFLINE:

		return 0;

	default:

		set_bit(idx, (unsigned long *)data);

		return 0;

	}

}



static int blkdev_zone_reset_all_emulated(struct block_device *bdev)

{

	struct gendisk *disk = bdev->bd_disk;

	sector_t capacity = bdev_nr_sectors(bdev);

	sector_t zone_sectors = bdev_zone_sectors(bdev);

	unsigned long *need_reset;

	struct bio *bio = NULL;

	sector_t sector = 0;

	int ret;



	need_reset = blk_alloc_zone_bitmap(disk->queue->node, disk->nr_zones);

	if (!need_reset)

		return -ENOMEM;



	ret = disk->fops->report_zones(disk, 0, disk->nr_zones,

				       blk_zone_need_reset_cb, need_reset);

	if (ret < 0)

		goto out_free_need_reset;



	ret = 0;

	while (sector < capacity) {

		if (!test_bit(disk_zone_no(disk, sector), need_reset)) {

			sector += zone_sectors;

			continue;

		}



		bio = blk_next_bio(bio, bdev, 0, REQ_OP_ZONE_RESET | REQ_SYNC,

				   GFP_KERNEL);

		bio->bi_iter.bi_sector = sector;

		sector += zone_sectors;



		/* This may take a while, so be nice to others */

		cond_resched();

	}



	if (bio) {

		ret = submit_bio_wait(bio);

		bio_put(bio);

	}



out_free_need_reset:

	kfree(need_reset);

	return ret;

}



static int blkdev_zone_reset_all(struct block_device *bdev)

{

	struct bio bio;
@@ -247,7 +183,6 @@ static int blkdev_zone_reset_all(struct block_device *bdev) 
int blkdev_zone_mgmt(struct block_device *bdev, enum req_op op,

		     sector_t sector, sector_t nr_sectors)

{

	struct request_queue *q = bdev_get_queue(bdev);

	sector_t zone_sectors = bdev_zone_sectors(bdev);

	sector_t capacity = bdev_nr_sectors(bdev);

	sector_t end_sector = sector + nr_sectors;
@@ -275,16 +210,11 @@ int blkdev_zone_mgmt(struct block_device *bdev, enum req_op op, 
		return -EINVAL;



	/*

	 * In the case of a zone reset operation over all zones,

	 * REQ_OP_ZONE_RESET_ALL can be used with devices supporting this

	 * command. For other devices, we emulate this command behavior by

	 * identifying the zones needing a reset.

	 * In the case of a zone reset operation over all zones, use

	 * REQ_OP_ZONE_RESET_ALL.

	 */

	if (op == REQ_OP_ZONE_RESET && sector == 0 && nr_sectors == capacity) {

		if (!blk_queue_zone_resetall(q))

			return blkdev_zone_reset_all_emulated(bdev);

	if (op == REQ_OP_ZONE_RESET && sector == 0 && nr_sectors == capacity)

		return blkdev_zone_reset_all(bdev);

	}



	while (sector < end_sector) {

		bio = blk_next_bio(bio, bdev, 0, op | REQ_SYNC, GFP_KERNEL);

drivers/block/null_blk/zoned.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ int null_init_zoned_dev(struct nullb_device *dev, 
		sector += dev->zone_size_sects;

	}



	lim->features |= BLK_FEAT_ZONED | BLK_FEAT_ZONE_RESETALL;

	lim->features |= BLK_FEAT_ZONED;

	lim->chunk_sectors = dev->zone_size_sects;

	lim->max_zone_append_sectors = dev->zone_append_max_sectors;

	lim->max_open_zones = dev->zone_max_open;

drivers/block/ublk_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -2194,7 +2194,7 @@ static int ublk_ctrl_start_dev(struct ublk_device *ub, struct io_uring_cmd *cmd) 
		if (!IS_ENABLED(CONFIG_BLK_DEV_ZONED))

			return -EOPNOTSUPP;



		lim.features |= BLK_FEAT_ZONED | BLK_FEAT_ZONE_RESETALL;

		lim.features |= BLK_FEAT_ZONED;

		lim.max_active_zones = p->max_active_zones;

		lim.max_open_zones =  p->max_open_zones;

		lim.max_zone_append_sectors = p->max_zone_append_sectors;

drivers/block/virtio_blk.c

+1 −1
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ static int virtblk_read_zoned_limits(struct virtio_blk *vblk, 


	dev_dbg(&vdev->dev, "probing host-managed zoned device\n");



	lim->features |= BLK_FEAT_ZONED | BLK_FEAT_ZONE_RESETALL;

	lim->features |= BLK_FEAT_ZONED;



	virtio_cread(vdev, struct virtio_blk_config,

		     zoned.max_open_zones, &v);