Commit ce4fcbce authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvme: add I/O qpair creation options 



Add a new struct spdk_nvme_io_qpair_opts to allow the user to override
controller options on a per-I/O qpair basis.

Existing callers with qprio == 0 can be updated to:

  ... = spdk_nvme_ctrlr_alloc_io_qpair(ctrlr, NULL, 0);

Callers that need to specify a non-default qprio should be updated to:

  struct spdk_nvme_io_qpair_opts opts;
  spdk_nvme_ctrlr_get_default_io_qpair_opts(ctrlr, &opts, sizeof(opts));
  opts.qprio = SPDK_NVME_QPRIO_...;
  ... = spdk_nvme_ctrlr_alloc_io_qpair(ctrlr, &opts, sizeof(opts));

Change-Id: I8ac3ea369535cfde759abbe75e1d974b6450a800
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/369676


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 6a0e8d7a

CHANGELOG.md

+14 −0
Original line number Diff line number Diff line
@@ -44,6 +44,20 @@ modifying `io_queue_requests` in the opts structure. 


The SPDK NVMe `fio_plugin` has been updated to support multiple threads (`numjobs`).



spdk_nvme_ctrlr_alloc_io_qpair() has been modified to allow the user to override

controller-level options for each individual I/O queue pair.

Existing callers with qprio == 0 can be updated to:

~~~

... = spdk_nvme_ctrlr_alloc_io_qpair(ctrlr, NULL, 0);

~~~

Callers that need to specify a non-default qprio should be updated to:

~~~

struct spdk_nvme_io_qpair_opts opts;

spdk_nvme_ctrlr_get_default_io_qpair_opts(ctrlr, &opts, sizeof(opts));

opts.qprio = SPDK_NVME_QPRIO_...;

... = spdk_nvme_ctrlr_alloc_io_qpair(ctrlr, &opts, sizeof(opts));

~~~



### Environment Abstraction Layer



The environment abstraction layer has been updated to include several new functions

examples/nvme/arbitration/arbitration.c

+7 −1
Original line number Diff line number Diff line
@@ -403,7 +403,13 @@ drain_io(struct ns_worker_ctx *ns_ctx) 
static int

init_ns_worker_ctx(struct ns_worker_ctx *ns_ctx, enum spdk_nvme_qprio qprio)

{

	ns_ctx->qpair = spdk_nvme_ctrlr_alloc_io_qpair(ns_ctx->entry->nvme.ctrlr, qprio);

	struct spdk_nvme_ctrlr *ctrlr = ns_ctx->entry->nvme.ctrlr;

	struct spdk_nvme_io_qpair_opts opts;



	spdk_nvme_ctrlr_get_default_io_qpair_opts(ctrlr, &opts, sizeof(opts));

	opts.qprio = qprio;



	ns_ctx->qpair = spdk_nvme_ctrlr_alloc_io_qpair(ctrlr, &opts, sizeof(opts));

	if (!ns_ctx->qpair) {

		printf("ERROR: spdk_nvme_ctrlr_alloc_io_qpair failed\n");

		return 1;

examples/nvme/fio_plugin/fio_plugin.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid, 
		SPDK_ERRLOG("Cannot allocate space for fio_qpair\n");

		return;

	}

	fio_qpair->qpair = spdk_nvme_ctrlr_alloc_io_qpair(fio_ctrlr->ctrlr, 0);

	fio_qpair->qpair = spdk_nvme_ctrlr_alloc_io_qpair(fio_ctrlr->ctrlr, NULL, 0);

	fio_qpair->ns = ns;

	fio_qpair->f = f;

	fio_qpair->next = fio_thread->fio_qpair;

examples/nvme/hello_world/hello_world.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ hello_world(void) 
		 *  qpair.  This enables extremely efficient I/O processing by making all

		 *  I/O operations completely lockless.

		 */

		ns_entry->qpair = spdk_nvme_ctrlr_alloc_io_qpair(ns_entry->ctrlr, 0);

		ns_entry->qpair = spdk_nvme_ctrlr_alloc_io_qpair(ns_entry->ctrlr, NULL, 0);

		if (ns_entry->qpair == NULL) {

			printf("ERROR: spdk_nvme_ctrlr_alloc_io_qpair() failed\n");

			return;

examples/nvme/hotplug/hotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ register_dev(struct spdk_nvme_ctrlr *ctrlr) 
	dev->size_in_ios = spdk_nvme_ns_get_size(dev->ns) / g_io_size_bytes;

	dev->io_size_blocks = g_io_size_bytes / spdk_nvme_ns_get_sector_size(dev->ns);



	dev->qpair = spdk_nvme_ctrlr_alloc_io_qpair(ctrlr, 0);

	dev->qpair = spdk_nvme_ctrlr_alloc_io_qpair(ctrlr, NULL, 0);

	if (!dev->qpair) {

		fprintf(stderr, "ERROR: spdk_nvme_ctrlr_alloc_io_qpair() failed\n");

		goto skip;