Commit b754a32c authored by Max Gurtovoy's avatar Max Gurtovoy Committed by Sagi Grimberg
Browse files

nvme-rdma: use NVME_CTRL_CONNECTING state to mark init process 



In order to avoid concurrent error recovery during initialization
process (allowed by the NVME_CTRL_NEW --> NVME_CTRL_RESETTING transition)
we must mark the ctrl as CONNECTING before initial connection
establisment.

Signed-off-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Reviewed-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
parent ad6a0a52

drivers/nvme/host/core.c

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl, 
		break;

	case NVME_CTRL_CONNECTING:

		switch (old_state) {

		case NVME_CTRL_NEW:

		case NVME_CTRL_LIVE:

		case NVME_CTRL_RESETTING:

			changed = true;

drivers/nvme/host/rdma.c

+3 −0
Original line number Diff line number Diff line
@@ -1942,6 +1942,9 @@ static struct nvme_ctrl *nvme_rdma_create_ctrl(struct device *dev, 
	if (!ctrl->queues)

		goto out_uninit_ctrl;



	changed = nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_CONNECTING);

	WARN_ON_ONCE(!changed);



	ret = nvme_rdma_configure_admin_queue(ctrl, true);

	if (ret)

		goto out_kfree_queues;