Commit 1cbbfb86 authored by Ben Walker's avatar Ben Walker Committed by Daniel Verkamp
Browse files

nvmf: Make cntlid globally unique. 



The code doesn't actually use this property of cntlid
for anything yet, but we will need it later.

Change-Id: I5fd514d75b903cc8769e7b9f196a4624e9cf876c
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
parent f8ee49a9

include/spdk/nvmf.h

+0 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ struct spdk_nvmf_subsystem { 
	spdk_nvmf_subsystem_disconnect_fn	disconnect_cb;



	TAILQ_HEAD(, spdk_nvmf_session)		sessions;

	uint32_t				session_id;



	TAILQ_HEAD(, spdk_nvmf_listen_addr)	listen_addrs;

	uint32_t				num_listen_addrs;

lib/nvmf/session.c

+7 −4
Original line number Diff line number Diff line
@@ -47,13 +47,15 @@ 


#define MIN_KEEP_ALIVE_TIMEOUT 10000



static uint16_t g_next_cntlid = 1;



static void

nvmf_init_discovery_session_properties(struct spdk_nvmf_session *session)

{

	session->vcdata.maxcmd = g_nvmf_tgt.max_queue_depth;

	/* extended data for get log page supportted */

	session->vcdata.lpa.edlp = 1;

	session->vcdata.cntlid = 0; /* There is one controller per subsystem, so its id is 0 */

	session->vcdata.cntlid = session->cntlid;

	session->vcdata.nvmf_specific.ioccsz = sizeof(struct spdk_nvme_cmd) / 16;

	session->vcdata.nvmf_specific.iorcsz = sizeof(struct spdk_nvme_cpl) / 16;

	session->vcdata.nvmf_specific.icdoff = 0; /* offset starts directly after SQE */
@@ -95,7 +97,7 @@ nvmf_init_nvme_session_properties(struct spdk_nvmf_session *session) 
	session->subsys->ops->ctrlr_get_data(session);



	session->vcdata.aerl = 0;

	session->vcdata.cntlid = session->id;

	session->vcdata.cntlid = session->cntlid;

	session->vcdata.kas = 10;

	session->vcdata.maxcmd = g_nvmf_tgt.max_queue_depth;

	session->vcdata.mdts = nvmf_u32log2(g_nvmf_tgt.max_io_size / 4096);
@@ -257,7 +259,8 @@ spdk_nvmf_session_connect(struct spdk_nvmf_conn *conn, 
		}



		TAILQ_INIT(&session->connections);

		session->id = subsystem->session_id++;



		session->cntlid = g_next_cntlid++;

		session->kato = cmd->kato;

		session->async_event_config.raw = 0;

		session->num_connections = 0;
@@ -288,7 +291,7 @@ spdk_nvmf_session_connect(struct spdk_nvmf_conn *conn, 


		session = NULL;

		TAILQ_FOREACH(tmp, &subsystem->sessions, link) {

			if (tmp->id == data->cntlid) {

			if (tmp->cntlid == data->cntlid) {

				session = tmp;

				break;

			}

lib/nvmf/session.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ struct spdk_nvmf_conn { 
 * At least one admin connection and additional IOQ connections.

 */

struct spdk_nvmf_session {

	uint32_t			id;

	uint16_t			cntlid;

	struct spdk_nvmf_subsystem 	*subsys;



	struct {