Skip to contentSkip to conversation

nvmet-passthru: Limit mdts by BIO_MAX_PAGES

PATCH Superseded Logan Gunthorpe 3 participants 6 messages Oct 16, 2020 – Oct 22, 2020 1 message not in the archive

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 nvmet-passthru: Limit mdts by BIO_MAX_PAGES

nvmet_passthru_map_sg() only supports mapping a single BIO, not a chain so the effective maximum transfer should also be limitted by BIO_MAX_PAGES (presently this works out to 1MB).

For PCI passthru devices the max_sectors would typically be more limitting than BIO_MAX_PAGES, but this may not be true for all passthru devices.

Fixes c1fef73f793b ("nvmet: add passthru code to process commands")
Cc Christoph Hellwig <[email protected]>
Cc Sagi Grimberg <[email protected]>
Cc Chaitanya Kulkarni <[email protected]>
---
 drivers/nvme/target/passthru.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/nvme/target/passthru.c +8 -1
index dacfa7435d0b..1ab88df3310f 100644
@@ -26,7 +26,7 @@ static u16 nvmet_passthru_override_id_ctrl(struct nvmet_req *req)
 	struct nvme_ctrl *pctrl = ctrl->subsys->passthru_ctrl;
 	u16 status = NVME_SC_SUCCESS;
 	struct nvme_id_ctrl *id;
-	u32 max_hw_sectors;
+	int max_hw_sectors;
 	int page_shift;
 
 	id = kzalloc(sizeof(*id), GFP_KERNEL);
@@ -48,6 +48,13 @@ static u16 nvmet_passthru_override_id_ctrl(struct nvmet_req *req)
 	max_hw_sectors = min_not_zero(pctrl->max_segments << (PAGE_SHIFT - 9),
 				      pctrl->max_hw_sectors);
 
+	/*
+	 * nvmet_passthru_map_sg is limitted to using a single bio so limit
+	 * the mdts based on BIO_MAX_PAGES as well
+	 */
+	max_hw_sectors = min_not_zero(BIO_MAX_PAGES << (PAGE_SHIFT - 9),
+				      max_hw_sectors);
+
 	page_shift = NVME_CAP_MPSMIN(ctrl->cap) + 12;
 
 	id->mdts = ilog2(max_hw_sectors) + 9 - page_shift;

base-commit: bbf5c979011a099af5dc76498918ed7df445635b

Signature · 7 lines
2.20.1


_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
#1 lore raw

PATCH v2 2/2 nvmet-passthru: Cleanup nvmet_passthru_map_sg()

Clean up some confusing elements of nvmet_passthru_map_sg() by returning early if the request is greater than the maximum bio size. This allows us to drop the sg_cnt variable.

This should not result in any functional change but makes the code clearer and more understandable. The original code allocated a truncated bio then would return EINVAL when bio_add_pc_page() filled that bio. The new code just returns EINVAL early if this would happen.

Fixes c1fef73f793b ("nvmet: add passthru code to process commands")
Cc Christoph Hellwig <[email protected]>
Cc Chaitanya Kulkarni <[email protected]>
---
 drivers/nvme/target/passthru.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/nvme/target/passthru.c +4 -3
index 1ab88df3310f..8ea9b173f285 100644
@@ -187,18 +187,20 @@ static void nvmet_passthru_req_done(struct request *rq,
 
 static int nvmet_passthru_map_sg(struct nvmet_req *req, struct request *rq)
 {
-	int sg_cnt = req->sg_cnt;
 	struct scatterlist *sg;
 	int op_flags = 0;
 	struct bio *bio;
 	int i, ret;
 
+	if (req->sg_cnt > BIO_MAX_PAGES)
+		return -EINVAL;
+
 	if (req->cmd->common.opcode == nvme_cmd_flush)
 		op_flags = REQ_FUA;
 	else if (nvme_is_write(req->cmd))
 		op_flags = REQ_SYNC | REQ_IDLE;
 
-	bio = bio_alloc(GFP_KERNEL, min(sg_cnt, BIO_MAX_PAGES));
+	bio = bio_alloc(GFP_KERNEL, req->sg_cnt);
 	bio->bi_end_io = bio_put;
 	bio->bi_opf = req_op(rq) | op_flags;
 
@@ -208,7 +210,6 @@ static int nvmet_passthru_map_sg(struct nvmet_req *req, struct request *rq)
 			bio_put(bio);
 			return -EINVAL;
 		}
-		sg_cnt--;
 	}
 
 	ret = blk_rq_append_bio(rq, &bio);
Signature · 7 lines
2.20.1


_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
#2 lore raw
In reply to Logan Gunthorpe
Quoted 31 lines · Logan Gunthorpe

nvmet_passthru_map_sg() only supports mapping a single BIO, not a chain so the effective maximum transfer should also be limitted by BIO_MAX_PAGES (presently this works out to 1MB).

For PCI passthru devices the max_sectors would typically be more limitting than BIO_MAX_PAGES, but this may not be true for all passthru devices.

Fixes c1fef73f793b ("nvmet: add passthru code to process commands")
Cc Christoph Hellwig <[email protected]>
Cc Sagi Grimberg <[email protected]>
Cc Chaitanya Kulkarni <[email protected]>
---
  drivers/nvme/target/passthru.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
drivers/nvme/target/passthru.c +1 -1
index dacfa7435d0b..1ab88df3310f 100644
@@ -26,7 +26,7 @@ static u16 nvmet_passthru_override_id_ctrl(struct nvmet_req *req)
  	struct nvme_ctrl *pctrl = ctrl->subsys->passthru_ctrl;
  	u16 status = NVME_SC_SUCCESS;
  	struct nvme_id_ctrl *id;
-	u32 max_hw_sectors;
+	int max_hw_sectors;
  	int page_shift;
 
  	id = kzalloc(sizeof(*id), GFP_KERNEL);

drivers/nvme/target/passthru.c static u16 nvmet_passthru_override_id_ctrl(struct nvmet_req *req) · line 56

Quoted 9 lines
drivers/nvme/target/passthru.c +6 -0
@@ -48,6 +48,13 @@ static u16 nvmet_passthru_override_id_ctrl(struct nvmet_req *req)
  	max_hw_sectors = min_not_zero(pctrl->max_segments << (PAGE_SHIFT - 9),
  				      pctrl->max_hw_sectors);
 
+	/*
+	 * nvmet_passthru_map_sg is limitted to using a single bio so limit
+	 * the mdts based on BIO_MAX_PAGES as well
+	 */
+	max_hw_sectors = min_not_zero(BIO_MAX_PAGES << (PAGE_SHIFT - 9),
+				      max_hw_sectors);

can 9 be replaced with SECTOR_SHIFT ?

Quoted 6 lines
drivers/nvme/target/passthru.c +1 -0
+
  	page_shift = NVME_CAP_MPSMIN(ctrl->cap) + 12;
 
  	id->mdts = ilog2(max_hw_sectors) + 9 - page_shift;

base-commit: bbf5c979011a099af5dc76498918ed7df445635b

_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme

#3 lore raw
Quoted 36 lines · Max Gurtovoy
Quoted 34 lines · Logan Gunthorpe

nvmet_passthru_map_sg() only supports mapping a single BIO, not a chain so the effective maximum transfer should also be limitted by BIO_MAX_PAGES (presently this works out to 1MB).

For PCI passthru devices the max_sectors would typically be more limitting than BIO_MAX_PAGES, but this may not be true for all passthru devices.

Fixes c1fef73f793b ("nvmet: add passthru code to process commands")
Cc Christoph Hellwig <[email protected]>
Cc Sagi Grimberg <[email protected]>
Cc Chaitanya Kulkarni <[email protected]>
---
  drivers/nvme/target/passthru.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
drivers/nvme/target/passthru.c +1 -1
index dacfa7435d0b..1ab88df3310f 100644
@@ -26,7 +26,7 @@ static u16 nvmet_passthru_override_id_ctrl(struct nvmet_req *req)
  	struct nvme_ctrl *pctrl = ctrl->subsys->passthru_ctrl;
  	u16 status = NVME_SC_SUCCESS;
  	struct nvme_id_ctrl *id;
-	u32 max_hw_sectors;
+	int max_hw_sectors;
  	int page_shift;
 
  	id = kzalloc(sizeof(*id), GFP_KERNEL);
@@ -48,6 +48,13 @@ static u16 nvmet_passthru_override_id_ctrl(struct nvmet_req *req)
  	max_hw_sectors = min_not_zero(pctrl->max_segments << (PAGE_SHIFT - 9),
  				      pctrl->max_hw_sectors);
 
Quoted 8 lines

drivers/nvme/target/passthru.c static u16 nvmet_passthru_override_id_ctrl(struct nvmet_req *req) · line 56

Quoted 6 lines
drivers/nvme/target/passthru.c +6 -0
+	/*
+	 * nvmet_passthru_map_sg is limitted to using a single bio so limit
+	 * the mdts based on BIO_MAX_PAGES as well
+	 */
+	max_hw_sectors = min_not_zero(BIO_MAX_PAGES << (PAGE_SHIFT - 9),
+				      max_hw_sectors);

can 9 be replaced with SECTOR_SHIFT ?

Oh, yes, that does sound better. Thanks.

Logan

_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme

A message that is not in the archive (sent off-list or not yet received): BYAPR04MB4965B1360F5F6A1D13FF1DD0861F0@BYAPR04MB4965.namprd04.prod.outlook.com

#5 lore raw
Quoted 9 lines · Chaitanya Kulkarni
Quoted 8 lines · Logan Gunthorpe
Quoted 3 lines

drivers/nvme/target/passthru.c static u16 nvmet_passthru_override_id_ctrl(struct nvmet_req *req) · line 56

Quoted 2 lines
drivers/nvme/target/passthru.c +2 -0
+	max_hw_sectors = min_not_zero(BIO_MAX_PAGES << (PAGE_SHIFT - 9),
+				      max_hw_sectors);

can 9 be replaced with SECTOR_SHIFT ?

Oh, yes, that does sound better. Thanks.

Logan

Quoted 7 lines

Although it is a good suggestion we are not using the SECTOR_SIZE in

the target code, I don't think we should change that for passthru. Also,

I remember that on the block layer mailing list SECTOR_SIZE macro been

discouraged over use of 9.

Well in that case v2 or v3 can be merged depending on maintainer preference.

Logan

_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme