Commit 5e373163 authored by John Levon's avatar John Levon Committed by Tomasz Zawadzki
Browse files

nvmf: pass poll group to transport during create 



For the benefit of forthcoming vfio-user changes, register the poll
group poller prior to calling the transport create callback, and pass in
a pointer to the poll group itself.

Signed-off-by: default avatarJohn Levon <john.levon@nutanix.com>
Change-Id: Idbc24126c9d46f8162e4ded07c5a0ecf074fc7dd
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10718


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 8c32f0d3

include/spdk/nvmf_transport.h

+2 −1
Original line number Diff line number Diff line
@@ -317,7 +317,8 @@ struct spdk_nvmf_transport_ops { 
	/**

	 * Create a new poll group

	 */

	struct spdk_nvmf_transport_poll_group *(*poll_group_create)(struct spdk_nvmf_transport *transport);

	struct spdk_nvmf_transport_poll_group *(*poll_group_create)(struct spdk_nvmf_transport *transport,

			struct spdk_nvmf_poll_group *group);



	/**

	 * Get the polling group of the queue pair optimal for the specific transport

lib/nvmf/fc.c

+2 −1
Original line number Diff line number Diff line
@@ -2107,7 +2107,8 @@ nvmf_fc_discover(struct spdk_nvmf_transport *transport, 
}



static struct spdk_nvmf_transport_poll_group *

nvmf_fc_poll_group_create(struct spdk_nvmf_transport *transport)

nvmf_fc_poll_group_create(struct spdk_nvmf_transport *transport,

			  struct spdk_nvmf_poll_group *group)

{

	struct spdk_nvmf_fc_poll_group *fgroup;

	struct spdk_nvmf_fc_transport *ftransport =

lib/nvmf/nvmf.c

+5 −5
Original line number Diff line number Diff line
@@ -178,6 +178,10 @@ nvmf_tgt_create_poll_group(void *io_device, void *ctx_buf) 
	TAILQ_INIT(&group->qpairs);

	group->thread = thread;



	group->poller = SPDK_POLLER_REGISTER(nvmf_poll_group_poll, group, 0);



	SPDK_DTRACE_PROBE1(nvmf_create_poll_group, spdk_thread_get_id(thread));



	TAILQ_FOREACH(transport, &tgt->transports, link) {

		rc = nvmf_poll_group_add_transport(group, transport);

		if (rc != 0) {
@@ -211,10 +215,6 @@ nvmf_tgt_create_poll_group(void *io_device, void *ctx_buf) 
	TAILQ_INSERT_TAIL(&tgt->poll_groups, group, link);

	pthread_mutex_unlock(&tgt->mutex);



	group->poller = SPDK_POLLER_REGISTER(nvmf_poll_group_poll, group, 0);



	SPDK_DTRACE_PROBE1(nvmf_create_poll_group, spdk_thread_get_id(thread));



	return 0;

}
@@ -1184,7 +1184,7 @@ nvmf_poll_group_add_transport(struct spdk_nvmf_poll_group *group, 
		}

	}



	tgroup = nvmf_transport_poll_group_create(transport);

	tgroup = nvmf_transport_poll_group_create(transport, group);

	if (!tgroup) {

		SPDK_ERRLOG("Unable to create poll group for transport\n");

		return -1;

lib/nvmf/rdma.c

+2 −1
Original line number Diff line number Diff line
@@ -3242,7 +3242,8 @@ static void 
nvmf_rdma_poll_group_destroy(struct spdk_nvmf_transport_poll_group *group);



static struct spdk_nvmf_transport_poll_group *

nvmf_rdma_poll_group_create(struct spdk_nvmf_transport *transport)

nvmf_rdma_poll_group_create(struct spdk_nvmf_transport *transport,

			    struct spdk_nvmf_poll_group *group)

{

	struct spdk_nvmf_rdma_transport		*rtransport;

	struct spdk_nvmf_rdma_poll_group	*rgroup;

lib/nvmf/tcp.c

+2 −1
Original line number Diff line number Diff line
@@ -1225,7 +1225,8 @@ nvmf_tcp_control_msg_list_free(struct spdk_nvmf_tcp_control_msg_list *list) 
}



static struct spdk_nvmf_transport_poll_group *

nvmf_tcp_poll_group_create(struct spdk_nvmf_transport *transport)

nvmf_tcp_poll_group_create(struct spdk_nvmf_transport *transport,

			   struct spdk_nvmf_poll_group *group)

{

	struct spdk_nvmf_tcp_transport	*ttransport;

	struct spdk_nvmf_tcp_poll_group *tgroup;