Commit e9e97cb6 authored by Niklas Cassel's avatar Niklas Cassel Committed by Jim Harris
Browse files

nvme/fio_plugin: fix initial_zone_reset 



Commit f69367c7 ("fio_nvme: defer qpair allocation to file_open
callback") moved the qpair allocation from spdk_fio_setup() to
spdk_fio_open(). This broke --initial_zone_reset, which needs a qpair
in order to perform the initial zone reset.

While at it, move the initial zone reset from spdk_fio_setup() to
attach_cb(), as this is where all the other fio options are verified.
By placing it in attach_cb(), after the duplicated file check, we
avoid the need to loop through the whole fio_thread->fio_qpair list.

Since SPDK nvme ioengine no longer initializes the qpairs in .setup(),
create a temporary qpair, if the --initial_zone_reset option was used.

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


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 2cbc9d4d

examples/nvme/fio_plugin/fio_plugin.c

+29 −28
Original line number Diff line number Diff line
@@ -436,6 +436,35 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid, 
		}

	}



	if (fio_options->initial_zone_reset == 1 && spdk_nvme_ns_get_csi(ns) == SPDK_NVME_CSI_ZNS) {

#if FIO_HAS_ZBD

		struct spdk_nvme_qpair *tmp_qpair;

		int completed = 0, err;



		/* qpair has not been allocated yet (it gets allocated in spdk_fio_open()).

		 * Create a temporary qpair in order to perform the initial zone reset.

		 */

		assert(!fio_qpair->qpair);



		tmp_qpair = spdk_nvme_ctrlr_alloc_io_qpair(ctrlr, NULL, 0);

		if (!tmp_qpair) {

			SPDK_ERRLOG("Cannot allocate a temporary qpair\n");

			g_error = true;

			return;

		}



		err = spdk_nvme_zns_reset_zone(ns, tmp_qpair, 0x0, true, pcu_cb, &completed);

		if (err || pcu(tmp_qpair, &completed) || completed < 0) {

			log_err("spdk/nvme: warn: initial_zone_reset: err: %d, cpl: %d\n",

				err, completed);

		}



		spdk_nvme_ctrlr_free_io_qpair(tmp_qpair);

#else

		log_err("spdk/nvme: ZBD/ZNS is not supported\n");

#endif

	}



	f->real_file_size = spdk_nvme_ns_get_size(fio_qpair->ns);

	if (f->real_file_size <= 0) {

		g_error = true;
@@ -625,34 +654,6 @@ static int spdk_fio_setup(struct thread_data *td) 
	g_td_count++;

	pthread_mutex_unlock(&g_mutex);



	if (fio_options->initial_zone_reset == 1) {

#if FIO_HAS_ZBD

		struct spdk_fio_qpair *fio_qpair;



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

			const struct spdk_nvme_zns_ns_data *zns_data;

			int completed = 0, err;



			if (!fio_qpair->ns) {

				continue;

			}

			zns_data = spdk_nvme_zns_ns_get_data(fio_qpair->ns);

			if (!zns_data) {

				continue;

			}



			err = spdk_nvme_zns_reset_zone(fio_qpair->ns, fio_qpair->qpair, 0x0, true,

						       pcu_cb, &completed);

			if (err || pcu(fio_qpair->qpair, &completed) || completed < 0) {

				log_err("spdk/nvme: warn: initial_zone_reset: err: %d, cpl: %d\n",

					err, completed);

			}

		}

#else

		log_err("spdk/nvme: ZBD/ZNS is not supported\n");

#endif

	}



	return rc;

}