linux-kernel - [PATCH v15 04/13] nvmet: Allow ZNS target to support non-power_of

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20220923173618.6899-5-p.raghav@samsung.com>
Date:   Fri, 23 Sep 2022 19:36:09 +0200
From:   Pankaj Raghav <p.raghav@...sung.com>
To:     snitzer@...nel.org, axboe@...nel.dk, agk@...hat.com, hch@....de,
        damien.lemoal@...nsource.wdc.com
Cc:     jaegeuk@...nel.org, gost.dev@...sung.com, bvanassche@....org,
        linux-kernel@...r.kernel.org, hare@...e.de,
        matias.bjorling@....com, Johannes.Thumshirn@....com,
        linux-block@...r.kernel.org, linux-nvme@...ts.infradead.org,
        pankydev8@...il.com, dm-devel@...hat.com,
        Pankaj Raghav <p.raghav@...sung.com>,
        Johannes Thumshirn <johannes.thumshirn@....com>,
        Chaitanya Kulkarni <kch@...dia.com>,
        Luis Chamberlain <mcgrof@...nel.org>
Subject: [PATCH v15 04/13] nvmet: Allow ZNS target to support non-power_of_2
 zone sizes

A generic bdev_zone_no() helper is added to calculate zone number for a
given sector in a block device. This helper internally uses disk_zone_no()
to find the zone number.

Use the helper bdev_zone_no() to calculate nr of zones. This let's us
make modifications to the math if needed in one place and adds now
support for zoned devices with non po2 zone size.

Reviewed by: Adam Manzanares <a.manzanares@...sung.com>
Reviewed-by: Bart Van Assche <bvanassche@....org>
Reviewed-by: Hannes Reinecke <hare@...e.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@....com>
Reviewed-by: Chaitanya Kulkarni <kch@...dia.com>
Signed-off-by: Luis Chamberlain <mcgrof@...nel.org>
Signed-off-by: Pankaj Raghav <p.raghav@...sung.com>
---
 drivers/nvme/target/zns.c | 3 +--
 include/linux/blkdev.h    | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/target/zns.c b/drivers/nvme/target/zns.c
index 835bfda86fcf..1c5352295db1 100644
--- a/drivers/nvme/target/zns.c
+++ b/drivers/nvme/target/zns.c
@@ -254,8 +254,7 @@ static unsigned long nvmet_req_nr_zones_from_slba(struct nvmet_req *req)
 {
 	unsigned int sect = nvmet_lba_to_sect(req->ns, req->cmd->zmr.slba);
 
-	return bdev_nr_zones(req->ns->bdev) -
-		(sect >> ilog2(bdev_zone_sectors(req->ns->bdev)));
+	return bdev_nr_zones(req->ns->bdev) - bdev_zone_no(req->ns->bdev, sect);
 }
 
 static unsigned long get_nr_zones_from_buf(struct nvmet_req *req, u32 bufsize)
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index e29799076298..5cf34ccd3e12 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1340,6 +1340,11 @@ static inline enum blk_zoned_model bdev_zoned_model(struct block_device *bdev)
 	return BLK_ZONED_NONE;
 }
 
+static inline unsigned int bdev_zone_no(struct block_device *bdev, sector_t sec)
+{
+	return disk_zone_no(bdev->bd_disk, sec);
+}
+
 static inline int queue_dma_alignment(const struct request_queue *q)
 {
 	return q ? q->dma_alignment : 511;
-- 
2.25.1