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

nvmf: use req->iov consistently in unit tests

Browse Source 
Use req->iov as needed, to make it easier to remove req->data later.

Signed-off-by: John Levon <john.levon@nutanix.com>
Change-Id: I3084254ec44cfc4e11f8beccc61c895232daf272
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16197
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
This commit is contained in:
John Levon 2023-01-07 20:37:19 +00:00 committed by Tomasz Zawadzki
parent e1413e9197
commit 9b7c2bf544
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/unit/lib/nvmf/subsystem.c/subsystem_ut.c
View File

@ -610,7 +610,7 @@ ut_reservation_free_req(struct spdk_nvmf_request *req)
{ {
free(req->cmd); free(req->cmd);
free(req->rsp); free(req->rsp);
free(req->data); free(req->iov[0].iov_base);
free(req); free(req);
} }
@ -629,7 +629,7 @@ ut_reservation_build_register_request(struct spdk_nvmf_request *req,
cmd->cdw10_bits.resv_register.rrega = rrega; cmd->cdw10_bits.resv_register.rrega = rrega;
cmd->cdw10_bits.resv_register.iekey = iekey; cmd->cdw10_bits.resv_register.iekey = iekey;
cmd->cdw10_bits.resv_register.cptpl = cptpl; cmd->cdw10_bits.resv_register.cptpl = cptpl;
memcpy(req->data, &key, sizeof(key)); memcpy(req->iov[0].iov_base, &key, sizeof(key));
} }
static void static void
@ -647,7 +647,7 @@ ut_reservation_build_acquire_request(struct spdk_nvmf_request *req,
cmd->cdw10_bits.resv_acquire.racqa = racqa; cmd->cdw10_bits.resv_acquire.racqa = racqa;
cmd->cdw10_bits.resv_acquire.iekey = iekey; cmd->cdw10_bits.resv_acquire.iekey = iekey;
cmd->cdw10_bits.resv_acquire.rtype = rtype; cmd->cdw10_bits.resv_acquire.rtype = rtype;
memcpy(req->data, &key, sizeof(key)); memcpy(req->iov[0].iov_base, &key, sizeof(key));
} }
static void static void
@ -661,7 +661,7 @@ ut_reservation_build_release_request(struct spdk_nvmf_request *req,
cmd->cdw10_bits.resv_release.rrela = rrela; cmd->cdw10_bits.resv_release.rrela = rrela;
cmd->cdw10_bits.resv_release.iekey = iekey; cmd->cdw10_bits.resv_release.iekey = iekey;
cmd->cdw10_bits.resv_release.rtype = rtype; cmd->cdw10_bits.resv_release.rtype = rtype;
memcpy(req->data, &crkey, sizeof(crkey)); memcpy(req->iov[0].iov_base, &crkey, sizeof(crkey));
} }
/* /*
@ -1512,13 +1512,15 @@ test_nvmf_ns_reservation_report(void)
struct spdk_nvme_registered_ctrlr_extended_data *ctrlr_data; struct spdk_nvme_registered_ctrlr_extended_data *ctrlr_data;
struct spdk_nvme_reservation_status_extended_data *status_data; struct spdk_nvme_reservation_status_extended_data *status_data;
struct spdk_nvmf_registrant *reg; struct spdk_nvmf_registrant *reg;
void *data;
data = calloc(1, sizeof(*status_data) + sizeof(*ctrlr_data) * 2);
reg = calloc(2, sizeof(struct spdk_nvmf_registrant));
SPDK_CU_ASSERT_FATAL(data != NULL && reg != NULL);
req.length = sizeof(*status_data) + sizeof(*ctrlr_data) * 2; req.length = sizeof(*status_data) + sizeof(*ctrlr_data) * 2;
req.data = calloc(1, req.length); spdk_iov_one(req.iov, &req.iovcnt, data, req.length);
reg = calloc(2, sizeof(struct spdk_nvmf_registrant)); req.data = req.iov[0].iov_base;
SPDK_CU_ASSERT_FATAL(req.data != NULL && reg != NULL);
spdk_iov_one(req.iov, &req.iovcnt, req.data, req.length);
req.cmd = &cmd; req.cmd = &cmd;
req.rsp = &rsp; req.rsp = &rsp;
@ -1539,8 +1541,8 @@ test_nvmf_ns_reservation_report(void)
CU_ASSERT(req.rsp->nvme_cpl.status.sct == SPDK_NVME_SCT_GENERIC); CU_ASSERT(req.rsp->nvme_cpl.status.sct == SPDK_NVME_SCT_GENERIC);
CU_ASSERT(req.rsp->nvme_cpl.status.sc == SPDK_NVME_SC_SUCCESS); CU_ASSERT(req.rsp->nvme_cpl.status.sc == SPDK_NVME_SC_SUCCESS);
/* Get ctrlr data and status data pointers */ /* Get ctrlr data and status data pointers */
ctrlr_data = (void *)((uint64_t)req.data + sizeof(*status_data)); ctrlr_data = (void *)((char *)req.iov[0].iov_base + sizeof(*status_data));
status_data = (void *)req.data; status_data = (void *)req.iov[0].iov_base;
SPDK_CU_ASSERT_FATAL(status_data != NULL && ctrlr_data != NULL); SPDK_CU_ASSERT_FATAL(status_data != NULL && ctrlr_data != NULL);
CU_ASSERT(status_data->data.gen == 1); CU_ASSERT(status_data->data.gen == 1);
CU_ASSERT(status_data->data.rtype == SPDK_NVME_RESERVE_WRITE_EXCLUSIVE); CU_ASSERT(status_data->data.rtype == SPDK_NVME_RESERVE_WRITE_EXCLUSIVE);
@ -1576,7 +1578,7 @@ test_nvmf_ns_reservation_report(void)
CU_ASSERT(req.rsp->nvme_cpl.status.sc == SPDK_NVME_SC_INTERNAL_DEVICE_ERROR); CU_ASSERT(req.rsp->nvme_cpl.status.sc == SPDK_NVME_SC_INTERNAL_DEVICE_ERROR);
CU_ASSERT(req.rsp->nvme_cpl.status.sct == SPDK_NVME_SCT_GENERIC); CU_ASSERT(req.rsp->nvme_cpl.status.sct == SPDK_NVME_SCT_GENERIC);
free(req.data); free(req.iov[0].iov_base);
free(reg); free(reg);
} }