Commit 250d342b authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

nvmf: pass an options struct for ns creation 



This will allow more parameters to be added to
spdk_nvmf_subsystem_add_ns() without breaking API/ABI compatibility
later.

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


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 8af4b6c4

app/nvmf_tgt/conf.c

+5 −1
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ struct spdk_nvmf_subsystem * 


	for (j = 0; j < num_ns; j++) {

		struct spdk_nvmf_ns_params *ns_params = &ns_list[j];

		struct spdk_nvmf_ns_opts ns_opts;



		if (!ns_params->bdev_name) {

			SPDK_ERRLOG("Namespace missing bdev name\n");
@@ -405,7 +406,10 @@ struct spdk_nvmf_subsystem * 
			goto error;

		}



		if (spdk_nvmf_subsystem_add_ns(subsystem, bdev, ns_params->nsid) == 0) {

		spdk_nvmf_ns_opts_get_defaults(&ns_opts, sizeof(ns_opts));

		ns_opts.nsid = ns_params->nsid;



		if (spdk_nvmf_subsystem_add_ns(subsystem, bdev, &ns_opts, sizeof(ns_opts)) == 0) {

			goto error;

		}

app/nvmf_tgt/nvmf_rpc.c

+5 −1
Original line number Diff line number Diff line
@@ -728,6 +728,7 @@ nvmf_rpc_ns_paused(struct spdk_nvmf_subsystem *subsystem, 
		   void *cb_arg, int status)

{

	struct nvmf_rpc_ns_ctx *ctx = cb_arg;

	struct spdk_nvmf_ns_opts ns_opts;

	struct spdk_bdev *bdev;



	bdev = spdk_bdev_get_by_name(ctx->ns_params.bdev_name);
@@ -739,7 +740,10 @@ nvmf_rpc_ns_paused(struct spdk_nvmf_subsystem *subsystem, 
		goto resume;

	}



	ctx->ns_params.nsid = spdk_nvmf_subsystem_add_ns(subsystem, bdev, ctx->ns_params.nsid);

	spdk_nvmf_ns_opts_get_defaults(&ns_opts, sizeof(ns_opts));

	ns_opts.nsid = ctx->ns_params.nsid;



	ctx->ns_params.nsid = spdk_nvmf_subsystem_add_ns(subsystem, bdev, &ns_opts, sizeof(ns_opts));

	if (ctx->ns_params.nsid == 0) {

		SPDK_ERRLOG("Unable to add namespace\n");

		spdk_jsonrpc_send_error_response(ctx->request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

include/spdk/nvmf.h

+31 −3
Original line number Diff line number Diff line
@@ -368,6 +368,24 @@ struct spdk_nvmf_listener *spdk_nvmf_subsystem_get_next_listener( 
const struct spdk_nvme_transport_id *spdk_nvmf_listener_get_trid(

	struct spdk_nvmf_listener *listener);



/** NVMe-oF target namespace creation options */

struct spdk_nvmf_ns_opts {

	/**

	 * Namespace ID

	 *

	 * Set to 0 to automatically assign a free NSID.

	 */

	uint32_t nsid;

};



/**

 * Get default namespace creation options.

 *

 * \param opts Namespace options to fill with defaults.

 * \param opts_size sizeof(struct spdk_nvmf_ns_opts)

 */

void spdk_nvmf_ns_opts_get_defaults(struct spdk_nvmf_ns_opts *opts, size_t opts_size);



/**

 * Add a namespace to a subsytem.

 *
@@ -375,13 +393,13 @@ const struct spdk_nvme_transport_id *spdk_nvmf_listener_get_trid( 
 *

 * \param subsystem Subsystem to add namespace to.

 * \param bdev Block device to add as a namespace.

 * \param nsid Namespace ID to assign to the new namespace, or 0 to automatically use an available

 *             NSID.

 * \param opts Namespace options, or NULL to use defaults.

 * \param opts_size sizeof(*opts)

 *

 * \return Newly added NSID on success or 0 on failure.

 */

uint32_t spdk_nvmf_subsystem_add_ns(struct spdk_nvmf_subsystem *subsystem, struct spdk_bdev *bdev,

				    uint32_t nsid);

				    const struct spdk_nvmf_ns_opts *opts, size_t opts_size);



/**

 * Remove a namespace from a subsytem.
@@ -439,6 +457,16 @@ uint32_t spdk_nvmf_ns_get_id(const struct spdk_nvmf_ns *ns); 
 */

struct spdk_bdev *spdk_nvmf_ns_get_bdev(struct spdk_nvmf_ns *ns);



/**

 * Get the options specified for a namespace.

 *

 * \param ns Namespace to query.

 * \param opts Output parameter for options.

 * \param opts_size sizeof(*opts)

 */

void spdk_nvmf_ns_get_opts(const struct spdk_nvmf_ns *ns, struct spdk_nvmf_ns_opts *opts,

			   size_t opts_size);



const char *spdk_nvmf_subsystem_get_sn(const struct spdk_nvmf_subsystem *subsystem);



int spdk_nvmf_subsystem_set_sn(struct spdk_nvmf_subsystem *subsystem, const char *sn);

lib/nvmf/ctrlr.c

+2 −2
Original line number Diff line number Diff line
@@ -963,11 +963,11 @@ spdk_nvmf_ctrlr_identify_active_ns_list(struct spdk_nvmf_subsystem *subsystem, 


	for (ns = spdk_nvmf_subsystem_get_first_ns(subsystem); ns != NULL;

	     ns = spdk_nvmf_subsystem_get_next_ns(subsystem, ns)) {

		if (ns->id <= cmd->nsid) {

		if (ns->opts.nsid <= cmd->nsid) {

			continue;

		}



		ns_list->ns_list[count++] = ns->id;

		ns_list->ns_list[count++] = ns->opts.nsid;

		if (count == SPDK_COUNTOF(ns_list->ns_list)) {

			break;

		}

lib/nvmf/ctrlr_bdev.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ spdk_nvmf_subsystem_bdev_io_type_supported(struct spdk_nvmf_subsystem *subsystem 
			SPDK_DEBUGLOG(SPDK_LOG_NVMF,

				      "Subsystem %s namespace %u (%s) does not support io_type %d\n",

				      spdk_nvmf_subsystem_get_nqn(subsystem),

				      ns->id, spdk_bdev_get_name(ns->bdev), (int)io_type);

				      ns->opts.nsid, spdk_bdev_get_name(ns->bdev), (int)io_type);

			return false;

		}

	}