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

nvme: assign qpair when req is allocated

Browse Source 
There's no need to set this every time we allocate
a request.

While here, fix a typo near where we needed to modify
the unit test to remove the qpair assertion.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I8af41a6c483415950f625d1ed2ef46088b75a622

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/456270
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Jim Harris 2019-05-29 05:19:26 -07:00
parent d7d449883c
commit b3d884b700
5 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/nvme/nvme_internal.h
View File

@ -886,7 +886,6 @@ nvme_allocate_request(struct spdk_nvme_qpair *qpair,
req->cb_arg = cb_arg; req->cb_arg = cb_arg;
req->payload = *payload; req->payload = *payload;
req->payload_size = payload_size; req->payload_size = payload_size;
req->qpair = qpair;
req->pid = g_spdk_nvme_pid; req->pid = g_spdk_nvme_pid;
req->submit_tick = 0; req->submit_tick = 0;

1
lib/nvme/nvme_qpair.c
View File

@ -497,6 +497,7 @@ nvme_qpair_init(struct spdk_nvme_qpair *qpair, uint16_t id,
for (i = 0; i < num_requests; i++) { for (i = 0; i < num_requests; i++) {
struct nvme_request *req = qpair->req_buf + i * req_size_padded; struct nvme_request *req = qpair->req_buf + i * req_size_padded;
req->qpair = qpair;
STAILQ_INSERT_HEAD(&qpair->free_req, req, stailq); STAILQ_INSERT_HEAD(&qpair->free_req, req, stailq);
} }

3
test/unit/lib/nvme/nvme.c/nvme_ut.c
View File

@ -623,13 +623,12 @@ test_nvme_allocate_request(void)
req = nvme_allocate_request(&qpair, &payload, payload_struct_size, req = nvme_allocate_request(&qpair, &payload, payload_struct_size,
cb_fn, cb_arg); cb_fn, cb_arg);
/* all the req elements should now match the passed in paramters */ /* all the req elements should now match the passed in parameters */
SPDK_CU_ASSERT_FATAL(req != NULL); SPDK_CU_ASSERT_FATAL(req != NULL);
CU_ASSERT(req->cb_fn == cb_fn); CU_ASSERT(req->cb_fn == cb_fn);
CU_ASSERT(req->cb_arg == cb_arg); CU_ASSERT(req->cb_arg == cb_arg);
CU_ASSERT(memcmp(&req->payload, &payload, payload_struct_size) == 0); CU_ASSERT(memcmp(&req->payload, &payload, payload_struct_size) == 0);
CU_ASSERT(req->payload_size == payload_struct_size); CU_ASSERT(req->payload_size == payload_struct_size);
CU_ASSERT(req->qpair == &qpair);
CU_ASSERT(req->pid == getpid()); CU_ASSERT(req->pid == getpid());
} }

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

@ -212,6 +212,7 @@ prepare_for_test(struct spdk_nvme_ns *ns, struct spdk_nvme_ctrlr *ctrlr,
for (i = 0; i < num_requests; i++) { for (i = 0; i < num_requests; i++) {
struct nvme_request *req = qpair->req_buf + i * sizeof(struct nvme_request); struct nvme_request *req = qpair->req_buf + i * sizeof(struct nvme_request);
req->qpair = qpair;
STAILQ_INSERT_HEAD(&qpair->free_req, req, stailq); STAILQ_INSERT_HEAD(&qpair->free_req, req, stailq);
} }

1
test/unit/lib/nvme/nvme_ns_ocssd_cmd.c/nvme_ns_ocssd_cmd_ut.c
View File

@ -154,6 +154,7 @@ prepare_for_test(struct spdk_nvme_ns *ns, struct spdk_nvme_ctrlr *ctrlr,
for (i = 0; i < num_requests; i++) { for (i = 0; i < num_requests; i++) {
struct nvme_request *req = qpair->req_buf + i * sizeof(struct nvme_request); struct nvme_request *req = qpair->req_buf + i * sizeof(struct nvme_request);
req->qpair = qpair;
STAILQ_INSERT_HEAD(&qpair->free_req, req, stailq); STAILQ_INSERT_HEAD(&qpair->free_req, req, stailq);
} }