From: Pankaj Raghav <p.raghav@samsung.com>
To: snitzer@kernel.org, axboe@kernel.dk, agk@redhat.com, hch@lst.de,
damien.lemoal@opensource.wdc.com
Cc: jaegeuk@kernel.org, gost.dev@samsung.com, bvanassche@acm.org,
linux-kernel@vger.kernel.org, hare@suse.de,
matias.bjorling@wdc.com, Johannes.Thumshirn@wdc.com,
linux-block@vger.kernel.org, linux-nvme@lists.infradead.org,
pankydev8@gmail.com, dm-devel@redhat.com,
Pankaj Raghav <p.raghav@samsung.com>,
Luis Chamberlain <mcgrof@kernel.org>,
Adam Manzanares <a.manzanares@samsung.com>,
Chaitanya Kulkarni <kch@nvidia.com>,
Johannes Thumshirn <johannes.thumshirn@wdc.com>
Subject: [PATCH v15 01/13] block: make bdev_nr_zones and disk_zone_no generic for npo2 zone size
Date: Fri, 23 Sep 2022 19:36:06 +0200 [thread overview]
Message-ID: <20220923173618.6899-2-p.raghav@samsung.com> (raw)
In-Reply-To: <20220923173618.6899-1-p.raghav@samsung.com>
Adapt bdev_nr_zones and disk_zone_no functions so that they can
also work for non-power-of-2 zone sizes.
As the existing deployments assume that a device zone size is a power of
2 number of sectors, power-of-2 optimized calculation is used for those
devices.
There are no direct hot paths modified and the changes just
introduce one new branch per call.
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Reviewed-by: Adam Manzanares <a.manzanares@samsung.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Pankaj Raghav <p.raghav@samsung.com>
---
block/blk-zoned.c | 13 +++++++++----
include/linux/blkdev.h | 8 +++++++-
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index a264621d4905..dce9c95b4bcd 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -111,17 +111,22 @@ EXPORT_SYMBOL_GPL(__blk_req_zone_write_unlock);
* bdev_nr_zones - Get number of zones
* @bdev: Target device
*
- * Return the total number of zones of a zoned block device. For a block
- * device without zone capabilities, the number of zones is always 0.
+ * Return the total number of zones of a zoned block device, including the
+ * eventual small last zone if present. For a block device without zone
+ * capabilities, the number of zones is always 0.
*/
unsigned int bdev_nr_zones(struct block_device *bdev)
{
sector_t zone_sectors = bdev_zone_sectors(bdev);
+ sector_t capacity = bdev_nr_sectors(bdev);
if (!bdev_is_zoned(bdev))
return 0;
- return (bdev_nr_sectors(bdev) + zone_sectors - 1) >>
- ilog2(zone_sectors);
+
+ if (is_power_of_2(zone_sectors))
+ return (capacity + zone_sectors - 1) >> ilog2(zone_sectors);
+
+ return DIV_ROUND_UP_SECTOR_T(capacity, zone_sectors);
}
EXPORT_SYMBOL_GPL(bdev_nr_zones);
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 8038c5fbde40..6c6bf4dd5709 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -674,9 +674,15 @@ static inline unsigned int disk_nr_zones(struct gendisk *disk)
static inline unsigned int disk_zone_no(struct gendisk *disk, sector_t sector)
{
+ sector_t zone_sectors = disk->queue->limits.chunk_sectors;
+
if (!blk_queue_is_zoned(disk->queue))
return 0;
- return sector >> ilog2(disk->queue->limits.chunk_sectors);
+
+ if (is_power_of_2(zone_sectors))
+ return sector >> ilog2(zone_sectors);
+
+ return div64_u64(sector, zone_sectors);
}
static inline bool disk_zone_is_seq(struct gendisk *disk, sector_t sector)
--
2.25.1
next prev parent reply other threads:[~2022-09-23 18:47 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20220923173619eucas1p13e645adbe1c8eb62fb48b52c0248ed65@eucas1p1.samsung.com>
2022-09-23 17:36 ` [PATCH v15 00/13] support zoned block devices with non-power-of-2 zone sizes Pankaj Raghav
[not found] ` <CGME20220923173620eucas1p2ba21805261fe5ad86c38c0f52daeaa3a@eucas1p2.samsung.com>
2022-09-23 17:36 ` Pankaj Raghav [this message]
[not found] ` <CGME20220923173621eucas1p11d1d89e187b39e057c7dfb58756c6a2e@eucas1p1.samsung.com>
2022-09-23 17:36 ` [PATCH v15 02/13] block: rearrange bdev_{is_zoned,zone_sectors,get_queue} helper in blkdev.h Pankaj Raghav
[not found] ` <CGME20220923173623eucas1p2aeb5444a1005282b630706d60e18a5ba@eucas1p2.samsung.com>
2022-09-23 17:36 ` [PATCH v15 03/13] block: allow blk-zoned devices to have non-power-of-2 zone size Pankaj Raghav
[not found] ` <CGME20220923173624eucas1p19e66d02c7f4dfd2da262b783ef440156@eucas1p1.samsung.com>
2022-09-23 17:36 ` [PATCH v15 04/13] nvmet: Allow ZNS target to support non-power_of_2 zone sizes Pankaj Raghav
[not found] ` <CGME20220923173625eucas1p147864849427469a90bf5c3ce547105c2@eucas1p1.samsung.com>
2022-09-23 17:36 ` [PATCH v15 05/13] nvme: zns: Allow ZNS drives that have non-power_of_2 zone size Pankaj Raghav
[not found] ` <CGME20220923173626eucas1p2e06c400ad3c18fe8f33c0b4ab1a25bf0@eucas1p2.samsung.com>
2022-09-23 17:36 ` [PATCH v15 06/13] null_blk: allow zoned devices with non power-of-2 zone sizes Pankaj Raghav
[not found] ` <CGME20220923173627eucas1p2f134d9cb331e4a8f0fca8431eeb0f0b0@eucas1p2.samsung.com>
2022-09-23 17:36 ` [PATCH v15 07/13] zonefs: allow non power of 2 zoned devices Pankaj Raghav
2022-09-28 18:10 ` Bart Van Assche
[not found] ` <CGME20220923173628eucas1p1837557826439e7cd6690b46628290037@eucas1p1.samsung.com>
2022-09-23 17:36 ` [PATCH v15 08/13] dm-zoned: ensure only power of 2 zone sizes are allowed Pankaj Raghav
[not found] ` <CGME20220923173629eucas1p27c1ebffb55c2f1a52fad913840b16d02@eucas1p2.samsung.com>
2022-09-23 17:36 ` [PATCH v15 09/13] dm-zone: use generic helpers to calculate offset from zone start Pankaj Raghav
[not found] ` <CGME20220923173630eucas1p2bae6918f0c165051464e62c5172a80e0@eucas1p2.samsung.com>
2022-09-23 17:36 ` [PATCH v15 10/13] dm-table: allow zoned devices with non power-of-2 zone sizes Pankaj Raghav
[not found] ` <CGME20220923173631eucas1p23cceb8438d6b8b9c3460192c0ad2472d@eucas1p2.samsung.com>
2022-09-23 17:36 ` [PATCH v15 11/13] dm: call dm_zone_endio after the target endio callback for zoned devices Pankaj Raghav
2022-09-28 18:13 ` Bart Van Assche
[not found] ` <CGME20220923173632eucas1p1a4b8cba427f5caf649009073233f8c76@eucas1p1.samsung.com>
2022-09-23 17:36 ` [PATCH v15 12/13] dm: introduce DM_EMULATED_ZONES target feature flag Pankaj Raghav
[not found] ` <CGME20220923173634eucas1p18fccee11155c670354da389b4d2f4c60@eucas1p1.samsung.com>
2022-09-23 17:36 ` [PATCH v15 13/13] dm: add power-of-2 target for zoned devices with non power-of-2 zone sizes Pankaj Raghav
2022-09-27 16:07 ` Pankaj Raghav
2022-09-28 14:22 ` Mike Snitzer
2022-09-29 6:31 ` [PATCH v15 00/13] support zoned block devices with non-power-of-2 " Pankaj Raghav
2022-09-30 15:13 ` Jens Axboe
2022-09-30 19:38 ` Bart Van Assche
2022-09-30 21:24 ` Jens Axboe
2022-10-24 19:02 ` Bart Van Assche
2022-10-01 0:45 ` Damien Le Moal
2022-10-01 2:14 ` Bart Van Assche
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=20220923173618.6899-2-p.raghav@samsung.com \
--to=p.raghav@samsung.com \
--cc=Johannes.Thumshirn@wdc.com \
--cc=a.manzanares@samsung.com \
--cc=agk@redhat.com \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=damien.lemoal@opensource.wdc.com \
--cc=dm-devel@redhat.com \
--cc=gost.dev@samsung.com \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=jaegeuk@kernel.org \
--cc=kch@nvidia.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=matias.bjorling@wdc.com \
--cc=mcgrof@kernel.org \
--cc=pankydev8@gmail.com \
--cc=snitzer@kernel.org \
/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).