Commit 77ee034c authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Ben Walker
Browse files

bdev/nvme: Add lock to unprotected operations around attach controller 



Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: I8cddce04c17fe07a1e66d014c1ce747147a15a8e
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/25487


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarGangCao <gang.cao@intel.com>
Reviewed-by: default avatarBen Walker <ben@nvidia.com>
Community-CI: Community CI Samsung <spdk.community.ci.samsung@gmail.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
parent 48454bb2

module/bdev/nvme/bdev_nvme.c

+20 −0
Original line number Diff line number Diff line
@@ -4655,6 +4655,8 @@ nvme_bdev_create(struct nvme_ctrlr *nvme_ctrlr, struct nvme_ns *nvme_ns) 
	nbdev->nsid = nvme_ns->id;

	TAILQ_INSERT_TAIL(&nbdev->nvme_ns_list, nvme_ns, tailq);



	pthread_mutex_lock(&g_bdev_nvme_mutex);



	nbdev->nbdev_ctrlr = nbdev_ctrlr;

	TAILQ_INSERT_TAIL(&nbdev_ctrlr->bdevs, nbdev, tailq);
@@ -4663,11 +4665,17 @@ nvme_bdev_create(struct nvme_ctrlr *nvme_ctrlr, struct nvme_ns *nvme_ns) 
		SPDK_ERRLOG("spdk_bdev_register() failed\n");

		spdk_io_device_unregister(nbdev, NULL);

		nvme_ns->bdev = NULL;



		TAILQ_REMOVE(&nbdev_ctrlr->bdevs, nbdev, tailq);



		pthread_mutex_unlock(&g_bdev_nvme_mutex);



		nvme_bdev_free(nbdev);

		return rc;

	}



	pthread_mutex_unlock(&g_bdev_nvme_mutex);



	return 0;

}
@@ -4827,7 +4835,10 @@ nvme_ctrlr_populate_namespace_done(struct nvme_ns *nvme_ns, int rc) 
		nvme_ns->probe_ctx = NULL;

		nvme_ctrlr_get_ref(nvme_ctrlr);

	} else {

		pthread_mutex_lock(&nvme_ctrlr->mutex);

		RB_REMOVE(nvme_ns_tree, &nvme_ctrlr->namespaces, nvme_ns);

		pthread_mutex_unlock(&nvme_ctrlr->mutex);



		nvme_ns_free(nvme_ns);

	}
@@ -5124,7 +5135,9 @@ nvme_ctrlr_populate_namespaces(struct nvme_ctrlr *nvme_ctrlr, 
			}

			nvme_ns->probe_ctx = ctx;



			pthread_mutex_lock(&nvme_ctrlr->mutex);

			RB_INSERT(nvme_ns_tree, &nvme_ctrlr->namespaces, nvme_ns);

			pthread_mutex_unlock(&nvme_ctrlr->mutex);



			nvme_ctrlr_populate_namespace(nvme_ctrlr, nvme_ns);

		}
@@ -6363,6 +6376,9 @@ nvme_ctrlr_populate_namespaces_done(struct nvme_ctrlr *nvme_ctrlr, 
	 * There can be more than one bdev per NVMe controller.

	 */

	j = 0;



	pthread_mutex_lock(&nvme_ctrlr->mutex);



	nvme_ns = nvme_ctrlr_get_first_active_ns(nvme_ctrlr);

	while (nvme_ns != NULL) {

		nvme_bdev = nvme_ns->bdev;
@@ -6370,6 +6386,8 @@ nvme_ctrlr_populate_namespaces_done(struct nvme_ctrlr *nvme_ctrlr, 
			ctx->names[j] = nvme_bdev->disk.name;

			j++;

		} else {

			pthread_mutex_unlock(&nvme_ctrlr->mutex);



			NVME_CTRLR_ERRLOG(nvme_ctrlr,

					  "Maximum number of namespaces supported per NVMe controller is %du. "

					  "Unable to return all names of created bdevs\n",
@@ -6382,6 +6400,8 @@ nvme_ctrlr_populate_namespaces_done(struct nvme_ctrlr *nvme_ctrlr, 
		nvme_ns = nvme_ctrlr_get_next_active_ns(nvme_ctrlr, nvme_ns);

	}



	pthread_mutex_unlock(&nvme_ctrlr->mutex);



	ctx->reported_bdevs = j;

	populate_namespaces_cb(ctx, 0);

}