From: Damien Le Moal <damien.lemoal@wdc.com>
To: linux-block@vger.kernel.org, Jens Axboe <axboe@kernel.dk>,
linux-scsi@vger.kernel.org,
"Martin K . Petersen" <martin.petersen@oracle.com>,
dm-devel@redhat.com, Mike Snitzer <snitzer@redhat.com>,
linux-f2fs-devel@lists.sourceforge.net,
Jaegeuk Kim <jaegeuk@kernel.org>, Chao Yu <yuchao0@huawei.com>
Subject: [PATCH 3/9] block: Simplify report zones execution
Date: Fri, 8 Nov 2019 10:56:56 +0900 [thread overview]
Message-ID: <20191108015702.233102-4-damien.lemoal@wdc.com> (raw)
In-Reply-To: <20191108015702.233102-1-damien.lemoal@wdc.com>
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: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Javier Gonzalez <javier@javigon.com>
---
block/blk-zoned.c | 34 +++++-----------------------------
drivers/md/dm.c | 6 ------
2 files changed, 5 insertions(+), 35 deletions(-)
diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 523a28d7a15c..ea4e086ba00e 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -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,8 +161,8 @@ 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,
- zones, &nrz);
+ 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)
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index bc143c1b2333..89189c29438f 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -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:
--
2.23.0
next prev parent reply other threads:[~2019-11-08 1:57 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-08 1:56 [PATCH 0/9] Zoned block device enhancements and zone report rework Damien Le Moal
2019-11-08 1:56 ` [PATCH 1/9] block: Enhance blk_revalidate_disk_zones() Damien Le Moal
2019-11-08 6:28 ` [dm-devel] " Christoph Hellwig
2019-11-08 7:10 ` Hannes Reinecke
2019-11-08 1:56 ` [PATCH 2/9] block: cleanup the !zoned case in blk_revalidate_disk_zones Damien Le Moal
2019-11-08 7:11 ` Hannes Reinecke
2019-11-08 18:50 ` Chaitanya Kulkarni
2019-11-08 1:56 ` Damien Le Moal [this message]
2019-11-08 7:12 ` [PATCH 3/9] block: Simplify report zones execution Hannes Reinecke
2019-11-08 1:56 ` [PATCH 4/9] block: Remove partition support for zoned block devices Damien Le Moal
2019-11-08 6:30 ` [dm-devel] " Christoph Hellwig
2019-11-08 7:17 ` Hannes Reinecke
2019-11-08 7:28 ` Damien Le Moal
2019-11-08 1:56 ` [PATCH 5/9] null_blk: clean up the block device operations Damien Le Moal
2019-11-08 7:17 ` Hannes Reinecke
2019-11-08 18:47 ` Chaitanya Kulkarni
2019-11-08 1:56 ` [PATCH 6/9] null_blk: clean up report zones Damien Le Moal
2019-11-08 7:18 ` Hannes Reinecke
2019-11-08 18:47 ` Chaitanya Kulkarni
2019-11-08 1:57 ` [PATCH 7/9] null_blk: Add zone_nr_conv to features Damien Le Moal
2019-11-08 7:18 ` Hannes Reinecke
2019-11-08 18:48 ` Chaitanya Kulkarni
2019-11-08 1:57 ` [PATCH 8/9] scsi: sd_zbc: Cleanup sd_zbc_alloc_report_buffer() Damien Le Moal
2019-11-08 6:31 ` [dm-devel] " Christoph Hellwig
2019-11-08 7:20 ` Hannes Reinecke
2019-11-08 19:06 ` [dm-devel] " Bart Van Assche
2019-11-09 2:54 ` Damien Le Moal
2019-11-09 3:02 ` Bart Van Assche
2019-11-08 1:57 ` [PATCH 9/9] block: rework zone reporting Damien Le Moal
2019-11-08 7:23 ` Hannes Reinecke
2019-11-08 15:16 ` Mike Snitzer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191108015702.233102-4-damien.lemoal@wdc.com \
--to=damien.lemoal@wdc.com \
--cc=axboe@kernel.dk \
--cc=dm-devel@redhat.com \
--cc=jaegeuk@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=snitzer@redhat.com \
--cc=yuchao0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).