Commit ddf27c3d authored by Niklas Cassel's avatar Niklas Cassel Committed by Tomasz Zawadzki
Browse files

nvme/fio_plugin: move get_fio_qpair() out of ifdef and reuse it 



Move get_fio_qpair() out of ifdef and reuse it in spdk_fio_queue(),
since the code is next to identical.
The only difference is that get_fio_qpair() returns NULL if qpair->ns
is not set.

Since we know that get_fio_qpair() returns NULL if qpair>ns is not set,
we can also remove the equivalent check in spdk_fio_queue().

Also use ns pointer instead of qpair->ns pointer in two other places
in spdk_fio_queue().

Signed-off-by: default avatarNiklas Cassel <niklas.cassel@wdc.com>
Change-Id: Ie647a814ff0b7a6f2bb81cbc9d7e95537fbe5256
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7897


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJohn Kariuki <John.K.Kariuki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent afc432ba

examples/nvme/fio_plugin/fio_plugin.c

+7 −11
Original line number Diff line number Diff line
@@ -241,7 +241,6 @@ get_fio_ctrlr(const struct spdk_nvme_transport_id *trid) 
	return NULL;

}



#if FIO_HAS_ZBD

/**

 * Returns the fio_qpair matching the given fio_file and has an associated ns

 */
@@ -259,6 +258,7 @@ get_fio_qpair(struct spdk_fio_thread *fio_thread, struct fio_file *f) 
	return NULL;

}



#if FIO_HAS_ZBD

/**

 * Callback function to use while processing completions until completion-indicator turns non-zero

 */
@@ -988,16 +988,12 @@ spdk_fio_queue(struct thread_data *td, struct io_u *io_u) 
	uint64_t		lba;

	uint32_t		lba_count;



	/* Find the namespace that corresponds to the file in the io_u */

	TAILQ_FOREACH(fio_qpair, &fio_thread->fio_qpair, link) {

		if (fio_qpair->f == io_u->file) {

			ns = fio_qpair->ns;

			break;

		}

	}

	if (fio_qpair == NULL || ns == NULL) {

	fio_qpair = get_fio_qpair(fio_thread, io_u->file);

	if (fio_qpair == NULL) {

		return -ENXIO;

	}

	ns = fio_qpair->ns;



	if (fio_qpair->nvme_pi_enabled && !fio_qpair->extended_lba) {

		md_buf = fio_req->md_buf;

	}
@@ -1041,7 +1037,7 @@ spdk_fio_queue(struct thread_data *td, struct io_u *io_u) 
								    spdk_fio_completion_cb, fio_req,

								    fio_qpair->io_flags, dif_ctx->apptag_mask, dif_ctx->app_tag);

			} else {

				uint64_t zslba = fio_offset_to_zslba(io_u->offset, fio_qpair->ns);

				uint64_t zslba = fio_offset_to_zslba(io_u->offset, ns);

				rc = spdk_nvme_zns_zone_append_with_md(ns, fio_qpair->qpair, io_u->buf, md_buf, zslba,

								       lba_count,

								       spdk_fio_completion_cb, fio_req,
@@ -1054,7 +1050,7 @@ spdk_fio_queue(struct thread_data *td, struct io_u *io_u) 
								     spdk_nvme_io_reset_sgl, spdk_nvme_io_next_sge, md_buf,

								     dif_ctx->apptag_mask, dif_ctx->app_tag);

			} else {

				uint64_t zslba = fio_offset_to_zslba(io_u->offset, fio_qpair->ns);

				uint64_t zslba = fio_offset_to_zslba(io_u->offset, ns);

				rc = spdk_nvme_zns_zone_appendv_with_md(ns, fio_qpair->qpair, zslba,

									lba_count, spdk_fio_completion_cb, fio_req, fio_qpair->io_flags,

									spdk_nvme_io_reset_sgl, spdk_nvme_io_next_sge, md_buf,