Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
IronPort-SDR: gBNvcWGFlwOln7OdiYqOektQWLfS3P3byJLaAVZPISoOShN2KzJCCZbNIb4FyS4pTjnY1zvxTm
 lVSc+3p8ueCuJ5YR3qD3NZdHx3adG7SC+D/kVMKXHPm68EkyOj1wHAUaEBq2eecxTI4/xfLcp+
 C97x8UpnxK5cs1r1mFdjk/AmEvCjx3FKozC0ocLAd47N9nuKFtrSFRlpD7j0zrIVRUxMoD9EtE
 zuaFN8gKE6JhKqQS5o3vZC7wz1ZW+i2l/OdvkHJXBfSanAN7+DlLlewh6v0UPnM3Nx3jCrg1l/
 yz/0mA1oD+7VBhkLU0MlnEQ/
IronPort-SDR: Wnq75+XBAxLJJUeIO6lT8YWaMU1mTQX900G6CNL3z/at4WdSp9iGMJCMebkQBJ3Jyc/4gcjGtP
 JcImDJohIs4FRCqkmi/KFoaxLAzUoHhhe+k0RXMzOKinqqfadTg2d9HzuVRhIs6Ck9naRKG8ru
 2SM/gn8BMnFfSoqyrBn/ZIsewKt+ggIKN11EG3lMkrh5u0eNOcPEKW8gJjysxGbUeBi//rr/vU
 dmlICTNkS0Kz0RUPGjnaIt90ICldpOu98nyIjOP6DYzrgMMHSbmLRABo1sQDPOc3kzJmTuk91J
 by8=
WDCIronportException: Internal
From:   Dennis Maisenbacher <Dennis.Maisenbacher@wdc.com>
To:     linux-nvme@lists.infradead.org
Cc:     Dennis Maisenbacher <dennis.maisenbacher@wdc.com>,
        Niklas Cassel <niklas.cassel@wdc.com>,
        Christoph Hellwig <hch@lst.de>,
        Sagi Grimberg <sagi@grimberg.me>,
        Chaitanya Kulkarni <kch@nvidia.com>,
        Damien Le Moal <damien.lemoal@wdc.com>,
        linux-kernel@vger.kernel.org
Subject: [PATCH v2] nvmet: fix mar and mor off-by-one errors
Date:   Tue,  6 Sep 2022 09:39:28 +0200
Message-Id: <20220906073929.3292899-1-Dennis.Maisenbacher@wdc.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

From: Dennis Maisenbacher <dennis.maisenbacher@wdc.com>

Maximum Active Resources (MAR) and Maximum Open Resources (MOR) are 0's
based vales where a value of 0xffffffff indicates that there is no limit.

Decrement the values that are returned by bdev_max_open_zones and
bdev_max_active_zones as the block layer helpers are not 0's based.
A 0 returned by the block layer helpers indicates no limit, thus convert
it to 0xffffffff (U32_MAX).

Fixes: aaf2e048af27 ("nvmet: add ZBD over ZNS backend support")
Suggested-by: Niklas Cassel <niklas.cassel@wdc.com>
Signed-off-by: Dennis Maisenbacher <dennis.maisenbacher@wdc.com>
---
Changes in v2:
    - Add explicit check if block layer helpers return a 0 and if so
    convert it to U32_MAX.
    - Add Fixes tag.

 drivers/nvme/target/zns.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/target/zns.c b/drivers/nvme/target/zns.c
index c7ef69f29fe4..eae81f939067 100644
--- a/drivers/nvme/target/zns.c
+++ b/drivers/nvme/target/zns.c
@@ -100,6 +100,7 @@ void nvmet_execute_identify_cns_cs_ns(struct nvmet_req *req)
 	struct nvme_id_ns_zns *id_zns;
 	u64 zsze;
 	u16 status;
+	u32 mar, mor;
 
 	if (le32_to_cpu(req->cmd->identify.nsid) == NVME_NSID_ALL) {
 		req->error_loc = offsetof(struct nvme_identify, nsid);
@@ -130,8 +131,20 @@ void nvmet_execute_identify_cns_cs_ns(struct nvmet_req *req)
 	zsze = (bdev_zone_sectors(req->ns->bdev) << 9) >>
 					req->ns->blksize_shift;
 	id_zns->lbafe[0].zsze = cpu_to_le64(zsze);
-	id_zns->mor = cpu_to_le32(bdev_max_open_zones(req->ns->bdev));
-	id_zns->mar = cpu_to_le32(bdev_max_active_zones(req->ns->bdev));
+
+	mor = bdev_max_open_zones(req->ns->bdev);
+	if (!mor)
+		mor = U32_MAX;
+	else
+		--mor;
+	id_zns->mor = cpu_to_le32(mor);
+
+	mar = bdev_max_active_zones(req->ns->bdev);
+	if (!mar)
+		mar = U32_MAX;
+	else
+		--mar;
+	id_zns->mar = cpu_to_le32(mar);
 
 done:
 	status = nvmet_copy_to_sgl(req, 0, id_zns, sizeof(*id_zns));
-- 
2.25.1