change ns list on ctrlr thread

Author: root

lib/nvmf/subsystem.c

@@ -1670,14 +1670,31 @@ struct subsystem_ns_change_ctx_v2 {
 	struct spdk_nvmf_ctrlr *ctrlr;
 	// spdk_nvmf_subsystem_state_change_done	cb_fn;
 	// uint32_t				nsid;
+	struct spdk_nvmf_subsystem *subsystem;
+	bool last_one;
+	struct spdk_thread		*thread;
 };
 
 
+static void
+nvmf_subsystem_ns_changed_v3(void *cb_arg)
+{
+	struct spdk_nvmf_subsystem *subsystem = cb_arg;
+	SPDK_NOTICELOG("Running the subsystem.\n");
+	if (spdk_nvmf_subsystem_resume(subsystem, NULL, NULL) != 0) {
+		SPDK_ERRLOG("Failed to resume NVME-oF subsystem with id: %u\n", subsystem->id);
+	}
+}
+
 static void
 nvmf_subsystem_ns_changed_v2(void *cb_arg)
 {
 	struct subsystem_ns_change_ctx_v2 *ctx = cb_arg;		
 	nvmf_ctrlr_ns_changed(ctx->ctrlr, ctx->nsid);
+	if (ctx->last_one) {
+		SPDK_NOTICELOG("changing the ns list namespace: %d done.\n", ctx->nsid);
+		spdk_thread_send_msg(ctx->thread, nvmf_subsystem_ns_changed_v3, ctx->subsystem);
+	}
 	free(ctx);
 }
 
@@ -1686,14 +1703,31 @@ nvmf_subsystem_ns_changed(struct spdk_nvmf_subsystem *subsystem, uint32_t nsid)
 {
 	struct spdk_nvmf_ctrlr *ctrlr;
 	struct subsystem_ns_change_ctx_v2 *ctx;
-	ctx = calloc(1, sizeof(struct subsystem_ns_change_ctx_v2));
+	int count = 0;
+	ctx = calloc(subsystem->max_cntlid, sizeof(struct subsystem_ns_change_ctx_v2));	
+	if (!ctx) {
+		SPDK_ERRLOG("Cannot allocate memory for chnaging the ns list.\n");
+		if (spdk_nvmf_subsystem_resume(subsystem, NULL, NULL) != 0) {
+			SPDK_ERRLOG("Failed to resume NVME-oF subsystem with id: %u\n", subsystem->id);
+		}
+		return;
+	}
 	TAILQ_FOREACH(ctrlr, &subsystem->ctrlrs, link) {
 		if (nvmf_ctrlr_ns_is_visible(ctrlr, nsid)) {
-			ctx->nsid = nsid;
-			ctx->ctrlr = ctrlr;
-			spdk_thread_send_msg(ctrlr->thread, nvmf_subsystem_ns_changed_v2, ctx);
+			ctx[count].nsid = nsid;
+			ctx[count].ctrlr = ctrlr;
+			ctx[count].subsystem = subsystem;
+			ctx[count].thread = spdk_get_thread();
+			count++;			
 			// nvmf_ctrlr_ns_changed(ctrlr, nsid);
+		}		
+	}
+
+	for (int i = 0; i < count; i++) {
+		if ( i == count -1) {
+			ctx[i].last_one = true;
 		}
+		spdk_thread_send_msg(ctx[i].ctrlr->thread, nvmf_subsystem_ns_changed_v2, &ctx[i]);
 	}
 }
 
@@ -1843,13 +1877,9 @@ static void
 _nvmf_ns_resize(struct spdk_nvmf_subsystem *subsystem, void *cb_arg, int status)
 {
 	struct subsystem_ns_change_ctx *ctx = cb_arg;
-	SPDK_NOTICELOG("starting to change the ns list.\n");
+	SPDK_NOTICELOG("starting to change the ns list namespace: %d.\n", ctx->nsid);
 	nvmf_subsystem_ns_changed(subsystem, ctx->nsid);
 	SPDK_NOTICELOG("ns list changed and resume the subsystem.\n");
-	if (spdk_nvmf_subsystem_resume(subsystem, NULL, NULL) != 0) {
-		SPDK_ERRLOG("Failed to resume NVME-oF subsystem with id: %u\n", subsystem->id);
-	}
-
 	free(ctx);
 }