ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme/pcie: validate that mptr is iova contiguous

Browse Source 
Also add unit tests that explicitly test this
condition.  They fail without the nvme driver changes
in this patch.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Iaa369be341eb4eba394f248990e56dce001d3940
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15579
Reviewed-by: Mariusz Barczak <mariusz.barczak@intel.com>
Reviewed-by: Wojciech Malikowski <wojciech.malikowski@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Jim Harris 2022-11-22 18:10:50 +00:00 committed by Tomasz Zawadzki
parent ef9168dcaa
commit 2be196c609
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/nvme/nvme_pcie_common.c
View File

@ -1585,6 +1585,7 @@ nvme_pcie_qpair_build_metadata(struct spdk_nvme_qpair *qpair, struct nvme_tracke
{ {
void *md_payload; void *md_payload;
struct nvme_request *req = tr->req; struct nvme_request *req = tr->req;
uint64_t mapping_length;
if (req->payload.md) { if (req->payload.md) {
md_payload = req->payload.md + req->md_offset; md_payload = req->payload.md + req->md_offset;
@ -1593,11 +1594,13 @@ nvme_pcie_qpair_build_metadata(struct spdk_nvme_qpair *qpair, struct nvme_tracke
goto exit; goto exit;
} }
mapping_length = req->md_size;
if (sgl_supported && dword_aligned) { if (sgl_supported && dword_aligned) {
assert(req->cmd.psdt == SPDK_NVME_PSDT_SGL_MPTR_CONTIG); assert(req->cmd.psdt == SPDK_NVME_PSDT_SGL_MPTR_CONTIG);
req->cmd.psdt = SPDK_NVME_PSDT_SGL_MPTR_SGL; req->cmd.psdt = SPDK_NVME_PSDT_SGL_MPTR_SGL;
tr->meta_sgl.address = nvme_pcie_vtophys(qpair->ctrlr, md_payload, NULL);
if (tr->meta_sgl.address == SPDK_VTOPHYS_ERROR) { tr->meta_sgl.address = nvme_pcie_vtophys(qpair->ctrlr, md_payload, &mapping_length);
if (tr->meta_sgl.address == SPDK_VTOPHYS_ERROR || mapping_length != req->md_size) {
goto exit; goto exit;
} }
tr->meta_sgl.unkeyed.type = SPDK_NVME_SGL_TYPE_DATA_BLOCK; tr->meta_sgl.unkeyed.type = SPDK_NVME_SGL_TYPE_DATA_BLOCK;
@ -1605,8 +1608,8 @@ nvme_pcie_qpair_build_metadata(struct spdk_nvme_qpair *qpair, struct nvme_tracke
tr->meta_sgl.unkeyed.subtype = 0; tr->meta_sgl.unkeyed.subtype = 0;
req->cmd.mptr = tr->prp_sgl_bus_addr - sizeof(struct spdk_nvme_sgl_descriptor); req->cmd.mptr = tr->prp_sgl_bus_addr - sizeof(struct spdk_nvme_sgl_descriptor);
} else { } else {
req->cmd.mptr = nvme_pcie_vtophys(qpair->ctrlr, md_payload, NULL); req->cmd.mptr = nvme_pcie_vtophys(qpair->ctrlr, md_payload, &mapping_length);
if (req->cmd.mptr == SPDK_VTOPHYS_ERROR) { if (req->cmd.mptr == SPDK_VTOPHYS_ERROR || mapping_length != req->md_size) {
goto exit; goto exit;
} }
} }

26
test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c
View File

@ -98,7 +98,7 @@ DEFINE_RETURN_MOCK(spdk_vtophys, uint64_t);
uint64_t uint64_t
spdk_vtophys(const void *buf, uint64_t *size) spdk_vtophys(const void *buf, uint64_t *size)
{ {
if (size) { if (size && g_vtophys_size > 0) {
*size = g_vtophys_size; *size = g_vtophys_size;
} }
@ -491,7 +491,8 @@ test_build_contig_hw_sgl_request(void)
static void static void
test_nvme_pcie_qpair_build_metadata(void) test_nvme_pcie_qpair_build_metadata(void)
{ {
struct spdk_nvme_qpair qpair = {}; struct nvme_pcie_qpair pqpair = {};
struct spdk_nvme_qpair *qpair = &pqpair.qpair;
struct nvme_tracker tr = {}; struct nvme_tracker tr = {};
struct nvme_request req = {}; struct nvme_request req = {};
struct spdk_nvme_ctrlr ctrlr = {}; struct spdk_nvme_ctrlr ctrlr = {};
@ -499,7 +500,7 @@ test_nvme_pcie_qpair_build_metadata(void)
ctrlr.trid.trtype = SPDK_NVME_TRANSPORT_PCIE; ctrlr.trid.trtype = SPDK_NVME_TRANSPORT_PCIE;
tr.req = &req; tr.req = &req;
qpair.ctrlr = &ctrlr; qpair->ctrlr = &ctrlr;
req.payload.md = (void *)0xDEADBEE0; req.payload.md = (void *)0xDEADBEE0;
req.md_offset = 0; req.md_offset = 0;
@ -508,7 +509,7 @@ test_nvme_pcie_qpair_build_metadata(void)
tr.prp_sgl_bus_addr = 0xDBADBEEF; tr.prp_sgl_bus_addr = 0xDBADBEEF;
MOCK_SET(spdk_vtophys, 0xDCADBEE0); MOCK_SET(spdk_vtophys, 0xDCADBEE0);
rc = nvme_pcie_qpair_build_metadata(&qpair, &tr, true, true); rc = nvme_pcie_qpair_build_metadata(qpair, &tr, true, true);
CU_ASSERT(rc == 0); CU_ASSERT(rc == 0);
CU_ASSERT(req.cmd.psdt = SPDK_NVME_PSDT_SGL_MPTR_SGL); CU_ASSERT(req.cmd.psdt = SPDK_NVME_PSDT_SGL_MPTR_SGL);
CU_ASSERT(tr.meta_sgl.address == 0xDCADBEE0); CU_ASSERT(tr.meta_sgl.address == 0xDCADBEE0);
@ -516,14 +517,29 @@ test_nvme_pcie_qpair_build_metadata(void)
CU_ASSERT(tr.meta_sgl.unkeyed.length == 4096); CU_ASSERT(tr.meta_sgl.unkeyed.length == 4096);
CU_ASSERT(tr.meta_sgl.unkeyed.subtype == 0); CU_ASSERT(tr.meta_sgl.unkeyed.subtype == 0);
CU_ASSERT(req.cmd.mptr == (0xDBADBEEF - sizeof(struct spdk_nvme_sgl_descriptor))); CU_ASSERT(req.cmd.mptr == (0xDBADBEEF - sizeof(struct spdk_nvme_sgl_descriptor)));
/* Non-IOVA contiguous metadata buffers should fail. */
g_vtophys_size = 1024;
req.cmd.psdt = SPDK_NVME_PSDT_SGL_MPTR_CONTIG;
rc = nvme_pcie_qpair_build_metadata(qpair, &tr, true, true);
CU_ASSERT(rc == -EINVAL);
g_vtophys_size = 0;
MOCK_CLEAR(spdk_vtophys); MOCK_CLEAR(spdk_vtophys);
/* Build non sgl metadata */ /* Build non sgl metadata */
MOCK_SET(spdk_vtophys, 0xDDADBEE0); MOCK_SET(spdk_vtophys, 0xDDADBEE0);
rc = nvme_pcie_qpair_build_metadata(&qpair, &tr, false, true); rc = nvme_pcie_qpair_build_metadata(qpair, &tr, false, true);
CU_ASSERT(rc == 0); CU_ASSERT(rc == 0);
CU_ASSERT(req.cmd.mptr == 0xDDADBEE0); CU_ASSERT(req.cmd.mptr == 0xDDADBEE0);
/* Non-IOVA contiguous metadata buffers should fail. */
g_vtophys_size = 1024;
rc = nvme_pcie_qpair_build_metadata(qpair, &tr, false, true);
CU_ASSERT(rc == -EINVAL);
g_vtophys_size = 0;
MOCK_CLEAR(spdk_vtophys); MOCK_CLEAR(spdk_vtophys);
} }