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

bdev/nvme: Consolidate error paths of create_ctrlr() and rename it 



Consolidating error paths will be helpful to create and associate
with the creating controller. Fix a couple of memory leaks in error
paths together.

Then rename create_ctrlr() by nvme_bdev_ctrlr_create() to follow
naming conventions and clarify what type of controller is created.

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


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 5acae9d6

module/bdev/nvme/bdev_nvme.c

+30 −28
Original line number Diff line number Diff line
@@ -1400,7 +1400,7 @@ aer_cb(void *arg, const struct spdk_nvme_cpl *cpl) 
}



static int

create_ctrlr(struct spdk_nvme_ctrlr *ctrlr,

nvme_bdev_ctrlr_create(struct spdk_nvme_ctrlr *ctrlr,

		       const char *name,

		       const struct spdk_nvme_transport_id *trid,

		       uint32_t prchk_flags)
@@ -1421,16 +1421,15 @@ create_ctrlr(struct spdk_nvme_ctrlr *ctrlr, 
	nvme_bdev_ctrlr->namespaces = calloc(nvme_bdev_ctrlr->num_ns, sizeof(struct nvme_bdev_ns *));

	if (!nvme_bdev_ctrlr->namespaces) {

		SPDK_ERRLOG("Failed to allocate block namespaces pointer\n");

		free(nvme_bdev_ctrlr);

		return -ENOMEM;

		rc = -ENOMEM;

		goto err_alloc_namespaces;

	}



	trid_entry = calloc(1, sizeof(*trid_entry));

	if (trid_entry == NULL) {

		SPDK_ERRLOG("Failed to allocate trid entry pointer\n");

		free(nvme_bdev_ctrlr->namespaces);

		free(nvme_bdev_ctrlr);

		return -ENOMEM;

		rc = -ENOMEM;

		goto err_alloc_trid;

	}



	trid_entry->trid = *trid;
@@ -1439,13 +1438,8 @@ create_ctrlr(struct spdk_nvme_ctrlr *ctrlr, 
		nvme_bdev_ctrlr->namespaces[i] = calloc(1, sizeof(struct nvme_bdev_ns));

		if (nvme_bdev_ctrlr->namespaces[i] == NULL) {

			SPDK_ERRLOG("Failed to allocate block namespace struct\n");

			for (; i > 0; i--) {

				free(nvme_bdev_ctrlr->namespaces[i - 1]);

			}

			free(trid_entry);

			free(nvme_bdev_ctrlr->namespaces);

			free(nvme_bdev_ctrlr);

			return -ENOMEM;

			rc = -ENOMEM;

			goto err_alloc_namespace;

		}

	}
@@ -1456,21 +1450,15 @@ create_ctrlr(struct spdk_nvme_ctrlr *ctrlr, 
	nvme_bdev_ctrlr->connected_trid = &trid_entry->trid;

	nvme_bdev_ctrlr->name = strdup(name);

	if (nvme_bdev_ctrlr->name == NULL) {

		free(trid_entry);

		free(nvme_bdev_ctrlr->namespaces);

		free(nvme_bdev_ctrlr);

		return -ENOMEM;

		rc = -ENOMEM;

		goto err_alloc_name;

	}



	if (spdk_nvme_ctrlr_is_ocssd_supported(nvme_bdev_ctrlr->ctrlr)) {

		rc = bdev_ocssd_init_ctrlr(nvme_bdev_ctrlr);

		if (spdk_unlikely(rc != 0)) {

			SPDK_ERRLOG("Unable to initialize OCSSD controller\n");

			free(trid_entry);

			free(nvme_bdev_ctrlr->name);

			free(nvme_bdev_ctrlr->namespaces);

			free(nvme_bdev_ctrlr);

			return rc;

			goto err_init_ocssd;

		}

	}
@@ -1502,6 +1490,20 @@ create_ctrlr(struct spdk_nvme_ctrlr *ctrlr, 


	TAILQ_INSERT_HEAD(&nvme_bdev_ctrlr->trids, trid_entry, link);

	return 0;



err_init_ocssd:

	free(nvme_bdev_ctrlr->name);

err_alloc_name:

err_alloc_namespace:

	for (; i > 0; i--) {

		free(nvme_bdev_ctrlr->namespaces[i - 1]);

	}

	free(trid_entry);

err_alloc_trid:

	free(nvme_bdev_ctrlr->namespaces);

err_alloc_namespaces:

	free(nvme_bdev_ctrlr);

	return rc;

}



static void
@@ -1532,7 +1534,7 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid, 


	SPDK_DEBUGLOG(bdev_nvme, "Attached to %s (%s)\n", trid->traddr, name);



	create_ctrlr(ctrlr, name, trid, prchk_flags);

	nvme_bdev_ctrlr_create(ctrlr, name, trid, prchk_flags);



	nvme_bdev_ctrlr = nvme_bdev_ctrlr_get(trid);

	if (!nvme_bdev_ctrlr) {
@@ -1745,7 +1747,7 @@ connect_attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid, 


	spdk_poller_unregister(&ctx->poller);



	rc = create_ctrlr(ctrlr, ctx->base_name, &ctx->trid, ctx->prchk_flags);

	rc = nvme_bdev_ctrlr_create(ctrlr, ctx->base_name, &ctx->trid, ctx->prchk_flags);

	if (rc) {

		SPDK_ERRLOG("Failed to create new device\n");

		populate_namespaces_cb(ctx, 0, rc);
@@ -2176,7 +2178,7 @@ bdev_nvme_library_init(void) 
				goto end;

			}



			rc = create_ctrlr(ctrlr, probe_ctx->names[i], &probe_ctx->trids[i], 0);

			rc = nvme_bdev_ctrlr_create(ctrlr, probe_ctx->names[i], &probe_ctx->trids[i], 0);

			if (rc) {

				goto end;

			}