Commit 3ca8b72c authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

nvme_compliance: test admin commands with fuse bits set 



These commands should always fail.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I0abfbe4a4a107957a3271692468fe69eeb823137
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9728


Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent eb3f756c

lib/nvmf/ctrlr.c

+7 −0
Original line number Diff line number Diff line
@@ -3057,6 +3057,13 @@ nvmf_ctrlr_process_admin_cmd(struct spdk_nvmf_request *req) 
		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	if (cmd->fuse != 0) {

		/* Fused admin commands are not supported. */

		response->status.sct = SPDK_NVME_SCT_GENERIC;

		response->status.sc = SPDK_NVME_SC_INVALID_FIELD;

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	if (ctrlr->vcprop.cc.bits.en != 1) {

		SPDK_ERRLOG("Admin command sent to disabled controller\n");

		response->status.sct = SPDK_NVME_SCT_GENERIC;

lib/nvmf/vfio_user.c

+7 −0
Original line number Diff line number Diff line
@@ -1322,6 +1322,13 @@ consume_admin_cmd(struct nvmf_vfio_user_ctrlr *ctrlr, struct spdk_nvme_cmd *cmd) 
	assert(ctrlr != NULL);

	assert(cmd != NULL);



	if (cmd->fuse != 0) {

		/* Fused admin commands are not supported. */

		return post_completion(ctrlr, &ctrlr->qp[0]->cq, 0, 0, cmd->cid,

				       SPDK_NVME_SC_INVALID_FIELD,

				       SPDK_NVME_SCT_GENERIC);

	}



	switch (cmd->opc) {

	case SPDK_NVME_OPC_CREATE_IO_CQ:

	case SPDK_NVME_OPC_CREATE_IO_SQ:

test/nvme/compliance/nvme_compliance.c

+48 −0
Original line number Diff line number Diff line
@@ -140,6 +140,53 @@ identify_ctrlr(void) 
	spdk_nvme_detach(ctrlr);

}



/* Test that target correctly fails admin commands with fuse != 0 */

static void

admin_fused(void)

{

	struct spdk_nvme_ctrlr *ctrlr;

	struct spdk_nvme_cmd cmd;

	struct spdk_nvme_ctrlr_data *ctrlr_data;

	struct status s, s2;

	int rc;



	ctrlr_data = spdk_dma_zmalloc(sizeof(*ctrlr_data), 0, NULL);

	SPDK_CU_ASSERT_FATAL(ctrlr_data != NULL);



	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);



	/* The nvme driver waits until it sees both fused commands before submitting

	 * both to the queue - so construct two commands here and then check the

	 * both are completed with error status.

	 */

	memset(&cmd, 0, sizeof(cmd));

	cmd.opc = SPDK_NVME_OPC_IDENTIFY;

	cmd.fuse = 0x1;

	cmd.cdw10_bits.identify.cns = SPDK_NVME_IDENTIFY_CTRLR;



	s.done = false;

	rc = spdk_nvme_ctrlr_cmd_admin_raw(ctrlr, &cmd, ctrlr_data,

					   sizeof(*ctrlr_data), test_cb, &s);

	CU_ASSERT(rc == 0);



	cmd.fuse = 0x2;

	s2.done = false;

	rc = spdk_nvme_ctrlr_cmd_admin_raw(ctrlr, &cmd, ctrlr_data,

					   sizeof(*ctrlr_data), test_cb, &s2);

	CU_ASSERT(rc == 0);



	wait_for_admin_completion(&s, ctrlr);

	wait_for_admin_completion(&s2, ctrlr);



	CU_ASSERT(spdk_nvme_cpl_is_error(&s.cpl));

	CU_ASSERT(spdk_nvme_cpl_is_error(&s2.cpl));



	spdk_nvme_detach(ctrlr);

	spdk_free(ctrlr_data);

}



/* Test that target correctly handles requests to delete admin SQ/CQ (QID = 0).

 * Associated with issue #2172.

 */
@@ -304,6 +351,7 @@ int main(int argc, char **argv) 
	}



	CU_ADD_TEST(suite, identify_ctrlr);

	CU_ADD_TEST(suite, admin_fused);

	CU_ADD_TEST(suite, delete_admin_queue);

	CU_ADD_TEST(suite, delete_io_sq_twice);