]> git.baikalelectronics.ru Git - kernel.git/commitdiff
nvme: check the PRINFO bit before deciding the host buffer length
authorRevanth Rajashekar <revanth.rajashekar@intel.com>
Fri, 15 Jan 2021 01:55:07 +0000 (18:55 -0700)
committerChristoph Hellwig <hch@lst.de>
Mon, 18 Jan 2021 17:58:16 +0000 (18:58 +0100)
According to NVMe spec v1.4, section 8.3.1, the PRINFO bit and
the metadata size play a vital role in deteriming the host buffer size.

If PRIFNO bit is set and MS==8, the host doesn't add the metadata buffer,
instead the controller adds it.

Signed-off-by: Revanth Rajashekar <revanth.rajashekar@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/core.c

index 200bdd672c281ffc54d7d5bc19be654ca2302d48..8caf9b34734dc75d6abf16cfdd68d0ef0f515551 100644 (file)
@@ -1543,8 +1543,21 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)
        }
 
        length = (io.nblocks + 1) << ns->lba_shift;
-       meta_len = (io.nblocks + 1) * ns->ms;
-       metadata = nvme_to_user_ptr(io.metadata);
+
+       if ((io.control & NVME_RW_PRINFO_PRACT) &&
+           ns->ms == sizeof(struct t10_pi_tuple)) {
+               /*
+                * Protection information is stripped/inserted by the
+                * controller.
+                */
+               if (nvme_to_user_ptr(io.metadata))
+                       return -EINVAL;
+               meta_len = 0;
+               metadata = NULL;
+       } else {
+               meta_len = (io.nblocks + 1) * ns->ms;
+               metadata = nvme_to_user_ptr(io.metadata);
+       }
 
        if (ns->features & NVME_NS_EXT_LBAS) {
                length += meta_len;