Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77d0612d authored by Max Gurtovoy's avatar Max Gurtovoy Committed by Jens Axboe
Browse files

nvme: centralize ctrl removal prints 



nvme_delete_ctrl can be called from various contexts in parallel,
and cause duplicated information prints, even though the specific
context doesn't perform the actual removal. Instead, print the
information when the actual removal occurs.

Signed-off-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 97c12223

drivers/nvme/host/core.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -130,6 +130,9 @@ static void nvme_delete_ctrl_work(struct work_struct *work) 
	struct nvme_ctrl *ctrl =

	struct nvme_ctrl *ctrl =

		container_of(work, struct nvme_ctrl, delete_work);

		container_of(work, struct nvme_ctrl, delete_work);





	dev_info(ctrl->device,

		 "Removing ctrl: NQN \"%s\"\n", ctrl->opts->subsysnqn);



	flush_work(&ctrl->reset_work);

	flush_work(&ctrl->reset_work);

	nvme_stop_ctrl(ctrl);

	nvme_stop_ctrl(ctrl);

	nvme_remove_namespaces(ctrl);

	nvme_remove_namespaces(ctrl);

drivers/nvme/host/fc.c

+5 −8
Original line number Original line Diff line number Diff line
@@ -768,8 +768,7 @@ nvme_fc_ctrl_connectivity_loss(struct nvme_fc_ctrl *ctrl) 
		 */

		 */

		if (nvme_reset_ctrl(&ctrl->ctrl)) {

		if (nvme_reset_ctrl(&ctrl->ctrl)) {

			dev_warn(ctrl->ctrl.device,

			dev_warn(ctrl->ctrl.device,

				"NVME-FC{%d}: Couldn't schedule reset. "

				"NVME-FC{%d}: Couldn't schedule reset.\n",

				"Deleting controller.\n",

				ctrl->cnum);

				ctrl->cnum);

			nvme_delete_ctrl(&ctrl->ctrl);

			nvme_delete_ctrl(&ctrl->ctrl);

		}

		}
@@ -836,8 +835,7 @@ nvme_fc_unregister_remoteport(struct nvme_fc_remote_port *portptr) 
		/* if dev_loss_tmo==0, dev loss is immediate */

		/* if dev_loss_tmo==0, dev loss is immediate */

		if (!portptr->dev_loss_tmo) {

		if (!portptr->dev_loss_tmo) {

			dev_warn(ctrl->ctrl.device,

			dev_warn(ctrl->ctrl.device,

				"NVME-FC{%d}: controller connectivity lost. "

				"NVME-FC{%d}: controller connectivity lost.\n",

				"Deleting controller.\n",

				ctrl->cnum);

				ctrl->cnum);

			nvme_delete_ctrl(&ctrl->ctrl);

			nvme_delete_ctrl(&ctrl->ctrl);

		} else

		} else
@@ -2882,14 +2880,13 @@ nvme_fc_reconnect_or_delete(struct nvme_fc_ctrl *ctrl, int status) 
		if (portptr->port_state == FC_OBJSTATE_ONLINE)

		if (portptr->port_state == FC_OBJSTATE_ONLINE)

			dev_warn(ctrl->ctrl.device,

			dev_warn(ctrl->ctrl.device,

				"NVME-FC{%d}: Max reconnect attempts (%d) "

				"NVME-FC{%d}: Max reconnect attempts (%d) "

				"reached. Removing controller\n",

				"reached.\n",

				ctrl->cnum, ctrl->ctrl.nr_reconnects);

				ctrl->cnum, ctrl->ctrl.nr_reconnects);

		else

		else

			dev_warn(ctrl->ctrl.device,

			dev_warn(ctrl->ctrl.device,

				"NVME-FC{%d}: dev_loss_tmo (%d) expired "

				"NVME-FC{%d}: dev_loss_tmo (%d) expired "

				"while waiting for remoteport connectivity. "

				"while waiting for remoteport connectivity.\n",

				"Removing controller\n", ctrl->cnum,

				ctrl->cnum, portptr->dev_loss_tmo);

				portptr->dev_loss_tmo);

		WARN_ON(nvme_delete_ctrl(&ctrl->ctrl));

		WARN_ON(nvme_delete_ctrl(&ctrl->ctrl));

	}

	}

}

}

drivers/nvme/host/rdma.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -899,7 +899,6 @@ static void nvme_rdma_reconnect_or_remove(struct nvme_rdma_ctrl *ctrl) 
		queue_delayed_work(nvme_wq, &ctrl->reconnect_work,

		queue_delayed_work(nvme_wq, &ctrl->reconnect_work,

				ctrl->ctrl.opts->reconnect_delay * HZ);

				ctrl->ctrl.opts->reconnect_delay * HZ);

	} else {

	} else {

		dev_info(ctrl->ctrl.device, "Removing controller...\n");

		nvme_delete_ctrl(&ctrl->ctrl);

		nvme_delete_ctrl(&ctrl->ctrl);

	}

	}

}

}
@@ -2031,9 +2030,6 @@ static void nvme_rdma_remove_one(struct ib_device *ib_device, void *client_data) 
	list_for_each_entry(ctrl, &nvme_rdma_ctrl_list, list) {

	list_for_each_entry(ctrl, &nvme_rdma_ctrl_list, list) {

		if (ctrl->device->dev != ib_device)

		if (ctrl->device->dev != ib_device)

			continue;

			continue;

		dev_info(ctrl->ctrl.device,

			"Removing ctrl: NQN \"%s\", addr %pISp\n",

			ctrl->ctrl.opts->subsysnqn, &ctrl->addr);

		nvme_delete_ctrl(&ctrl->ctrl);

		nvme_delete_ctrl(&ctrl->ctrl);

	}

	}

	mutex_unlock(&nvme_rdma_ctrl_mutex);

	mutex_unlock(&nvme_rdma_ctrl_mutex);