Commit 3e493c00 authored by James Smart's avatar James Smart Committed by Christoph Hellwig
Browse files

nvme-fc: fix nulling of queue data on reconnect 



The reconnect path is calling the init routines to clear a queue
structure. But the queue structure has state that perhaps needs
to persist as long as the controller is live.

Remove the nvme_fc_init_queue() calls on reconnect.
The nvme_fc_free_queue() calls will clear state bits and reset
any relevant queue state for a new connection.

Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 587331f7

drivers/nvme/host/fc.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -1879,6 +1879,7 @@ nvme_fc_free_queue(struct nvme_fc_queue *queue) 
	 */

	 */





	queue->connection_id = 0;

	queue->connection_id = 0;

	atomic_set(&queue->csn, 1);

}

}





static void

static void
@@ -2468,7 +2469,7 @@ out_free_tag_set: 
}

}





static int

static int

nvme_fc_reinit_io_queues(struct nvme_fc_ctrl *ctrl)

nvme_fc_recreate_io_queues(struct nvme_fc_ctrl *ctrl)

{

{

	struct nvmf_ctrl_options *opts = ctrl->ctrl.opts;

	struct nvmf_ctrl_options *opts = ctrl->ctrl.opts;

	unsigned int nr_io_queues;

	unsigned int nr_io_queues;
@@ -2488,8 +2489,6 @@ nvme_fc_reinit_io_queues(struct nvme_fc_ctrl *ctrl) 
	if (ctrl->ctrl.queue_count == 1)

	if (ctrl->ctrl.queue_count == 1)

		return 0;

		return 0;





	nvme_fc_init_io_queues(ctrl);



	ret = nvme_fc_create_hw_io_queues(ctrl, ctrl->ctrl.sqsize + 1);

	ret = nvme_fc_create_hw_io_queues(ctrl, ctrl->ctrl.sqsize + 1);

	if (ret)

	if (ret)

		goto out_free_io_queues;

		goto out_free_io_queues;
@@ -2587,8 +2586,6 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) 
	 * Create the admin queue

	 * Create the admin queue

	 */

	 */





	nvme_fc_init_queue(ctrl, 0);



	ret = __nvme_fc_create_hw_queue(ctrl, &ctrl->queues[0], 0,

	ret = __nvme_fc_create_hw_queue(ctrl, &ctrl->queues[0], 0,

				NVME_AQ_DEPTH);

				NVME_AQ_DEPTH);

	if (ret)

	if (ret)
@@ -2675,7 +2672,7 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) 
		if (!ctrl->ioq_live)

		if (!ctrl->ioq_live)

			ret = nvme_fc_create_io_queues(ctrl);

			ret = nvme_fc_create_io_queues(ctrl);

		else

		else

			ret = nvme_fc_reinit_io_queues(ctrl);

			ret = nvme_fc_recreate_io_queues(ctrl);

		if (ret)

		if (ret)

			goto out_term_aen_ops;

			goto out_term_aen_ops;

	}

	}
@@ -3023,6 +3020,8 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, 
	if (!ctrl->queues)

	if (!ctrl->queues)

		goto out_free_ida;

		goto out_free_ida;





	nvme_fc_init_queue(ctrl, 0);



	memset(&ctrl->admin_tag_set, 0, sizeof(ctrl->admin_tag_set));

	memset(&ctrl->admin_tag_set, 0, sizeof(ctrl->admin_tag_set));

	ctrl->admin_tag_set.ops = &nvme_fc_admin_mq_ops;

	ctrl->admin_tag_set.ops = &nvme_fc_admin_mq_ops;

	ctrl->admin_tag_set.queue_depth = NVME_AQ_MQ_TAG_DEPTH;

	ctrl->admin_tag_set.queue_depth = NVME_AQ_MQ_TAG_DEPTH;

CRA Git | Maintained and supported by SUSTech CRA and CCSE