From: Pankaj Raghav <p.raghav@samsung.com> To: jaegeuk@kernel.org, hare@suse.de, dsterba@suse.com, axboe@kernel.dk, hch@lst.de, damien.lemoal@opensource.wdc.com, snitzer@kernel.org Cc: Chris Mason <clm@fb.com>, Josef Bacik <josef@toxicpanda.com>, bvanassche@acm.org, linux-fsdevel@vger.kernel.org, matias.bjorling@wdc.com, Jens Axboe <axboe@fb.com>, gost.dev@samsung.com, jonathan.derrick@linux.dev, jiangbo.365@bytedance.com, linux-nvme@lists.infradead.org, dm-devel@redhat.com, Naohiro Aota <naohiro.aota@wdc.com>, linux-kernel@vger.kernel.org, Johannes Thumshirn <jth@kernel.org>, Sagi Grimberg <sagi@grimberg.me>, Alasdair Kergon <agk@redhat.com>, linux-block@vger.kernel.org, Chaitanya Kulkarni <kch@nvidia.com>, Keith Busch <kbusch@kernel.org>, linux-btrfs@vger.kernel.org, Pankaj Raghav <p.raghav@samsung.com>, Luis Chamberlain <mcgrof@kernel.org> Subject: [PATCH v3 03/11] nvme: zns: Allow ZNS drives that have non-power_of_2 zone size Date: Fri, 6 May 2022 10:10:57 +0200 [thread overview] Message-ID: <20220506081105.29134-4-p.raghav@samsung.com> (raw) In-Reply-To: <20220506081105.29134-1-p.raghav@samsung.com> Remove the condition which disallows non-power_of_2 zone size ZNS drive to be updated and use generic method to calculate number of zones instead of relying on log and shift based calculation on zone size. The power_of_2 calculation has been replaced directly with generic calculation without special handling. Both modified functions are not used in hot paths, they are only used during initialization & revalidation of the ZNS device. Reviewed-by: Luis Chamberlain <mcgrof@kernel.org> Reviewed by: Adam Manzanares <a.manzanares@samsung.com> Signed-off-by: Pankaj Raghav <p.raghav@samsung.com> --- drivers/nvme/host/zns.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/nvme/host/zns.c b/drivers/nvme/host/zns.c index 9f81beb4d..65d2aa68a 100644 --- a/drivers/nvme/host/zns.c +++ b/drivers/nvme/host/zns.c @@ -101,13 +101,6 @@ int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf) } ns->zsze = nvme_lba_to_sect(ns, le64_to_cpu(id->lbafe[lbaf].zsze)); - if (!is_power_of_2(ns->zsze)) { - dev_warn(ns->ctrl->device, - "invalid zone size:%llu for namespace:%u\n", - ns->zsze, ns->head->ns_id); - status = -ENODEV; - goto free_data; - } blk_queue_set_zoned(ns->disk, BLK_ZONED_HM); blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q); @@ -128,8 +121,13 @@ static void *nvme_zns_alloc_report_buffer(struct nvme_ns *ns, const size_t min_bufsize = sizeof(struct nvme_zone_report) + sizeof(struct nvme_zone_descriptor); + /* + * Division is used to calculate nr_zones with no special handling + * for power of 2 zone sizes as this function is not invoked in a + * hot path + */ nr_zones = min_t(unsigned int, nr_zones, - get_capacity(ns->disk) >> ilog2(ns->zsze)); + div64_u64(get_capacity(ns->disk), ns->zsze)); bufsize = sizeof(struct nvme_zone_report) + nr_zones * sizeof(struct nvme_zone_descriptor); @@ -182,6 +180,7 @@ int nvme_ns_report_zones(struct nvme_ns *ns, sector_t sector, int ret, zone_idx = 0; unsigned int nz, i; size_t buflen; + u64 remainder = 0; if (ns->head->ids.csi != NVME_CSI_ZNS) return -EINVAL; @@ -197,7 +196,14 @@ int nvme_ns_report_zones(struct nvme_ns *ns, sector_t sector, c.zmr.zrasf = NVME_ZRASF_ZONE_REPORT_ALL; c.zmr.pr = NVME_REPORT_ZONE_PARTIAL; - sector &= ~(ns->zsze - 1); + /* + * rounddown the sector value to the nearest zone size. roundown macro + * provided in math.h will not work for 32 bit architectures. + * Division is used here with no special handling for power of 2 + * zone sizes as this function is not invoked in a hot path + */ + div64_u64_rem(sector, ns->zsze, &remainder); + sector -= remainder; while (zone_idx < nr_zones && sector < get_capacity(ns->disk)) { memset(report, 0, buflen); -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Pankaj Raghav <p.raghav@samsung.com> To: jaegeuk@kernel.org, hare@suse.de, dsterba@suse.com, axboe@kernel.dk, hch@lst.de, damien.lemoal@opensource.wdc.com, snitzer@kernel.org Cc: jiangbo.365@bytedance.com, linux-nvme@lists.infradead.org, Chris Mason <clm@fb.com>, dm-devel@redhat.com, Alasdair Kergon <agk@redhat.com>, Naohiro Aota <naohiro.aota@wdc.com>, bvanassche@acm.org, gost.dev@samsung.com, jonathan.derrick@linux.dev, Pankaj Raghav <p.raghav@samsung.com>, Chaitanya Kulkarni <kch@nvidia.com>, Josef Bacik <josef@toxicpanda.com>, linux-block@vger.kernel.org, Keith Busch <kbusch@kernel.org>, matias.bjorling@wdc.com, Sagi Grimberg <sagi@grimberg.me>, Jens Axboe <axboe@fb.com>, linux-kernel@vger.kernel.org, Luis Chamberlain <mcgrof@kernel.org>, linux-fsdevel@vger.kernel.org, Johannes Thumshirn <jth@kernel.org>, linux-btrfs@vger.kernel.org Subject: [dm-devel] [PATCH v3 03/11] nvme: zns: Allow ZNS drives that have non-power_of_2 zone size Date: Fri, 6 May 2022 10:10:57 +0200 [thread overview] Message-ID: <20220506081105.29134-4-p.raghav@samsung.com> (raw) In-Reply-To: <20220506081105.29134-1-p.raghav@samsung.com> Remove the condition which disallows non-power_of_2 zone size ZNS drive to be updated and use generic method to calculate number of zones instead of relying on log and shift based calculation on zone size. The power_of_2 calculation has been replaced directly with generic calculation without special handling. Both modified functions are not used in hot paths, they are only used during initialization & revalidation of the ZNS device. Reviewed-by: Luis Chamberlain <mcgrof@kernel.org> Reviewed by: Adam Manzanares <a.manzanares@samsung.com> Signed-off-by: Pankaj Raghav <p.raghav@samsung.com> --- drivers/nvme/host/zns.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/nvme/host/zns.c b/drivers/nvme/host/zns.c index 9f81beb4d..65d2aa68a 100644 --- a/drivers/nvme/host/zns.c +++ b/drivers/nvme/host/zns.c @@ -101,13 +101,6 @@ int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf) } ns->zsze = nvme_lba_to_sect(ns, le64_to_cpu(id->lbafe[lbaf].zsze)); - if (!is_power_of_2(ns->zsze)) { - dev_warn(ns->ctrl->device, - "invalid zone size:%llu for namespace:%u\n", - ns->zsze, ns->head->ns_id); - status = -ENODEV; - goto free_data; - } blk_queue_set_zoned(ns->disk, BLK_ZONED_HM); blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q); @@ -128,8 +121,13 @@ static void *nvme_zns_alloc_report_buffer(struct nvme_ns *ns, const size_t min_bufsize = sizeof(struct nvme_zone_report) + sizeof(struct nvme_zone_descriptor); + /* + * Division is used to calculate nr_zones with no special handling + * for power of 2 zone sizes as this function is not invoked in a + * hot path + */ nr_zones = min_t(unsigned int, nr_zones, - get_capacity(ns->disk) >> ilog2(ns->zsze)); + div64_u64(get_capacity(ns->disk), ns->zsze)); bufsize = sizeof(struct nvme_zone_report) + nr_zones * sizeof(struct nvme_zone_descriptor); @@ -182,6 +180,7 @@ int nvme_ns_report_zones(struct nvme_ns *ns, sector_t sector, int ret, zone_idx = 0; unsigned int nz, i; size_t buflen; + u64 remainder = 0; if (ns->head->ids.csi != NVME_CSI_ZNS) return -EINVAL; @@ -197,7 +196,14 @@ int nvme_ns_report_zones(struct nvme_ns *ns, sector_t sector, c.zmr.zrasf = NVME_ZRASF_ZONE_REPORT_ALL; c.zmr.pr = NVME_REPORT_ZONE_PARTIAL; - sector &= ~(ns->zsze - 1); + /* + * rounddown the sector value to the nearest zone size. roundown macro + * provided in math.h will not work for 32 bit architectures. + * Division is used here with no special handling for power of 2 + * zone sizes as this function is not invoked in a hot path + */ + div64_u64_rem(sector, ns->zsze, &remainder); + sector -= remainder; while (zone_idx < nr_zones && sector < get_capacity(ns->disk)) { memset(report, 0, buflen); -- 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-05-06 8:11 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <CGME20220506081106eucas1p181e83ef352eb8bfb1752bee0cf84020f@eucas1p1.samsung.com> 2022-05-06 8:10 ` [PATCH v3 00/11] support non power of 2 zoned devices Pankaj Raghav 2022-05-06 8:10 ` [dm-devel] " Pankaj Raghav [not found] ` <CGME20220506081107eucas1p1070e00b208e00090c235017435be1593@eucas1p1.samsung.com> 2022-05-06 8:10 ` [PATCH v3 01/11] block: make blkdev_nr_zones and blk_queue_zone_no generic for npo2 zsze Pankaj Raghav 2022-05-06 8:10 ` [dm-devel] " Pankaj Raghav [not found] ` <CGME20220506081108eucas1p2ca72ccafb05dfdcc5b8ba9393da1ce60@eucas1p2.samsung.com> 2022-05-06 8:10 ` [PATCH v3 02/11] block: allow blk-zoned devices to have non-power-of-2 zone size Pankaj Raghav 2022-05-06 8:10 ` [dm-devel] " Pankaj Raghav [not found] ` <CGME20220506081109eucas1p26bbb68a1740b1af923ed862a93112780@eucas1p2.samsung.com> 2022-05-06 8:10 ` Pankaj Raghav [this message] 2022-05-06 8:10 ` [dm-devel] [PATCH v3 03/11] nvme: zns: Allow ZNS drives that have non-power_of_2 " Pankaj Raghav [not found] ` <CGME20220506081110eucas1p1b6c624ddca1c41b9838bb5b85f8ca5ff@eucas1p1.samsung.com> 2022-05-06 8:10 ` [PATCH v3 04/11] nvmet: Allow ZNS target to support non-power_of_2 zone sizes Pankaj Raghav 2022-05-06 8:10 ` [dm-devel] " Pankaj Raghav [not found] ` <CGME20220506081111eucas1p11e4dd5a89ce49939bbea57433cea046f@eucas1p1.samsung.com> 2022-05-06 8:10 ` [PATCH v3 05/11] btrfs: zoned: Cache superblock location in btrfs_zoned_device_info Pankaj Raghav 2022-05-06 8:10 ` [dm-devel] " Pankaj Raghav [not found] ` <CGME20220506081112eucas1p2f6116cb713749c259a6da533df9c2505@eucas1p2.samsung.com> 2022-05-06 8:11 ` [PATCH v3 06/11] btrfs: zoned: Make sb_zone_number function non power of 2 compatible Pankaj Raghav 2022-05-06 8:11 ` [dm-devel] " Pankaj Raghav [not found] ` <CGME20220506081113eucas1p25deb73a4b7898476d2e8e3d35b16f879@eucas1p2.samsung.com> 2022-05-06 8:11 ` [PATCH v3 07/11] btrfs: zoned: use generic btrfs zone helpers to support npo2 zoned devices Pankaj Raghav 2022-05-06 8:11 ` [dm-devel] " Pankaj Raghav [not found] ` <CGME20220506081114eucas1p1a9d86eb429a6f68c29d1980891f49786@eucas1p1.samsung.com> 2022-05-06 8:11 ` [PATCH v3 08/11] btrfs: zoned: relax the alignment constraint for " Pankaj Raghav 2022-05-06 8:11 ` [dm-devel] " Pankaj Raghav [not found] ` <CGME20220506081115eucas1p2e7bed137c74be42a702732027581330e@eucas1p2.samsung.com> 2022-05-06 8:11 ` [PATCH v3 09/11] zonefs: allow non power of 2 " Pankaj Raghav 2022-05-06 8:11 ` [dm-devel] " Pankaj Raghav [not found] ` <CGME20220506081116eucas1p2cce67bbf30f4c9c4e6854965be41b098@eucas1p2.samsung.com> 2022-05-06 8:11 ` [PATCH v3 10/11] null_blk: " Pankaj Raghav 2022-05-06 8:11 ` [dm-devel] " Pankaj Raghav 2022-05-06 15:47 ` Damien Le Moal 2022-05-06 15:47 ` [dm-devel] " Damien Le Moal 2022-05-09 11:06 ` Pankaj Raghav 2022-05-09 11:06 ` [dm-devel] " Pankaj Raghav 2022-05-09 11:31 ` Damien Le Moal 2022-05-09 11:31 ` [dm-devel] " Damien Le Moal 2022-05-09 11:56 ` Pankaj Raghav 2022-05-09 11:56 ` [dm-devel] " Pankaj Raghav 2022-05-12 17:22 ` Bart Van Assche 2022-05-12 17:22 ` [dm-devel] " Bart Van Assche [not found] ` <CGME20220506081118eucas1p17f3c29cc36d748c3b5a3246f069f434a@eucas1p1.samsung.com> 2022-05-06 8:11 ` [PATCH v3 11/11] dm-zoned: ensure only power of 2 zone sizes are allowed Pankaj Raghav 2022-05-06 8:11 ` [dm-devel] " Pankaj Raghav 2022-05-06 15:41 ` Damien Le Moal 2022-05-06 15:41 ` [dm-devel] " Damien Le Moal 2022-05-09 11:03 ` Pankaj Raghav 2022-05-09 11:03 ` [dm-devel] " Pankaj Raghav 2022-05-09 16:05 ` Mike Snitzer 2022-05-09 16:05 ` [dm-devel] " Mike Snitzer 2022-05-09 18:54 ` David Sterba 2022-05-09 18:54 ` [dm-devel] " David Sterba 2022-05-11 14:39 ` Pankaj Raghav 2022-05-11 14:39 ` [dm-devel] " Pankaj Raghav 2022-05-11 16:00 ` David Sterba 2022-05-11 16:00 ` [dm-devel] " David Sterba 2022-05-12 8:27 ` Pankaj Raghav 2022-05-12 8:27 ` [dm-devel] " Pankaj Raghav 2022-05-06 10:00 ` [PATCH v3 00/11] support non power of 2 zoned devices David Sterba 2022-05-06 10:00 ` [dm-devel] " David Sterba 2022-05-09 11:02 ` Pankaj Raghav 2022-05-09 11:02 ` [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=20220506081105.29134-4-p.raghav@samsung.com \ --to=p.raghav@samsung.com \ --cc=agk@redhat.com \ --cc=axboe@fb.com \ --cc=axboe@kernel.dk \ --cc=bvanassche@acm.org \ --cc=clm@fb.com \ --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=josef@toxicpanda.com \ --cc=jth@kernel.org \ --cc=kbusch@kernel.org \ --cc=kch@nvidia.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-btrfs@vger.kernel.org \ --cc=linux-fsdevel@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=naohiro.aota@wdc.com \ --cc=sagi@grimberg.me \ --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: 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.