Commit a3dcdc05 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/nvme: Rename nvme_bdev_ctrlr by nvme_ctrlr 



This object is per I/O path and will be aggregated by an new upper
layer object.

Hence rename nvme_bdev_ctrlr by nvme_ctrlr. Then the following patches
will add nvme_bdev_ctrlr as a different upper layer object.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 9e65d3bb

module/bdev/nvme/bdev_nvme.c

+256 −256

File changed.

Preview size limit exceeded, changes collapsed.

module/bdev/nvme/bdev_nvme_cuse_rpc.c

+4 −4
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ rpc_nvme_cuse_register(struct spdk_jsonrpc_request *request, 
		       const struct spdk_json_val *params)

{

	struct rpc_nvme_cuse_register req = {};

	struct nvme_bdev_ctrlr *bdev_ctrlr = NULL;

	struct nvme_ctrlr *bdev_ctrlr = NULL;

	int rc;



	if (spdk_json_decode_object(params, rpc_nvme_cuse_register_decoders,
@@ -73,7 +73,7 @@ rpc_nvme_cuse_register(struct spdk_jsonrpc_request *request, 
		goto cleanup;

	}



	bdev_ctrlr = nvme_bdev_ctrlr_get_by_name(req.name);

	bdev_ctrlr = nvme_ctrlr_get_by_name(req.name);

	if (!bdev_ctrlr) {

		SPDK_ERRLOG("No such controller\n");

		spdk_jsonrpc_send_error_response(request, -ENODEV, spdk_strerror(ENODEV));
@@ -113,7 +113,7 @@ rpc_nvme_cuse_unregister(struct spdk_jsonrpc_request *request, 
			 const struct spdk_json_val *params)

{

	struct rpc_nvme_cuse_unregister req = {};

	struct nvme_bdev_ctrlr *bdev_ctrlr = NULL;

	struct nvme_ctrlr *bdev_ctrlr = NULL;

	int rc;



	if (spdk_json_decode_object(params, rpc_nvme_cuse_unregister_decoders,
@@ -125,7 +125,7 @@ rpc_nvme_cuse_unregister(struct spdk_jsonrpc_request *request, 
		goto cleanup;

	}



	bdev_ctrlr = nvme_bdev_ctrlr_get_by_name(req.name);

	bdev_ctrlr = nvme_ctrlr_get_by_name(req.name);

	if (!bdev_ctrlr) {

		SPDK_ERRLOG("No such controller\n");

		spdk_jsonrpc_send_error_response(request, -ENODEV, spdk_strerror(ENODEV));

module/bdev/nvme/bdev_nvme_rpc.c

+9 −9
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ rpc_bdev_nvme_attach_controller(struct spdk_jsonrpc_request *request, 
	struct spdk_nvme_transport_id trid = {};

	struct spdk_nvme_host_id hostid = {};

	uint32_t prchk_flags = 0;

	struct nvme_bdev_ctrlr *ctrlr = NULL;

	struct nvme_ctrlr *ctrlr = NULL;

	size_t len, maxlen;

	int rc;
@@ -302,7 +302,7 @@ rpc_bdev_nvme_attach_controller(struct spdk_jsonrpc_request *request, 
	rc = spdk_nvme_transport_id_parse_trtype(&trid.trtype, ctx->req.trtype);

	assert(rc == 0);



	ctrlr = nvme_bdev_ctrlr_get_by_name(ctx->req.name);

	ctrlr = nvme_ctrlr_get_by_name(ctx->req.name);



	/* Parse traddr */

	maxlen = sizeof(trid.traddr);
@@ -413,20 +413,20 @@ SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_nvme_attach_controller, construct_nvme_b 


static void

rpc_dump_nvme_controller_info(struct spdk_json_write_ctx *w,

			      struct nvme_bdev_ctrlr *nvme_bdev_ctrlr)

			      struct nvme_ctrlr *nvme_ctrlr)

{

	struct spdk_nvme_transport_id	*trid;



	trid = nvme_bdev_ctrlr->connected_trid;

	trid = nvme_ctrlr->connected_trid;



	spdk_json_write_object_begin(w);

	spdk_json_write_named_string(w, "name", nvme_bdev_ctrlr->name);

	spdk_json_write_named_string(w, "name", nvme_ctrlr->name);



#ifdef SPDK_CONFIG_NVME_CUSE

	size_t cuse_name_size = 128;

	char cuse_name[cuse_name_size];



	int rc = spdk_nvme_cuse_get_ctrlr_name(nvme_bdev_ctrlr->ctrlr, cuse_name, &cuse_name_size);

	int rc = spdk_nvme_cuse_get_ctrlr_name(nvme_ctrlr->ctrlr, cuse_name, &cuse_name_size);

	if (rc == 0) {

		spdk_json_write_named_string(w, "cuse_device", cuse_name);

	}
@@ -459,7 +459,7 @@ rpc_bdev_nvme_get_controllers(struct spdk_jsonrpc_request *request, 
{

	struct rpc_bdev_nvme_get_controllers req = {};

	struct spdk_json_write_ctx *w;

	struct nvme_bdev_ctrlr *ctrlr = NULL;

	struct nvme_ctrlr *ctrlr = NULL;



	if (params && spdk_json_decode_object(params, rpc_bdev_nvme_get_controllers_decoders,

					      SPDK_COUNTOF(rpc_bdev_nvme_get_controllers_decoders),
@@ -471,7 +471,7 @@ rpc_bdev_nvme_get_controllers(struct spdk_jsonrpc_request *request, 
	}



	if (req.name) {

		ctrlr = nvme_bdev_ctrlr_get_by_name(req.name);

		ctrlr = nvme_ctrlr_get_by_name(req.name);

		if (ctrlr == NULL) {

			SPDK_ERRLOG("ctrlr '%s' does not exist\n", req.name);

			spdk_jsonrpc_send_error_response_fmt(request, EINVAL, "Controller %s does not exist", req.name);
@@ -1085,7 +1085,7 @@ rpc_bdev_nvme_get_transport_statistics(struct spdk_jsonrpc_request *request, 
	spdk_json_write_object_begin(ctx->w);

	spdk_json_write_named_array_begin(ctx->w, "poll_groups");



	spdk_for_each_channel(&g_nvme_bdev_ctrlrs,

	spdk_for_each_channel(&g_nvme_ctrlrs,

			      rpc_bdev_nvme_stats_per_channel,

			      ctx,

			      rpc_bdev_nvme_stats_done);

module/bdev/nvme/bdev_ocssd.c

+24 −24
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ bdev_ocssd_destruct(void *ctx) 
	if (!nvme_ns->populated) {

		pthread_mutex_unlock(&nvme_ns->ctrlr->mutex);



		nvme_bdev_ctrlr_release(nvme_ns->ctrlr);

		nvme_ctrlr_release(nvme_ns->ctrlr);

	} else {

		pthread_mutex_unlock(&nvme_ns->ctrlr->mutex);

	}
@@ -1037,14 +1037,14 @@ bdev_ocssd_chunk_notification_cb(void *ctx, const struct spdk_nvme_cpl *cpl) 
static int

bdev_ocssd_poll_mm(void *ctx)

{

	struct nvme_bdev_ctrlr *nvme_bdev_ctrlr = ctx;

	struct nvme_ctrlr *nvme_ctrlr = ctx;

	struct nvme_ns *nvme_ns;

	struct bdev_ocssd_ns *ocssd_ns;

	uint32_t nsid;

	int rc;



	for (nsid = 0; nsid < nvme_bdev_ctrlr->num_ns; ++nsid) {

		nvme_ns = nvme_bdev_ctrlr->namespaces[nsid];

	for (nsid = 0; nsid < nvme_ctrlr->num_ns; ++nsid) {

		nvme_ns = nvme_ctrlr->namespaces[nsid];

		if (nvme_ns == NULL || !nvme_ns->populated) {

			continue;

		}
@@ -1054,7 +1054,7 @@ bdev_ocssd_poll_mm(void *ctx) 
			ocssd_ns->chunk_notify_pending = false;

			ocssd_ns->num_outstanding++;



			rc = spdk_nvme_ctrlr_cmd_get_log_page(nvme_bdev_ctrlr->ctrlr,

			rc = spdk_nvme_ctrlr_cmd_get_log_page(nvme_ctrlr->ctrlr,

							      SPDK_OCSSD_LOG_CHUNK_NOTIFICATION,

							      nsid + 1, ocssd_ns->chunk,

							      sizeof(ocssd_ns->chunk[0]) *
@@ -1073,14 +1073,14 @@ bdev_ocssd_poll_mm(void *ctx) 
}



void

bdev_ocssd_handle_chunk_notification(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr)

bdev_ocssd_handle_chunk_notification(struct nvme_ctrlr *nvme_ctrlr)

{

	struct bdev_ocssd_ns *ocssd_ns;

	struct nvme_ns *nvme_ns;

	uint32_t nsid;



	for (nsid = 0; nsid < nvme_bdev_ctrlr->num_ns; ++nsid) {

		nvme_ns = nvme_bdev_ctrlr->namespaces[nsid];

	for (nsid = 0; nsid < nvme_ctrlr->num_ns; ++nsid) {

		nvme_ns = nvme_ctrlr->namespaces[nsid];

		if (nvme_ns == NULL || !nvme_ns->populated) {

			continue;

		}
@@ -1248,7 +1248,7 @@ void 
bdev_ocssd_create_bdev(const char *ctrlr_name, const char *bdev_name, uint32_t nsid,

		       bdev_ocssd_create_cb cb_fn, void *cb_arg)

{

	struct nvme_bdev_ctrlr *nvme_bdev_ctrlr;

	struct nvme_ctrlr *nvme_ctrlr;

	struct bdev_ocssd_create_ctx *create_ctx = NULL;

	struct nvme_bdev *nvme_bdev = NULL;

	struct ocssd_bdev *ocssd_bdev = NULL;
@@ -1258,14 +1258,14 @@ bdev_ocssd_create_bdev(const char *ctrlr_name, const char *bdev_name, uint32_t n 
	struct spdk_ocssd_geometry_data *geometry;

	int rc = 0;



	nvme_bdev_ctrlr = nvme_bdev_ctrlr_get_by_name(ctrlr_name);

	if (!nvme_bdev_ctrlr) {

	nvme_ctrlr = nvme_ctrlr_get_by_name(ctrlr_name);

	if (!nvme_ctrlr) {

		SPDK_ERRLOG("Unable to find controller %s\n", ctrlr_name);

		rc = -ENODEV;

		goto error;

	}



	ns = spdk_nvme_ctrlr_get_ns(nvme_bdev_ctrlr->ctrlr, nsid);

	ns = spdk_nvme_ctrlr_get_ns(nvme_ctrlr->ctrlr, nsid);

	if (!ns) {

		SPDK_ERRLOG("Unable to retrieve namespace %"PRIu32"\n", nsid);

		rc = -ENODEV;
@@ -1278,8 +1278,8 @@ bdev_ocssd_create_bdev(const char *ctrlr_name, const char *bdev_name, uint32_t n 
		goto error;

	}



	assert(nsid <= nvme_bdev_ctrlr->num_ns);

	nvme_ns = nvme_bdev_ctrlr->namespaces[nsid - 1];

	assert(nsid <= nvme_ctrlr->num_ns);

	nvme_ns = nvme_ctrlr->namespaces[nsid - 1];

	if (nvme_ns == NULL) {

		SPDK_ERRLOG("Namespace %"PRIu32" is not initialized\n", nsid);

		rc = -EINVAL;
@@ -1444,7 +1444,7 @@ bdev_ocssd_geometry_cb(void *_ctx, const struct spdk_nvme_cpl *cpl) 
}



void

bdev_ocssd_populate_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr,

bdev_ocssd_populate_namespace(struct nvme_ctrlr *nvme_ctrlr,

			      struct nvme_ns *nvme_ns,

			      struct nvme_async_probe_ctx *nvme_ctx)

{
@@ -1453,7 +1453,7 @@ bdev_ocssd_populate_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, 
	struct spdk_nvme_ns *ns;

	int rc;



	ns = spdk_nvme_ctrlr_get_ns(nvme_bdev_ctrlr->ctrlr, nvme_ns->id);

	ns = spdk_nvme_ctrlr_get_ns(nvme_ctrlr->ctrlr, nvme_ns->id);

	if (ns == NULL) {

		rc = -EINVAL;

		goto error;
@@ -1478,7 +1478,7 @@ bdev_ocssd_populate_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, 
	ctx->nvme_ctx = nvme_ctx;

	ctx->nvme_ns = nvme_ns;



	rc = spdk_nvme_ocssd_ctrlr_cmd_geometry(nvme_bdev_ctrlr->ctrlr, nvme_ns->id,

	rc = spdk_nvme_ocssd_ctrlr_cmd_geometry(nvme_ctrlr->ctrlr, nvme_ns->id,

						&ocssd_ns->geometry,

						sizeof(ocssd_ns->geometry),

						bdev_ocssd_geometry_cb, ctx);
@@ -1550,7 +1550,7 @@ bdev_ocssd_destroy_io_channel(struct nvme_ctrlr_channel *ctrlr_ch) 
}



int

bdev_ocssd_init_ctrlr(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr)

bdev_ocssd_init_ctrlr(struct nvme_ctrlr *nvme_ctrlr)

{

	struct ocssd_bdev_ctrlr *ocssd_ctrlr;
@@ -1559,24 +1559,24 @@ bdev_ocssd_init_ctrlr(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr) 
		return -ENOMEM;

	}



	ocssd_ctrlr->mm_poller = SPDK_POLLER_REGISTER(bdev_ocssd_poll_mm, nvme_bdev_ctrlr,

	ocssd_ctrlr->mm_poller = SPDK_POLLER_REGISTER(bdev_ocssd_poll_mm, nvme_ctrlr,

				 10000ULL);

	if (!ocssd_ctrlr->mm_poller) {

		free(ocssd_ctrlr);

		return -ENOMEM;

	}



	nvme_bdev_ctrlr->ocssd_ctrlr = ocssd_ctrlr;

	nvme_ctrlr->ocssd_ctrlr = ocssd_ctrlr;



	return 0;

}



void

bdev_ocssd_fini_ctrlr(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr)

bdev_ocssd_fini_ctrlr(struct nvme_ctrlr *nvme_ctrlr)

{

	spdk_poller_unregister(&nvme_bdev_ctrlr->ocssd_ctrlr->mm_poller);

	free(nvme_bdev_ctrlr->ocssd_ctrlr);

	nvme_bdev_ctrlr->ocssd_ctrlr = NULL;

	spdk_poller_unregister(&nvme_ctrlr->ocssd_ctrlr->mm_poller);

	free(nvme_ctrlr->ocssd_ctrlr);

	nvme_ctrlr->ocssd_ctrlr = NULL;

}



SPDK_LOG_REGISTER_COMPONENT(bdev_ocssd)

module/bdev/nvme/bdev_ocssd.h

+4 −4
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ void bdev_ocssd_create_bdev(const char *ctrlr_name, const char *bdev_name, uint3 
			    bdev_ocssd_create_cb cb_fn, void *cb_arg);

void bdev_ocssd_delete_bdev(const char *bdev_name, bdev_ocssd_delete_cb cb_fn, void *cb_arg);



void bdev_ocssd_populate_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr,

void bdev_ocssd_populate_namespace(struct nvme_ctrlr *nvme_ctrlr,

				   struct nvme_ns *nvme_ns,

				   struct nvme_async_probe_ctx *ctx);

void bdev_ocssd_depopulate_namespace(struct nvme_ns *nvme_ns);
@@ -53,9 +53,9 @@ void bdev_ocssd_namespace_config_json(struct spdk_json_write_ctx *w, struct nvme 
int bdev_ocssd_create_io_channel(struct nvme_ctrlr_channel *ioch);

void bdev_ocssd_destroy_io_channel(struct nvme_ctrlr_channel *ioch);



int bdev_ocssd_init_ctrlr(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr);

void bdev_ocssd_fini_ctrlr(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr);

int bdev_ocssd_init_ctrlr(struct nvme_ctrlr *nvme_ctrlr);

void bdev_ocssd_fini_ctrlr(struct nvme_ctrlr *nvme_ctrlr);



void bdev_ocssd_handle_chunk_notification(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr);

void bdev_ocssd_handle_chunk_notification(struct nvme_ctrlr *nvme_ctrlr);



#endif /* SPDK_BDEV_OCSSD_H */