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

nvme_compliance: add test cases for SET FEATURES with Number of Queues

Browse Source 
Change-Id: I590712f11b54db0f7d5bf383d32034d02b158e0e
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9855
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Changpeng Liu 2021-10-13 23:36:08 +08:00 committed by Keith Lucas
parent c08fb0a176
commit d397accb7c
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/nvmf/ctrlr.c
View File

@ -1783,12 +1783,19 @@ static int
nvmf_ctrlr_set_features_number_of_queues(struct spdk_nvmf_request *req) nvmf_ctrlr_set_features_number_of_queues(struct spdk_nvmf_request *req)
{ {
struct spdk_nvmf_ctrlr *ctrlr = req->qpair->ctrlr; struct spdk_nvmf_ctrlr *ctrlr = req->qpair->ctrlr;
struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;
struct spdk_nvme_cpl *rsp = &req->rsp->nvme_cpl; struct spdk_nvme_cpl *rsp = &req->rsp->nvme_cpl;
uint32_t count; uint32_t count;
SPDK_DEBUGLOG(nvmf, "Set Features - Number of Queues, cdw11 0x%x\n", SPDK_DEBUGLOG(nvmf, "Set Features - Number of Queues, cdw11 0x%x\n",
req->cmd->nvme_cmd.cdw11); req->cmd->nvme_cmd.cdw11);
if (cmd->cdw11_bits.feat_num_of_queues.bits.ncqr == UINT16_MAX ||
cmd->cdw11_bits.feat_num_of_queues.bits.nsqr == UINT16_MAX) {
rsp->status.sc = SPDK_NVME_SC_INVALID_FIELD;
return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;
}
count = spdk_bit_array_count_set(ctrlr->qpair_mask); count = spdk_bit_array_count_set(ctrlr->qpair_mask);
/* verify that the controller is ready to process commands */ /* verify that the controller is ready to process commands */
if (count > 1) { if (count > 1) {

49
test/nvme/compliance/nvme_compliance.c
View File

@ -524,6 +524,54 @@ parse_args(int argc, char **argv, struct spdk_env_opts *opts)
return 0; return 0;
} }
static void
set_features_number_of_queues(void)
{
struct spdk_nvme_ctrlr *ctrlr;
struct spdk_nvme_io_qpair_opts opts;
struct spdk_nvme_qpair *qpair;
struct spdk_nvme_cmd cmd;
struct status s;
int rc;
SPDK_CU_ASSERT_FATAL(spdk_nvme_transport_id_parse(&g_trid, g_trid_str) == 0);
ctrlr = spdk_nvme_connect(&g_trid, NULL, 0);
SPDK_CU_ASSERT_FATAL(ctrlr);
/* NCQR and NSQR are 65535, invalid */
memset(&cmd, 0, sizeof(cmd));
cmd.opc = SPDK_NVME_OPC_SET_FEATURES;
cmd.cdw10_bits.set_features.fid = SPDK_NVME_FEAT_NUMBER_OF_QUEUES;
cmd.cdw11_bits.feat_num_of_queues.bits.ncqr = UINT16_MAX;
cmd.cdw11_bits.feat_num_of_queues.bits.nsqr = UINT16_MAX;
s.done = false;
rc = spdk_nvme_ctrlr_cmd_admin_raw(ctrlr, &cmd, NULL, 0, test_cb, &s);
CU_ASSERT(rc == 0);
wait_for_admin_completion(&s, ctrlr);
CU_ASSERT(s.cpl.status.sc == SPDK_NVME_SC_INVALID_FIELD);
spdk_nvme_ctrlr_get_default_io_qpair_opts(ctrlr, &opts, sizeof(opts));
qpair = spdk_nvme_ctrlr_alloc_io_qpair(ctrlr, &opts, sizeof(opts));
SPDK_CU_ASSERT_FATAL(qpair);
/* After the IO queue is created, invalid */
cmd.cdw11_bits.feat_num_of_queues.bits.ncqr = 128;
cmd.cdw11_bits.feat_num_of_queues.bits.nsqr = 128;
s.done = false;
rc = spdk_nvme_ctrlr_cmd_admin_raw(ctrlr, &cmd, NULL, 0, test_cb, &s);
CU_ASSERT(rc == 0);
wait_for_admin_completion(&s, ctrlr);
CU_ASSERT(s.cpl.status.sc == SPDK_NVME_SC_COMMAND_SEQUENCE_ERROR);
spdk_nvme_detach(ctrlr);
}
/* Test the mandatory features with Get Features command: /* Test the mandatory features with Get Features command:
* 01h Arbitration. * 01h Arbitration.
* 02h Power Management. * 02h Power Management.
@ -727,6 +775,7 @@ int main(int argc, char **argv)
CU_ADD_TEST(suite, delete_create_io_sq); CU_ADD_TEST(suite, delete_create_io_sq);
CU_ADD_TEST(suite, delete_io_cq); CU_ADD_TEST(suite, delete_io_cq);
CU_ADD_TEST(suite, get_features); CU_ADD_TEST(suite, get_features);
CU_ADD_TEST(suite, set_features_number_of_queues);
CU_basic_set_mode(CU_BRM_VERBOSE); CU_basic_set_mode(CU_BRM_VERBOSE);
CU_basic_run_tests(); CU_basic_run_tests();