Skip to contentSkip to conversation

nvme: check PI size if metadata size or below

PATCH Superseded Tokunori Ikegami 1 participant 1 message Oct 22, 2024 NVMe

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 nvme: check PI size if metadata size or below

The PI is the first bytes or last bytes of the metadata. So its size is not equal to the metadata size only but below also.

---
Changes since v1:
- Fix the commit message spelling miss hte to the.

 drivers/nvme/host/ioctl.c | 4 ++--
 drivers/nvme/host/nvme.h  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/nvme/host/ioctl.c +2 -2
index b9b79ccfabf8..9fddaaddbbf1 100644
@@ -232,8 +232,8 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)
 
 	length = (io.nblocks + 1) << ns->head->lba_shift;
 
-	if ((io.control & NVME_RW_PRINFO_PRACT) &&
-	    (ns->head->ms == ns->head->pi_size)) {
+	if (io.control & NVME_RW_PRINFO_PRACT &&
+	    ns->head->ms >= ns->head->pi_size) {
 		/*
 		 * Protection information is stripped/inserted by the
 		 * controller.
drivers/nvme/host/nvme.h +1 -1
index 093cb423f536..fbcb2243ba84 100644
@@ -542,7 +542,7 @@ struct nvme_ns {
 /* NVMe ns supports metadata actions by the controller (generate/strip) */
 static inline bool nvme_ns_has_pi(struct nvme_ns_head *head)
 {
-	return head->pi_type && head->ms == head->pi_size;
+	return head->pi_type && head->ms >= head->pi_size;
 }
 
 struct nvme_ctrl_ops {
Signature · 1 line
2.45.2