nvmf: spdk_nvmf_tgt_accept no longer takes a new_qpair pointer (ff24db74) · Commits · Public Repositories / spdk

CHANGELOG.md

+3 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,9 @@
		The NVMe-oF target no longer supports connecting scheduling configuration and instead
		always uses what was previously called "transport" scheduling.

		`spdk_nvmf_tgt_accept` no longer takes a function pointer as an argument. New connections
		are automatically assigned to poll groups by the underlying transport.

		### nvme

		Add `opts_size` in `spdk_nvme_ctrlr_opts` structure in order to solve the compatiblity issue

examples/nvmf/nvmf/nvmf.c

+1 −87

Original line number	Diff line number	Diff line
		@@ -517,98 +517,12 @@ nvmf_tgt_stop_subsystems(struct nvmf_target *nvmf_tgt)
		}
		}

		struct nvmf_target_pg_ctx {
		struct spdk_nvmf_qpair *qpair;
		struct nvmf_target_poll_group *pg;
		};

		static void
		nvmf_tgt_pg_add_qpair(void *_ctx)
		{
		struct nvmf_target_pg_ctx *ctx = _ctx;
		struct spdk_nvmf_qpair *qpair = ctx->qpair;
		struct nvmf_target_poll_group *pg = ctx->pg;

		free(_ctx);

		if (spdk_nvmf_poll_group_add(pg->group, qpair) != 0) {
		fprintf(stderr, "unable to add the qpair to a poll group.\n");
		spdk_nvmf_qpair_disconnect(qpair, NULL, NULL);
		}
		}

		static struct nvmf_target_poll_group *
		nvmf_tgt_get_next_pg(struct nvmf_target *nvmf_tgt)
		{
		struct nvmf_target_poll_group *pg;

		pg = g_next_pg;
		g_next_pg = TAILQ_NEXT(pg, link);
		if (g_next_pg == NULL) {
		g_next_pg = TAILQ_FIRST(&g_poll_groups);
		}

		return pg;
		}

		static struct nvmf_target_poll_group *
		nvmf_get_optimal_pg(struct nvmf_target nvmf_tgt, struct spdk_nvmf_qpair qpair)
		{
		struct nvmf_target_poll_group pg, _pg = NULL;
		struct spdk_nvmf_poll_group *group = spdk_nvmf_get_optimal_poll_group(qpair);

		if (group == NULL) {
		_pg = nvmf_tgt_get_next_pg(nvmf_tgt);
		goto end;
		}

		TAILQ_FOREACH(pg, &g_poll_groups, link) {
		if (pg->group == group) {
		_pg = pg;
		break;
		}
		}

		end:
		assert(_pg != NULL);
		return _pg;
		}

		static void
		new_qpair(struct spdk_nvmf_qpair qpair, void cb_arg)
		{
		struct nvmf_target_poll_group *pg;
		struct nvmf_target_pg_ctx *ctx;
		struct nvmf_target *nvmf_tgt = &g_nvmf_tgt;

		/* In SPDK we support three methods to get poll group: RoundRobin, Host and Transport.
		* In this example we only support the "Transport" which gets the optimal poll group.
		*/
		pg = nvmf_get_optimal_pg(nvmf_tgt, qpair);
		if (!pg) {
		spdk_nvmf_qpair_disconnect(qpair, NULL, NULL);
		return;
		}

		ctx = calloc(1, sizeof(*ctx));
		if (!ctx) {
		fprintf(stderr, "failed to allocate poll group context.\n");
		spdk_nvmf_qpair_disconnect(qpair, NULL, NULL);
		return;
		}

		ctx->qpair = qpair;
		ctx->pg = pg;

		spdk_thread_send_msg(pg->thread, nvmf_tgt_pg_add_qpair, ctx);
		}

		static int
		nvmf_tgt_acceptor_poll(void *arg)
		{
		struct nvmf_target *nvmf_tgt = arg;

		spdk_nvmf_tgt_accept(nvmf_tgt->tgt, new_qpair, NULL);
		spdk_nvmf_tgt_accept(nvmf_tgt->tgt);

		return -1;
		}

include/spdk/nvmf.h

+1 −15

Original line number	Diff line number	Diff line
		@@ -114,14 +114,6 @@ struct spdk_nvmf_transport_poll_group_stat {
		};
		};

		/**
		* Function to be called for each newly discovered qpair.
		*
		* \param qpair The newly discovered qpair.
		* \param cb_arg A context argument passed to this function.
		*/
		typedef void (new_qpair_fn)(struct spdk_nvmf_qpair qpair, void *cb_arg);

		/**
		* Function to be called once the listener is associated with a subsystem.
		*
		@@ -233,15 +225,9 @@ int spdk_nvmf_tgt_stop_listen(struct spdk_nvmf_tgt *tgt,
		/**
		* Poll the target for incoming connections.
		*
		* The new_qpair_fn cb_fn will be called for each newly discovered
		* qpair. The user is expected to add that qpair to a poll group
		* to establish the connection.
		*
		* \param tgt The target associated with the listen address.
		* \param cb_fn Called for each newly discovered qpair.
		* \param cb_arg A context argument passed to cb_fn.
		*/
		uint32_t spdk_nvmf_tgt_accept(struct spdk_nvmf_tgt tgt, new_qpair_fn cb_fn, void cb_arg);
		uint32_t spdk_nvmf_tgt_accept(struct spdk_nvmf_tgt *tgt);

		/**
		* Create a poll group.

include/spdk/nvmf_transport.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -192,6 +192,14 @@ struct spdk_nvmf_transport {
		TAILQ_ENTRY(spdk_nvmf_transport) link;
		};

		/**
		* Function to be called for each newly discovered qpair.
		*
		* \param qpair The newly discovered qpair.
		* \param cb_arg A context argument passed to this function.
		*/
		typedef void (new_qpair_fn)(struct spdk_nvmf_qpair qpair, void *cb_arg);

		struct spdk_nvmf_transport_ops {
		/**
		* Transport name

lib/nvmf/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@
		SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
		include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

		SO_VER := 4
		SO_VER := 5
		SO_MINOR := 0

		C_SRCS = ctrlr.c ctrlr_discovery.c ctrlr_bdev.c \