diff options
| author | Damien Le Moal <damien.lemoal@wdc.com> | 2018-10-12 19:08:47 +0900 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-10-25 11:17:40 -0600 |
| commit | a2d6b3a2d39005ab4d4a83481a7db092ebf0e9d6 (patch) | |
| tree | d099578f43e9d1136c792485f4231a7fe1dc71b3 /block/blk-zoned.c | |
| parent | 65e4e3eee83d7a4ad7e8c5175b2a0ddfd3b5685f (diff) | |
| download | lwn-a2d6b3a2d39005ab4d4a83481a7db092ebf0e9d6.tar.gz lwn-a2d6b3a2d39005ab4d4a83481a7db092ebf0e9d6.zip | |
block: Improve zone reset execution
There is no need to synchronously execute all REQ_OP_ZONE_RESET BIOs
necessary to reset a range of zones. Similarly to what is done for
discard BIOs in blk-lib.c, all zone reset BIOs can be chained and
executed asynchronously and a synchronous call done only for the last
BIO of the chain.
Modify blkdev_reset_zones() to operate similarly to
blkdev_issue_discard() using the next_bio() helper for chaining BIOs. To
avoid code duplication of that function in blk_zoned.c, rename
next_bio() into blk_next_bio() and declare it as a block internal
function in blk.h.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-zoned.c')
| -rw-r--r-- | block/blk-zoned.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/block/blk-zoned.c b/block/blk-zoned.c index bb4ed69f917f..5d967fd39fbd 100644 --- a/block/blk-zoned.c +++ b/block/blk-zoned.c @@ -13,6 +13,8 @@ #include <linux/rbtree.h> #include <linux/blkdev.h> +#include "blk.h" + static inline sector_t blk_zone_start(struct request_queue *q, sector_t sector) { @@ -277,16 +279,17 @@ int blkdev_reset_zones(struct block_device *bdev, struct request_queue *q = bdev_get_queue(bdev); sector_t zone_sectors; sector_t end_sector = sector + nr_sectors; - struct bio *bio; + struct bio *bio = NULL; + struct blk_plug plug; int ret; - if (!q) - return -ENXIO; - if (!blk_queue_is_zoned(q)) return -EOPNOTSUPP; - if (end_sector > bdev->bd_part->nr_sects) + if (bdev_read_only(bdev)) + return -EPERM; + + if (!nr_sectors || end_sector > bdev->bd_part->nr_sects) /* Out of range */ return -EINVAL; @@ -299,19 +302,14 @@ int blkdev_reset_zones(struct block_device *bdev, end_sector != bdev->bd_part->nr_sects) return -EINVAL; + blk_start_plug(&plug); while (sector < end_sector) { - bio = bio_alloc(gfp_mask, 0); + bio = blk_next_bio(bio, 0, gfp_mask); bio->bi_iter.bi_sector = sector; bio_set_dev(bio, bdev); bio_set_op_attrs(bio, REQ_OP_ZONE_RESET, 0); - ret = submit_bio_wait(bio); - bio_put(bio); - - if (ret) - return ret; - sector += zone_sectors; /* This may take a while, so be nice to others */ @@ -319,7 +317,12 @@ int blkdev_reset_zones(struct block_device *bdev, } - return 0; + ret = submit_bio_wait(bio); + bio_put(bio); + + blk_finish_plug(&plug); + + return ret; } EXPORT_SYMBOL_GPL(blkdev_reset_zones); |