Commit 0a903c91 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

examples/nvme: Use spdk_nvme_detach_async() and spdk_nvme_detach_poll_async() 



Use spdk_nvme_detach_async() and spdk_nvme_detach_poll_async() with
a local variable detach_ctx to detach multiple controllers.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I05c504428df56f4ab5d1ffdd19ac81e6c062c89d
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4439


Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent d8f4bbeb

examples/nvme/abort/abort.c

+6 −1
Original line number Diff line number Diff line
@@ -904,12 +904,17 @@ static void 
unregister_controllers(void)

{

	struct ctrlr_entry *entry, *tmp;

	struct spdk_nvme_detach_ctx *detach_ctx = NULL;



	TAILQ_FOREACH_SAFE(entry, &g_controllers, link, tmp) {

		TAILQ_REMOVE(&g_controllers, entry, link);

		spdk_nvme_detach(entry->ctrlr);

		spdk_nvme_detach_async(entry->ctrlr, &detach_ctx);

		free(entry);

	}



	while (detach_ctx && spdk_nvme_detach_poll_async(detach_ctx) == -EAGAIN) {

		;

	}

}



static int

examples/nvme/arbitration/arbitration.c

+6 −1
Original line number Diff line number Diff line
@@ -867,6 +867,7 @@ static void 
unregister_controllers(void)

{

	struct ctrlr_entry *entry, *tmp;

	struct spdk_nvme_detach_ctx *detach_ctx = NULL;



	TAILQ_FOREACH_SAFE(entry, &g_controllers, link, tmp) {

		TAILQ_REMOVE(&g_controllers, entry, link);
@@ -874,9 +875,13 @@ unregister_controllers(void) 
		    spdk_nvme_ctrlr_is_feature_supported(entry->ctrlr, SPDK_NVME_INTEL_FEAT_LATENCY_TRACKING)) {

			set_latency_tracking_feature(entry->ctrlr, false);

		}

		spdk_nvme_detach(entry->ctrlr);

		spdk_nvme_detach_async(entry->ctrlr, &detach_ctx);

		free(entry);

	}



	while (detach_ctx && spdk_nvme_detach_poll_async(detach_ctx) == -EAGAIN) {

		;

	}

}



static int

examples/nvme/fio_plugin/fio_plugin.c

+6 −1
Original line number Diff line number Diff line
@@ -1006,13 +1006,18 @@ static void spdk_fio_cleanup(struct thread_data *td) 
	g_td_count--;

	if (g_td_count == 0) {

		struct spdk_fio_ctrlr	*fio_ctrlr, *fio_ctrlr_tmp;

		struct spdk_nvme_detach_ctx	*detach_ctx = NULL;



		TAILQ_FOREACH_SAFE(fio_ctrlr, &g_ctrlrs, link, fio_ctrlr_tmp) {

			TAILQ_REMOVE(&g_ctrlrs, fio_ctrlr, link);

			spdk_nvme_detach(fio_ctrlr->ctrlr);

			spdk_nvme_detach_async(fio_ctrlr->ctrlr, &detach_ctx);

			free(fio_ctrlr);

		}



		while (detach_ctx && spdk_nvme_detach_poll_async(detach_ctx) == -EAGAIN) {

			;

		}



		if (fio_options->enable_vmd) {

			spdk_vmd_fini();

		}

examples/nvme/hello_world/hello_world.c

+6 −1
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ cleanup(void) 
{

	struct ns_entry *ns_entry, *tmp_ns_entry;

	struct ctrlr_entry *ctrlr_entry, *tmp_ctrlr_entry;

	struct spdk_nvme_detach_ctx *detach_ctx = NULL;



	TAILQ_FOREACH_SAFE(ns_entry, &g_namespaces, link, tmp_ns_entry) {

		TAILQ_REMOVE(&g_namespaces, ns_entry, link);
@@ -380,9 +381,13 @@ cleanup(void) 


	TAILQ_FOREACH_SAFE(ctrlr_entry, &g_controllers, link, tmp_ctrlr_entry) {

		TAILQ_REMOVE(&g_controllers, ctrlr_entry, link);

		spdk_nvme_detach(ctrlr_entry->ctrlr);

		spdk_nvme_detach_async(ctrlr_entry->ctrlr, &detach_ctx);

		free(ctrlr_entry);

	}



	while (detach_ctx && spdk_nvme_detach_poll_async(detach_ctx) == -EAGAIN) {

		;

	}

}



static void

examples/nvme/nvme_manage/nvme_manage.c

+6 −1
Original line number Diff line number Diff line
@@ -1616,6 +1616,7 @@ int main(int argc, char **argv) 
	int			rc;

	struct spdk_env_opts	opts;

	struct dev		*dev;

	struct spdk_nvme_detach_ctx *detach_ctx = NULL;



	rc = parse_args(argc, argv);

	if (rc != 0) {
@@ -1696,7 +1697,11 @@ int main(int argc, char **argv) 
	printf("Cleaning up...\n");



	foreach_dev(dev) {

		spdk_nvme_detach(dev->ctrlr);

		spdk_nvme_detach_async(dev->ctrlr, &detach_ctx);

	}



	while (detach_ctx && spdk_nvme_detach_poll_async(detach_ctx) == -EAGAIN) {

		;

	}



	return 0;