bdev/nvme: Add mutex per nvme_bdev_ctrlr

Add mutex per nvme_bdev_ctrlr and replace g_bdev_nvme_mutex by it
for possible cases. These are just drop-in-replacement.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ib1d5eebd65e514cfe96ad60a9004d9bace7b4f6b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6693
Community-CI: Broadcom CI
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>

module/bdev/nvme/bdev_nvme.c

@@ -402,7 +402,7 @@ _bdev_nvme_reset_complete(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, int rc)
 		SPDK_NOTICELOG("Resetting controller successful.\n");
 	}
 
-	pthread_mutex_lock(&g_bdev_nvme_mutex);
+	pthread_mutex_lock(&nvme_bdev_ctrlr->mutex);
 	nvme_bdev_ctrlr->resetting = false;
 	nvme_bdev_ctrlr->failover_in_progress = false;
 
@@ -417,7 +417,8 @@ _bdev_nvme_reset_complete(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, int rc)
 		do_destruct = true;
 	}
 
-	pthread_mutex_unlock(&g_bdev_nvme_mutex);
+	pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);
+
 	/* Make sure we clear any pending resets before returning. */
 	spdk_for_each_channel(nvme_bdev_ctrlr,
 			      _bdev_nvme_complete_pending_resets,
@@ -502,21 +503,22 @@ _bdev_nvme_reset_destroy_qpair(struct spdk_io_channel_iter *i)
 static int
 _bdev_nvme_reset(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, void *ctx)
 {
-	pthread_mutex_lock(&g_bdev_nvme_mutex);
+	pthread_mutex_lock(&nvme_bdev_ctrlr->mutex);
 	if (nvme_bdev_ctrlr->destruct) {
-		pthread_mutex_unlock(&g_bdev_nvme_mutex);
+		pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);
 		return -EBUSY;
 	}
 
 	if (nvme_bdev_ctrlr->resetting) {
-		pthread_mutex_unlock(&g_bdev_nvme_mutex);
+		pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);
 		SPDK_NOTICELOG("Unable to perform reset, already in progress.\n");
 		return -EAGAIN;
 	}
 
 	nvme_bdev_ctrlr->resetting = true;
 
-	pthread_mutex_unlock(&g_bdev_nvme_mutex);
+	pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);
+
 	/* First, delete all NVMe I/O queue pairs. */
 	spdk_for_each_channel(nvme_bdev_ctrlr,
 			      _bdev_nvme_reset_destroy_qpair,
@@ -556,9 +558,9 @@ bdev_nvme_failover(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, bool remove)
 	struct nvme_bdev_ctrlr_trid *curr_trid = NULL, *next_trid = NULL;
 	int rc = 0;
 
-	pthread_mutex_lock(&g_bdev_nvme_mutex);
+	pthread_mutex_lock(&nvme_bdev_ctrlr->mutex);
 	if (nvme_bdev_ctrlr->destruct) {
-		pthread_mutex_unlock(&g_bdev_nvme_mutex);
+		pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);
 		/* Don't bother resetting if the controller is in the process of being destructed. */
 		return 0;
 	}
@@ -572,7 +574,7 @@ bdev_nvme_failover(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, bool remove)
 		if (next_trid && !nvme_bdev_ctrlr->failover_in_progress) {
 			rc = -EAGAIN;
 		}
-		pthread_mutex_unlock(&g_bdev_nvme_mutex);
+		pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);
 		SPDK_NOTICELOG("Unable to perform reset, already in progress.\n");
 		return rc;
 	}
@@ -602,7 +604,8 @@ bdev_nvme_failover(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, bool remove)
 		}
 	}
 
-	pthread_mutex_unlock(&g_bdev_nvme_mutex);
+	pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);
+
 	/* First, delete all NVMe I/O queue pairs. */
 	spdk_for_each_channel(nvme_bdev_ctrlr,
 			      _bdev_nvme_reset_destroy_qpair,
@@ -1379,9 +1382,9 @@ nvme_ctrlr_populate_namespace_done(struct nvme_async_probe_ctx *ctx,
 
 	if (rc == 0) {
 		nvme_ns->populated = true;
-		pthread_mutex_lock(&g_bdev_nvme_mutex);
+		pthread_mutex_lock(&nvme_bdev_ctrlr->mutex);
 		nvme_bdev_ctrlr->ref++;
-		pthread_mutex_unlock(&g_bdev_nvme_mutex);
+		pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);
 	} else {
 		memset(nvme_ns, 0, sizeof(*nvme_ns));
 	}
@@ -1533,6 +1536,11 @@ nvme_bdev_ctrlr_create(struct spdk_nvme_ctrlr *ctrlr,
 		return -ENOMEM;
 	}
 
+	rc = pthread_mutex_init(&nvme_bdev_ctrlr->mutex, NULL);
+	if (rc != 0) {
+		goto err_init_mutex;
+	}
+
 	TAILQ_INIT(&nvme_bdev_ctrlr->trids);
 	nvme_bdev_ctrlr->num_ns = spdk_nvme_ctrlr_get_num_ns(ctrlr);
 	if (nvme_bdev_ctrlr->num_ns != 0) {
@@ -1626,6 +1634,8 @@ err_alloc_namespace:
 err_alloc_trid:
 	free(nvme_bdev_ctrlr->namespaces);
 err_alloc_namespaces:
+	pthread_mutex_destroy(&nvme_bdev_ctrlr->mutex);
+err_init_mutex:
 	free(nvme_bdev_ctrlr);
 	return rc;
 }
@@ -1685,11 +1695,11 @@ _bdev_nvme_delete(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, bool hotplug)
 {
 	struct nvme_probe_skip_entry *entry;
 
-	pthread_mutex_lock(&g_bdev_nvme_mutex);
+	pthread_mutex_lock(&nvme_bdev_ctrlr->mutex);
 
 	/* The controller's destruction was already started */
 	if (nvme_bdev_ctrlr->destruct) {
-		pthread_mutex_unlock(&g_bdev_nvme_mutex);
+		pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);
 		return 0;
 	}
 
@@ -1697,7 +1707,7 @@ _bdev_nvme_delete(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, bool hotplug)
 	    nvme_bdev_ctrlr->connected_trid->trtype == SPDK_NVME_TRANSPORT_PCIE) {
 		entry = calloc(1, sizeof(*entry));
 		if (!entry) {
-			pthread_mutex_unlock(&g_bdev_nvme_mutex);
+			pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);
 			return -ENOMEM;
 		}
 		entry->trid = *nvme_bdev_ctrlr->connected_trid;
@@ -1705,7 +1715,7 @@ _bdev_nvme_delete(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, bool hotplug)
 	}
 
 	nvme_bdev_ctrlr->destruct = true;
-	pthread_mutex_unlock(&g_bdev_nvme_mutex);
+	pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);
 
 	_nvme_bdev_ctrlr_destruct(nvme_bdev_ctrlr);
 
@@ -1911,7 +1921,7 @@ bdev_nvme_add_trid(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, struct spdk_nvme_ctr
 		return -ENOTSUP;
 	}
 
-	pthread_mutex_lock(&g_bdev_nvme_mutex);
+	pthread_mutex_lock(&nvme_bdev_ctrlr->mutex);
 
 	/* Currently we only support failover to the same transport type. */
 	if (nvme_bdev_ctrlr->connected_trid->trtype != trid->trtype) {
@@ -1973,7 +1983,7 @@ bdev_nvme_add_trid(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, struct spdk_nvme_ctr
 	TAILQ_INSERT_TAIL(&nvme_bdev_ctrlr->trids, new_trid, link);
 
 exit:
-	pthread_mutex_unlock(&g_bdev_nvme_mutex);
+	pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);
 	return rc;
 }
 
@@ -2195,13 +2205,16 @@ bdev_nvme_library_fini(void)
 
 	pthread_mutex_lock(&g_bdev_nvme_mutex);
 	TAILQ_FOREACH_SAFE(nvme_bdev_ctrlr, &g_nvme_bdev_ctrlrs, tailq, tmp) {
+		pthread_mutex_lock(&nvme_bdev_ctrlr->mutex);
 		if (nvme_bdev_ctrlr->destruct) {
 			/* This controller's destruction was already started
 			 * before the application started shutting down
 			 */
+			pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);
 			continue;
 		}
 		nvme_bdev_ctrlr->destruct = true;
+		pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);
 
 		spdk_thread_send_msg(nvme_bdev_ctrlr->thread, _nvme_bdev_ctrlr_destruct,
 				     nvme_bdev_ctrlr);

module/bdev/nvme/common.c

@@ -134,6 +134,8 @@ nvme_bdev_unregister_cb(void *io_device)
 		free(trid);
 	}
 
+	pthread_mutex_destroy(&nvme_bdev_ctrlr->mutex);
+
 	free(nvme_bdev_ctrlr->namespaces);
 	free(nvme_bdev_ctrlr);
 
@@ -168,18 +170,18 @@ nvme_bdev_ctrlr_do_destruct(void *ctx)
 void
 nvme_bdev_ctrlr_destruct(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr)
 {
-	pthread_mutex_lock(&g_bdev_nvme_mutex);
+	pthread_mutex_lock(&nvme_bdev_ctrlr->mutex);
 
 	assert(nvme_bdev_ctrlr->ref > 0);
 	nvme_bdev_ctrlr->ref--;
 
 	if (nvme_bdev_ctrlr->ref > 0 || !nvme_bdev_ctrlr->destruct ||
 	    nvme_bdev_ctrlr->resetting) {
-		pthread_mutex_unlock(&g_bdev_nvme_mutex);
+		pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);
 		return;
 	}
 
-	pthread_mutex_unlock(&g_bdev_nvme_mutex);
+	pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);
 
 	nvme_bdev_ctrlr_do_destruct(nvme_bdev_ctrlr);
 }
@@ -187,14 +189,18 @@ nvme_bdev_ctrlr_destruct(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr)
 void
 nvme_bdev_ns_detach(struct nvme_bdev_ns *nvme_ns)
 {
-	pthread_mutex_lock(&g_bdev_nvme_mutex);
+	struct nvme_bdev_ctrlr *nvme_bdev_ctrlr = nvme_ns->ctrlr;
+
+	assert(nvme_bdev_ctrlr != NULL);
+
+	pthread_mutex_lock(&nvme_bdev_ctrlr->mutex);
 	assert(nvme_ns->ref > 0);
 	nvme_ns->ref--;
 	if (nvme_ns->ref > 0) {
-		pthread_mutex_unlock(&g_bdev_nvme_mutex);
+		pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);
 		return;
 	}
-	pthread_mutex_unlock(&g_bdev_nvme_mutex);
+	pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);
 
 	nvme_bdev_ctrlr_destruct(nvme_ns->ctrlr);
 }

module/bdev/nvme/common.h

@@ -111,6 +111,8 @@ struct nvme_bdev_ctrlr {
 	TAILQ_ENTRY(nvme_bdev_ctrlr)		tailq;
 
 	TAILQ_HEAD(, nvme_bdev_ctrlr_trid)	trids;
+
+	pthread_mutex_t				mutex;
 };
 
 struct nvme_bdev {

test/unit/lib/bdev/nvme/bdev_ocssd.c/bdev_ocssd_ut.c

@@ -207,6 +207,7 @@ create_nvme_bdev_controller(const struct spdk_nvme_transport_id *trid, const cha
 	struct nvme_bdev_ctrlr *nvme_bdev_ctrlr;
 	struct nvme_bdev_ctrlr_trid *trid_entry;
 	uint32_t nsid;
+	int rc;
 
 	ctrlr = find_controller(trid);
 
@@ -216,6 +217,9 @@ create_nvme_bdev_controller(const struct spdk_nvme_transport_id *trid, const cha
 	nvme_bdev_ctrlr = calloc(1, sizeof(*nvme_bdev_ctrlr));
 	SPDK_CU_ASSERT_FATAL(nvme_bdev_ctrlr != NULL);
 
+	rc = pthread_mutex_init(&nvme_bdev_ctrlr->mutex, NULL);
+	SPDK_CU_ASSERT_FATAL(rc == 0);
+
 	nvme_bdev_ctrlr->namespaces = calloc(ctrlr->ns_count, sizeof(struct nvme_bdev_ns *));
 	SPDK_CU_ASSERT_FATAL(nvme_bdev_ctrlr->namespaces != NULL);