From: Pankaj Raghav <p.raghav@samsung.com> To: hch@lst.de, snitzer@redhat.com, damien.lemoal@opensource.wdc.com, axboe@kernel.dk Cc: bvanassche@acm.org, linux-kernel@vger.kernel.org, jiangbo.365@bytedance.com, hare@suse.de, pankydev8@gmail.com, dm-devel@redhat.com, jonathan.derrick@linux.dev, gost.dev@samsung.com, dsterba@suse.com, jaegeuk@kernel.org, linux-nvme@lists.infradead.org, Johannes.Thumshirn@wdc.com, linux-block@vger.kernel.org, Pankaj Raghav <p.raghav@samsung.com>, Luis Chamberlain <mcgrof@kernel.org> Subject: [PATCH v7 01/13] block: make blkdev_nr_zones and blk_queue_zone_no generic for npo2 zsze Date: Wed, 15 Jun 2022 12:19:08 +0200 [thread overview] Message-ID: <20220615101920.329421-2-p.raghav@samsung.com> (raw) In-Reply-To: <20220615101920.329421-1-p.raghav@samsung.com> Adapt blkdev_nr_zones and blk_queue_zone_no function so that it can also work for non-power-of-2 zone sizes. As the existing deployments of zoned devices had power-of-2 assumption, power-of-2 optimized calculation is kept 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> Signed-off-by: Pankaj Raghav <p.raghav@samsung.com> --- block/blk-zoned.c | 12 +++++++++--- include/linux/blkdev.h | 8 +++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/block/blk-zoned.c b/block/blk-zoned.c index 38cd840d8..8b0615287 100644 --- a/block/blk-zoned.c +++ b/block/blk-zoned.c @@ -111,16 +111,22 @@ EXPORT_SYMBOL_GPL(__blk_req_zone_write_unlock); * blkdev_nr_zones - Get number of zones * @disk: Target gendisk * - * 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 blkdev_nr_zones(struct gendisk *disk) { sector_t zone_sectors = blk_queue_zone_sectors(disk->queue); + sector_t capacity = get_capacity(disk); if (!blk_queue_is_zoned(disk->queue)) return 0; - return (get_capacity(disk) + 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(blkdev_nr_zones); diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 914c613d8..39017ae9d 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -681,9 +681,15 @@ static inline unsigned int blk_queue_nr_zones(struct request_queue *q) static inline unsigned int blk_queue_zone_no(struct request_queue *q, sector_t sector) { + sector_t zone_sectors = blk_queue_zone_sectors(q); + if (!blk_queue_is_zoned(q)) return 0; - return sector >> ilog2(q->limits.chunk_sectors); + + if (is_power_of_2(zone_sectors)) + return sector >> ilog2(zone_sectors); + + return div64_u64(sector, zone_sectors); } static inline bool blk_queue_zone_is_seq(struct request_queue *q, -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Pankaj Raghav <p.raghav@samsung.com> To: hch@lst.de, snitzer@redhat.com, damien.lemoal@opensource.wdc.com, axboe@kernel.dk Cc: Pankaj Raghav <p.raghav@samsung.com>, bvanassche@acm.org, pankydev8@gmail.com, gost.dev@samsung.com, jiangbo.365@bytedance.com, linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, dm-devel@redhat.com, jonathan.derrick@linux.dev, Johannes.Thumshirn@wdc.com, dsterba@suse.com, jaegeuk@kernel.org, Luis Chamberlain <mcgrof@kernel.org> Subject: [dm-devel] [PATCH v7 01/13] block: make blkdev_nr_zones and blk_queue_zone_no generic for npo2 zsze Date: Wed, 15 Jun 2022 12:19:08 +0200 [thread overview] Message-ID: <20220615101920.329421-2-p.raghav@samsung.com> (raw) In-Reply-To: <20220615101920.329421-1-p.raghav@samsung.com> Adapt blkdev_nr_zones and blk_queue_zone_no function so that it can also work for non-power-of-2 zone sizes. As the existing deployments of zoned devices had power-of-2 assumption, power-of-2 optimized calculation is kept 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> Signed-off-by: Pankaj Raghav <p.raghav@samsung.com> --- block/blk-zoned.c | 12 +++++++++--- include/linux/blkdev.h | 8 +++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/block/blk-zoned.c b/block/blk-zoned.c index 38cd840d8..8b0615287 100644 --- a/block/blk-zoned.c +++ b/block/blk-zoned.c @@ -111,16 +111,22 @@ EXPORT_SYMBOL_GPL(__blk_req_zone_write_unlock); * blkdev_nr_zones - Get number of zones * @disk: Target gendisk * - * 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 blkdev_nr_zones(struct gendisk *disk) { sector_t zone_sectors = blk_queue_zone_sectors(disk->queue); + sector_t capacity = get_capacity(disk); if (!blk_queue_is_zoned(disk->queue)) return 0; - return (get_capacity(disk) + 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(blkdev_nr_zones); diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 914c613d8..39017ae9d 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -681,9 +681,15 @@ static inline unsigned int blk_queue_nr_zones(struct request_queue *q) static inline unsigned int blk_queue_zone_no(struct request_queue *q, sector_t sector) { + sector_t zone_sectors = blk_queue_zone_sectors(q); + if (!blk_queue_is_zoned(q)) return 0; - return sector >> ilog2(q->limits.chunk_sectors); + + if (is_power_of_2(zone_sectors)) + return sector >> ilog2(zone_sectors); + + return div64_u64(sector, zone_sectors); } static inline bool blk_queue_zone_is_seq(struct request_queue *q, -- 2.25.1 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2022-06-15 10:19 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <CGME20220615101924eucas1p27fbce623c0e1b3097169bf23dd6266d8@eucas1p2.samsung.com> 2022-06-15 10:19 ` [PATCH v7 00/13] support non power of 2 zoned device Pankaj Raghav 2022-06-15 10:19 ` [dm-devel] " Pankaj Raghav [not found] ` <CGME20220615101927eucas1p17220c7a36f69f59ff8ddd560b42967ec@eucas1p1.samsung.com> 2022-06-15 10:19 ` Pankaj Raghav [this message] 2022-06-15 10:19 ` [dm-devel] [PATCH v7 01/13] block: make blkdev_nr_zones and blk_queue_zone_no generic for npo2 zsze Pankaj Raghav 2022-06-15 20:18 ` Bart Van Assche 2022-06-15 20:18 ` Bart Van Assche [not found] ` <CGME20220615101931eucas1p15ed09ae433a2c378b599e9086130d8eb@eucas1p1.samsung.com> 2022-06-15 10:19 ` [PATCH v7 02/13] block: allow blk-zoned devices to have non-power-of-2 zone size Pankaj Raghav 2022-06-15 10:19 ` [dm-devel] " Pankaj Raghav 2022-06-15 20:28 ` Bart Van Assche 2022-06-15 20:28 ` Bart Van Assche 2022-06-16 10:09 ` Pankaj Raghav 2022-06-16 10:09 ` Pankaj Raghav 2022-06-16 16:04 ` Luis Chamberlain 2022-06-16 16:04 ` Luis Chamberlain 2022-06-16 23:30 ` Damien Le Moal 2022-06-16 23:30 ` Damien Le Moal [not found] ` <CGME20220615101935eucas1p26a7bc245d88a89312158d7a265f64aef@eucas1p2.samsung.com> 2022-06-15 10:19 ` [PATCH v7 03/13] nvme: zns: Allow ZNS drives that have non-power_of_2 " Pankaj Raghav 2022-06-15 10:19 ` [dm-devel] " Pankaj Raghav [not found] ` <CGME20220615101938eucas1p26ab159a1ffd0fa5a16d7f202ba7206e7@eucas1p2.samsung.com> 2022-06-15 10:19 ` [PATCH v7 04/13] nvmet: Allow ZNS target to support non-power_of_2 zone sizes Pankaj Raghav 2022-06-15 10:19 ` [dm-devel] " Pankaj Raghav [not found] ` <CGME20220615101941eucas1p25e1c27b363e6b288b848521298e31705@eucas1p2.samsung.com> 2022-06-15 10:19 ` [PATCH v7 05/13] null_blk: allow non power of 2 zoned devices Pankaj Raghav 2022-06-15 10:19 ` [dm-devel] " Pankaj Raghav [not found] ` <CGME20220615101945eucas1p16fa264e81d9b6027ff131dd311ed91e2@eucas1p1.samsung.com> 2022-06-15 10:19 ` [PATCH v7 06/13] null_blk: use zone_size_sects_shift for " Pankaj Raghav 2022-06-15 10:19 ` [dm-devel] " Pankaj Raghav 2022-06-15 11:56 ` Damien Le Moal 2022-06-15 11:56 ` [dm-devel] " Damien Le Moal [not found] ` <CGME20220615101948eucas1p2d8d801735c39b25256a019134adb0c6f@eucas1p2.samsung.com> 2022-06-15 10:19 ` [PATCH v7 07/13] zonefs: allow non " Pankaj Raghav 2022-06-15 10:19 ` [dm-devel] " Pankaj Raghav [not found] ` <CGME20220615101951eucas1p238eb45e563bd9645af81bf16c56d98ec@eucas1p2.samsung.com> 2022-06-15 10:19 ` [PATCH v7 08/13] dm-zoned: ensure only power of 2 zone sizes are allowed Pankaj Raghav 2022-06-15 10:19 ` [dm-devel] " Pankaj Raghav [not found] ` <CGME20220615101955eucas1p19b9d42ead7331f69f7dad1ec100312c2@eucas1p1.samsung.com> 2022-06-15 10:19 ` [dm-devel] [PATCH v7 09/13] dm-zone: use generic helpers to calculate offset from zone start Pankaj Raghav 2022-06-15 10:19 ` Pankaj Raghav [not found] ` <CGME20220615102000eucas1p27720aaa3c309327b2b9a33c5f840f498@eucas1p2.samsung.com> 2022-06-15 10:19 ` [dm-devel] [PATCH v7 10/13] dm-table: use bdev_is_zone_start helper in device_area_is_invalid() Pankaj Raghav 2022-06-15 10:19 ` Pankaj Raghav 2022-06-15 11:53 ` Damien Le Moal 2022-06-15 11:53 ` [dm-devel] " Damien Le Moal 2022-06-16 9:55 ` Pankaj Raghav 2022-06-16 9:55 ` [dm-devel] " Pankaj Raghav 2022-06-16 23:29 ` Damien Le Moal 2022-06-16 23:29 ` [dm-devel] " Damien Le Moal [not found] ` <CGME20220615102004eucas1p1e458ea097d381058b16fc6daa3eec998@eucas1p1.samsung.com> 2022-06-15 10:19 ` [dm-devel] [PATCH v7 11/13] dm-table: allow non po2 zoned devices Pankaj Raghav 2022-06-15 10:19 ` Pankaj Raghav [not found] ` <CGME20220615102007eucas1p1106f9520e2a86beb3792107dffd8071b@eucas1p1.samsung.com> 2022-06-15 10:19 ` [dm-devel] [PATCH v7 12/13] dm: call dm_zone_endio after the target endio callback for " Pankaj Raghav 2022-06-15 10:19 ` Pankaj Raghav 2022-06-15 11:01 ` [dm-devel] " Damien Le Moal 2022-06-15 11:01 ` Damien Le Moal 2022-06-16 12:24 ` Pankaj Raghav 2022-06-16 12:24 ` Pankaj Raghav 2022-06-16 23:33 ` Damien Le Moal 2022-06-16 23:33 ` Damien Le Moal [not found] ` <CGME20220615102011eucas1p220368db4a186181b1927dea50a79e5d4@eucas1p2.samsung.com> 2022-06-15 10:19 ` [PATCH v7 13/13] dm: add non power of 2 zoned target Pankaj Raghav 2022-06-15 10:19 ` [dm-devel] " Pankaj Raghav 2022-06-15 11:49 ` Damien Le Moal 2022-06-15 11:49 ` [dm-devel] " Damien Le Moal 2022-06-16 16:12 ` Pankaj Raghav 2022-06-16 16:12 ` [dm-devel] " Pankaj Raghav 2022-06-16 23:49 ` Damien Le Moal 2022-06-16 23:49 ` [dm-devel] " Damien Le Moal 2022-06-17 5:45 ` Pankaj Raghav 2022-06-17 5:45 ` [dm-devel] " Pankaj Raghav 2022-06-17 6:12 ` Damien Le Moal 2022-06-17 6:12 ` [dm-devel] " Damien Le Moal 2022-06-17 6:40 ` Pankaj Raghav 2022-06-17 6:40 ` [dm-devel] " Pankaj Raghav 2022-06-17 6:56 ` Damien Le Moal 2022-06-17 6:56 ` [dm-devel] " Damien Le Moal 2022-06-17 8:03 ` Pankaj Raghav 2022-06-17 8:03 ` [dm-devel] " Pankaj Raghav 2022-06-15 14:19 ` kernel test robot 2022-06-15 14:19 ` [dm-devel] " kernel test robot 2022-06-15 19:54 ` Randy Dunlap 2022-06-15 19:54 ` [dm-devel] " Randy Dunlap 2022-06-16 10:28 ` Pankaj Raghav 2022-06-16 10:28 ` [dm-devel] " Pankaj Raghav
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=20220615101920.329421-2-p.raghav@samsung.com \ --to=p.raghav@samsung.com \ --cc=Johannes.Thumshirn@wdc.com \ --cc=axboe@kernel.dk \ --cc=bvanassche@acm.org \ --cc=damien.lemoal@opensource.wdc.com \ --cc=dm-devel@redhat.com \ --cc=dsterba@suse.com \ --cc=gost.dev@samsung.com \ --cc=hare@suse.de \ --cc=hch@lst.de \ --cc=jaegeuk@kernel.org \ --cc=jiangbo.365@bytedance.com \ --cc=jonathan.derrick@linux.dev \ --cc=linux-block@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=mcgrof@kernel.org \ --cc=pankydev8@gmail.com \ --cc=snitzer@redhat.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.