Commit 0a162815 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

Revert "subsystem.c: make subsystem_remove_ns asynchronous" 



This reverts commit 498f9add.

Making the subsystem removal asynchronous seems to be triggering an
intermittent failure in the NVMe AER test.  Let's revert this for now
until we can diagnose the issue.

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


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
parent 498f9add

CHANGELOG.md

+0 −3
Original line number Diff line number Diff line
@@ -31,9 +31,6 @@ active namespaces and spdk_nvme_ctrlr_is_active_ns() to check if a ns id is acti 
Namespaces may now be assigned unique identifiers via new optional "eui64" and "nguid" parameters

to the `nvmf_subsystem_add_ns` RPC method.



`spdk_nvmf_subsystem_remove_ns` is now asynchronous and requires two additional arguments, cb_fn and cb_arg.

cb_fn is a function pointer of type spdk_channel_for_each_cpl and cb_arg is a void pointer.



### Blobstore



A number of functions have been renamed:

include/spdk/nvmf.h

+1 −4
Original line number Diff line number Diff line
@@ -501,13 +501,10 @@ uint32_t spdk_nvmf_subsystem_add_ns(struct spdk_nvmf_subsystem *subsystem, struc 
 *

 * \param subsystem Subsystem the namespace belong to.

 * \param nsid Namespace ID to be removed.

 * \param cb_fn Function to call when all thread local ns information has been updated

 * \param cb_arg Context for the above cb_fn

 *

 * \return 0 on success, -1 on failure.

 */

int spdk_nvmf_subsystem_remove_ns(struct spdk_nvmf_subsystem *subsystem, uint32_t nsid,

				  spdk_nvmf_subsystem_state_change_done cb_fn, void *cb_arg);

int spdk_nvmf_subsystem_remove_ns(struct spdk_nvmf_subsystem *subsystem, uint32_t nsid);



/**

 * Get the first allocated namespace in a subsystem.

lib/event/subsystems/nvmf/nvmf_rpc.c

+6 −22
Original line number Diff line number Diff line
@@ -1228,13 +1228,14 @@ nvmf_rpc_remove_ns_resumed(struct spdk_nvmf_subsystem *subsystem, 
}



static void

nvmf_rpc_remove_ns_remove_done(struct spdk_nvmf_subsystem *subsystem, void *cb_arg, int status)

nvmf_rpc_remove_ns_paused(struct spdk_nvmf_subsystem *subsystem,

			  void *cb_arg, int status)

{

	struct nvmf_rpc_remove_ns_ctx *ctx;



	ctx = cb_arg;

	struct nvmf_rpc_remove_ns_ctx *ctx = cb_arg;

	int ret;



	if (status != 0) {

	ret = spdk_nvmf_subsystem_remove_ns(subsystem, ctx->nsid);

	if (ret < 0) {

		SPDK_ERRLOG("Unable to remove namespace ID %u\n", ctx->nsid);

		spdk_jsonrpc_send_error_response(ctx->request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						 "Invalid parameters");
@@ -1248,23 +1249,6 @@ nvmf_rpc_remove_ns_remove_done(struct spdk_nvmf_subsystem *subsystem, void *cb_a 
	}

}



static void

nvmf_rpc_remove_ns_paused(struct spdk_nvmf_subsystem *subsystem,

			  void *cb_arg, int status)

{

	struct nvmf_rpc_remove_ns_ctx *ctx = cb_arg;

	int ret;



	ret = spdk_nvmf_subsystem_remove_ns(subsystem, ctx->nsid, nvmf_rpc_remove_ns_remove_done, ctx);

	if (ret < 0) {

		SPDK_ERRLOG("Unable to remove namespace ID %u\n", ctx->nsid);

		spdk_jsonrpc_send_error_response(ctx->request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						 "Invalid parameters");

		ctx->response_sent = true;

		spdk_nvmf_subsystem_resume(subsystem, nvmf_rpc_remove_ns_resumed, ctx);

	}

}



static void

nvmf_rpc_subsystem_remove_ns(struct spdk_jsonrpc_request *request,

			     const struct spdk_json_val *params)

lib/nvmf/nvmf.c

+2 −7
Original line number Diff line number Diff line
@@ -531,19 +531,14 @@ poll_group_update_subsystem(struct spdk_nvmf_poll_group *group, 
			sgroup->channels[i] = spdk_bdev_get_io_channel(ns->desc);

		} else {

			/* A namespace was present before and didn't change. */



			/* TODO: Handle namespaces where the bdev was swapped out for a different one */

		}

	}



	return 0;

}



int

spdk_nvmf_poll_group_update_subsystem(struct spdk_nvmf_poll_group *group,

				      struct spdk_nvmf_subsystem *subsystem)

{

	return poll_group_update_subsystem(group, subsystem);

}



int

spdk_nvmf_poll_group_add_subsystem(struct spdk_nvmf_poll_group *group,

				   struct spdk_nvmf_subsystem *subsystem)

lib/nvmf/nvmf_internal.h

+0 −2
Original line number Diff line number Diff line
@@ -234,8 +234,6 @@ struct spdk_nvmf_transport *spdk_nvmf_tgt_get_transport(struct spdk_nvmf_tgt *tg 


int spdk_nvmf_poll_group_add_transport(struct spdk_nvmf_poll_group *group,

				       struct spdk_nvmf_transport *transport);

int spdk_nvmf_poll_group_update_subsystem(struct spdk_nvmf_poll_group *group,

		struct spdk_nvmf_subsystem *subsystem);

int spdk_nvmf_poll_group_add_subsystem(struct spdk_nvmf_poll_group *group,

				       struct spdk_nvmf_subsystem *subsystem);

int spdk_nvmf_poll_group_remove_subsystem(struct spdk_nvmf_poll_group *group,