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

nvme: fix uninitialized memory in nvme_qpair_ut

Browse Source 
nvme_alloc_request() does not zero out the request (this is
intentional, since the real implementation uses a mempool where requests
get reused).  Add nvme_allocate_request() wrapper that initializes the
request correctly.  This fixes all uses of uninitialized memory caught
by Valgrind in nvme_qpair_ut.  This test was also failing in practice on
FreeBSD due to non-zero buffers returned from malloc().

Change-Id: I2d6ea29289bd4887aaa9120fba6bce10088e6917
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2015-10-05 10:29:41 -07:00
parent cac5caec8b
commit 1c96eff6a2
1 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
test/lib/nvme/unit/nvme_qpair_c/nvme_qpair_ut.c
View File

@ -63,6 +63,44 @@ void prepare_for_test(void)
{
}
struct nvme_request *
nvme_allocate_request(void *payload, uint32_t payload_size,
nvme_cb_fn_t cb_fn, void *cb_arg)
{
struct nvme_request *req = NULL;
nvme_alloc_request(&req);
if (req == NULL) {
return req;
}
/*
* Only memset up to (but not including) the children
* TAILQ_ENTRY. children, and following members, are
* only used as part of I/O splitting so we avoid
* memsetting them until it is actually needed.
* They will be initialized in nvme_request_add_child()
* if the request is split.
*/
memset(req, 0, offsetof(struct nvme_request, children));
req->cb_fn = cb_fn;
req->cb_arg = cb_arg;
req->timeout = true;
nvme_assert((payload == NULL && payload_size == 0) ||
(payload != NULL && payload_size != 0),
("Invalid argument combination of payload and payload_size\n"));
if (payload == NULL || payload_size == 0) {
req->u.payload = NULL;
req->payload_size = 0;
} else {
req->u.payload = payload;
req->payload_size = payload_size;
}
return req;
}
void
test1(void)
{
@ -148,9 +186,8 @@ test3(void)
prepare_submit_request_test(&qpair, &ctrlr, &regs);
nvme_alloc_request(&req);
req->payload_size = 4096;
req->cb_fn = expected_success_callback;
req = nvme_allocate_request(NULL, 0, expected_success_callback, NULL);
CU_ASSERT_FATAL(req != NULL);
CU_ASSERT(qpair.sq_tail == 0);
@ -169,12 +206,12 @@ test4(void)
struct nvme_request *req;
struct nvme_controller ctrlr = {};
struct nvme_registers regs = {};
char payload[4096];
prepare_submit_request_test(&qpair, &ctrlr, &regs);
nvme_alloc_request(&req);
req->payload_size = 4096;
req->cb_fn = expected_failure_callback;
req = nvme_allocate_request(payload, sizeof(payload), expected_failure_callback, NULL);
CU_ASSERT_FATAL(req != NULL);
/* Force vtophys to return a failure. This should
* result in the nvme_qpair manually failing
@ -202,12 +239,12 @@ test_ctrlr_failed(void)
struct nvme_request *req;
struct nvme_controller ctrlr = {};
struct nvme_registers regs = {};
char payload[4096];
prepare_submit_request_test(&qpair, &ctrlr, &regs);
nvme_alloc_request(&req);
req->payload_size = 4096;
req->cb_fn = expected_failure_callback;
req = nvme_allocate_request(payload, sizeof(payload), expected_failure_callback, NULL);
CU_ASSERT_FATAL(req != NULL);
/* Disable the queue and set the controller to failed.
* Set the controller to resetting so that the qpair won't get re-enabled.
@ -251,13 +288,16 @@ void test_nvme_qpair_fail(void)
tr_temp = nvme_malloc("nvme_tracker", sizeof(struct nvme_tracker),
64, &phys_addr);
nvme_alloc_request(&tr_temp->req);
tr_temp->req = nvme_allocate_request(NULL, 0, expected_failure_callback, NULL);
CU_ASSERT_FATAL(tr_temp->req != NULL);
LIST_INSERT_HEAD(&qpair.outstanding_tr, tr_temp, list);
nvme_qpair_fail(&qpair);
CU_ASSERT_TRUE(LIST_EMPTY(&qpair.outstanding_tr));
nvme_alloc_request(&req);
req = nvme_allocate_request(NULL, 0, expected_failure_callback, NULL);
CU_ASSERT_FATAL(req != NULL);
STAILQ_INSERT_HEAD(&qpair.queued_req, req, stailq);
nvme_qpair_fail(&qpair);
CU_ASSERT_TRUE(STAILQ_EMPTY(&qpair.queued_req));