Commit 781d42ad authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

nvmf: rename QPAIR_ACTIVE -> QPAIR_ENABLED 



This state indicates that a qpair has been added to a poll group and can
be used to execute commands.  However, in the future, we'll want to add
more fine-grained states to track the state of qpair initialization
(e.g. waiting for CONNECT, authentication in progress, etc.), so
QPAIR_ACTIVE is renamed to QPAIR_ENABLED to make it more distinct from
spdk_nvmf_qpair_is_active().

That way, spdk_nvmf_qpair_is_active() can be used to check whether a
qpair is capable of executing commands (i.e. it's equivalent to the old
QPAIR_ACTIVE state), while individual qpair states will provide more
information about the initialization.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I48795fd5a507740222e021249b0e63fff720dfd4
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22587


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <ben@nvidia.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 3caf2080

include/spdk/nvmf_transport.h

+2 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ SPDK_STATIC_ASSERT(sizeof(struct spdk_nvmf_request) == 776, "Incorrect size"); 


enum spdk_nvmf_qpair_state {

	SPDK_NVMF_QPAIR_UNINITIALIZED = 0,

	SPDK_NVMF_QPAIR_ACTIVE,

	SPDK_NVMF_QPAIR_ENABLED,

	SPDK_NVMF_QPAIR_DEACTIVATING,

	SPDK_NVMF_QPAIR_ERROR,

};
@@ -474,7 +474,7 @@ void spdk_nvmf_tgt_new_qpair(struct spdk_nvmf_tgt *tgt, struct spdk_nvmf_qpair * 
static inline bool

spdk_nvmf_qpair_is_active(struct spdk_nvmf_qpair *qpair)

{

	return qpair->state == SPDK_NVMF_QPAIR_ACTIVE;

	return qpair->state == SPDK_NVMF_QPAIR_ENABLED;

}



/**

lib/nvmf/nvmf.c

+1 −1
Original line number Diff line number Diff line
@@ -1213,7 +1213,7 @@ spdk_nvmf_poll_group_add(struct spdk_nvmf_poll_group *group, 
	if (rc == 0) {

		SPDK_DTRACE_PROBE2_TICKS(nvmf_poll_group_add_qpair, qpair, spdk_thread_get_id(group->thread));

		TAILQ_INSERT_TAIL(&group->qpairs, qpair, link);

		nvmf_qpair_set_state(qpair, SPDK_NVMF_QPAIR_ACTIVE);

		nvmf_qpair_set_state(qpair, SPDK_NVMF_QPAIR_ENABLED);

	}



	return rc;

lib/nvmf/nvmf_rpc.c

+2 −2
Original line number Diff line number Diff line
@@ -2645,8 +2645,8 @@ nvmf_qpair_state_str(enum spdk_nvmf_qpair_state state) 
	switch (state) {

	case SPDK_NVMF_QPAIR_UNINITIALIZED:

		return "uninitialized";

	case SPDK_NVMF_QPAIR_ACTIVE:

		return "active";

	case SPDK_NVMF_QPAIR_ENABLED:

		return "enabled";

	case SPDK_NVMF_QPAIR_DEACTIVATING:

		return "deactivating";

	case SPDK_NVMF_QPAIR_ERROR:

test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c

+12 −12
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ test_connect(void) 


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

	admin_qpair.group = &group;

	admin_qpair.state = SPDK_NVMF_QPAIR_ACTIVE;

	admin_qpair.state = SPDK_NVMF_QPAIR_ENABLED;



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

	memset(&transport, 0, sizeof(transport));
@@ -461,7 +461,7 @@ test_connect(void) 
	memset(&qpair, 0, sizeof(qpair));

	qpair.transport = &transport;

	qpair.group = &group;

	qpair.state = SPDK_NVMF_QPAIR_ACTIVE;

	qpair.state = SPDK_NVMF_QPAIR_ENABLED;

	TAILQ_INIT(&qpair.outstanding);



	memset(&connect_data, 0, sizeof(connect_data));
@@ -882,7 +882,7 @@ test_connect(void) 
	CU_ASSERT(qpair.ctrlr == NULL);

	CU_ASSERT(sgroups[subsystem.id].mgmt_io_outstanding == 0);

	admin_qpair.group = &group;

	admin_qpair.state = SPDK_NVMF_QPAIR_ACTIVE;

	admin_qpair.state = SPDK_NVMF_QPAIR_ENABLED;



	/* I/O connect when admin qpair was destroyed */

	ctrlr.admin_qpair = NULL;
@@ -1642,7 +1642,7 @@ test_reservation_notification_log_page(void) 
	req.qpair = &qpair;

	TAILQ_INIT(&qpair.outstanding);

	qpair.ctrlr = NULL;

	qpair.state = SPDK_NVMF_QPAIR_ACTIVE;

	qpair.state = SPDK_NVMF_QPAIR_ENABLED;

	TAILQ_INSERT_TAIL(&qpair.outstanding, &req, link);



	nvmf_ctrlr_reservation_notice_log(&ctrlr, &ns,
@@ -1703,7 +1703,7 @@ test_get_dif_ctx(void) 
	ret = spdk_nvmf_request_get_dif_ctx(&req, &dif_ctx);

	CU_ASSERT(ret == false);



	qpair.state = SPDK_NVMF_QPAIR_ACTIVE;

	qpair.state = SPDK_NVMF_QPAIR_ENABLED;

	cmd.nvmf_cmd.opcode = SPDK_NVME_OPC_FABRIC;



	ret = spdk_nvmf_request_get_dif_ctx(&req, &dif_ctx);
@@ -1973,7 +1973,7 @@ test_fused_compare_and_write(void) 
	qpair.ctrlr = &ctrlr;

	qpair.group = &group;

	qpair.qid = 1;

	qpair.state = SPDK_NVMF_QPAIR_ACTIVE;

	qpair.state = SPDK_NVMF_QPAIR_ENABLED;



	cmd.nsid = 1;
@@ -2485,7 +2485,7 @@ test_nvmf_ctrlr_create_destruct(void) 
	transport.tgt = &tgt;

	qpair.transport = &transport;

	qpair.group = &group;

	qpair.state = SPDK_NVMF_QPAIR_ACTIVE;

	qpair.state = SPDK_NVMF_QPAIR_ENABLED;

	TAILQ_INIT(&qpair.outstanding);



	memcpy(connect_data.hostid, hostid, sizeof(hostid));
@@ -2596,7 +2596,7 @@ test_nvmf_ctrlr_use_zcopy(void) 
	qpair.ctrlr = &ctrlr;

	qpair.group = &group;

	qpair.qid = 1;

	qpair.state = SPDK_NVMF_QPAIR_ACTIVE;

	qpair.state = SPDK_NVMF_QPAIR_ENABLED;

	qpair.transport = &transport;



	group.thread = spdk_get_thread();
@@ -2716,7 +2716,7 @@ test_spdk_nvmf_request_zcopy_start(void) 
	qpair.group = &group;

	qpair.transport = &transport;

	qpair.qid = 1;

	qpair.state = SPDK_NVMF_QPAIR_ACTIVE;

	qpair.state = SPDK_NVMF_QPAIR_ENABLED;



	cmd.nsid = 1;
@@ -2777,7 +2777,7 @@ test_spdk_nvmf_request_zcopy_start(void) 
	qpair.state_cb = qpair_state_change_done;

	spdk_nvmf_request_zcopy_start(&req);

	CU_ASSERT(req.zcopy_phase == NVMF_ZCOPY_PHASE_INIT_FAILED);

	qpair.state = SPDK_NVMF_QPAIR_ACTIVE;

	qpair.state = SPDK_NVMF_QPAIR_ENABLED;

	qpair.state_cb = NULL;

	req.zcopy_phase = NVMF_ZCOPY_PHASE_NONE;
@@ -2858,7 +2858,7 @@ test_zcopy_read(void) 
	qpair.group = &group;

	qpair.transport = &transport;

	qpair.qid = 1;

	qpair.state = SPDK_NVMF_QPAIR_ACTIVE;

	qpair.state = SPDK_NVMF_QPAIR_ENABLED;



	cmd.nsid = 1;
@@ -2948,7 +2948,7 @@ test_zcopy_write(void) 
	qpair.group = &group;

	qpair.transport = &transport;

	qpair.qid = 1;

	qpair.state = SPDK_NVMF_QPAIR_ACTIVE;

	qpair.state = SPDK_NVMF_QPAIR_ENABLED;



	cmd.nsid = 1;

test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ int 
spdk_nvmf_poll_group_add(struct spdk_nvmf_poll_group *group,

			 struct spdk_nvmf_qpair *qpair)

{

	qpair->state = SPDK_NVMF_QPAIR_ACTIVE;

	qpair->state = SPDK_NVMF_QPAIR_ENABLED;

	return 0;

}