diff options
| author | Revanth Rajashekar <revanth.rajashekar@intel.com> | 2021-01-14 18:55:07 -0700 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2021-01-18 18:58:16 +0100 |
| commit | 4d6b1c95b974761c01cbad92321b82232b66d2a2 (patch) | |
| tree | 47a2beda78c68f825156da3a1970ab0a5a0d19a7 /drivers/nvme/host | |
| parent | b4f664252f51e119e9403ef84b6e9ff36d119510 (diff) | |
| download | linux-stable-4d6b1c95b974761c01cbad92321b82232b66d2a2.tar.gz linux-stable-4d6b1c95b974761c01cbad92321b82232b66d2a2.tar.bz2 linux-stable-4d6b1c95b974761c01cbad92321b82232b66d2a2.zip | |
nvme: check the PRINFO bit before deciding the host buffer length
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>
Diffstat (limited to 'drivers/nvme/host')
| -rw-r--r-- | drivers/nvme/host/core.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 200bdd672c28..8caf9b34734d 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -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; |