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

lib/nvme: 0 based numd for reservation report

Browse Source 
Fix for number of dwords which is 0 based as per spec.
Use bitwise operators instead of division and modulus.

Change-Id: Ib315bf9394ef599317f41429742e7b8054069549
Signed-off-by: Ankit Kumar <ankit.kumar@samsung.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16814
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Ankit Kumar 2023-02-16 02:17:54 +05:30 committed by Tomasz Zawadzki
parent a67da4e64c
commit 82c61e0678
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/nvme/nvme_ns_cmd.c
View File

@ -1338,10 +1338,9 @@ spdk_nvme_ns_cmd_reservation_report(struct spdk_nvme_ns *ns,
struct nvme_request *req;
struct spdk_nvme_cmd *cmd;
if (len % 4) {
if (len & 0x3) {
return -EINVAL;
}
num_dwords = len / 4;
req = nvme_allocate_request_user_copy(qpair, payload, len, cb_fn, cb_arg, false);
if (req == NULL) {
@ -1352,7 +1351,8 @@ spdk_nvme_ns_cmd_reservation_report(struct spdk_nvme_ns *ns,
cmd->opc = SPDK_NVME_OPC_RESERVATION_REPORT;
cmd->nsid = ns->id;
cmd->cdw10 = num_dwords;
num_dwords = (len >> 2);
cmd->cdw10 = num_dwords - 1; /* 0-based */
return nvme_qpair_submit_request(qpair, req);
}

2
test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c
View File

@ -1310,7 +1310,7 @@ test_nvme_ns_cmd_reservation_report(void)
CU_ASSERT(g_request->cmd.opc == SPDK_NVME_OPC_RESERVATION_REPORT);
CU_ASSERT(g_request->cmd.nsid == ns.id);
CU_ASSERT(g_request->cmd.cdw10 == (size / 4));
CU_ASSERT(g_request->cmd.cdw10 == (size >> 2) - 1);
spdk_free(g_request->payload.contig_or_cb_arg);
nvme_free_request(g_request);