nvme-fc: stop queues on error detection (2952a879) · Commits · 戴 / test

Per the recommendation by Sagi on: http://lists.infradead.org/pipermail/linux-nvme/2017-April/009261.html Rather than waiting for reset work thread to stop queues and abort the ios, immediately stop the queues on error detection. Reset thread will restop the queues (as it's called on other paths), but it does not appear to have a side effect. Signed-off-by:

James Smart <james.smart@broadcom.com> Reviewed-by:

Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by:

Christoph Hellwig <hch@lst.de> Signed-off-by:

Jens Axboe <axboe@fb.com>

drivers/nvme/host/fc.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1754,6 +1754,10 @@ nvme_fc_error_recovery(struct nvme_fc_ctrl ctrl, char errmsg)
	dev_info(ctrl->ctrl.device,		dev_info(ctrl->ctrl.device,
	"NVME-FC{%d}: resetting controller\n", ctrl->cnum);		"NVME-FC{%d}: resetting controller\n", ctrl->cnum);

			/* stop the queues on error, cleanup is in reset thread */
			if (ctrl->queue_count > 1)
			nvme_stop_queues(&ctrl->ctrl);

	if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_RECONNECTING)) {		if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_RECONNECTING)) {
	dev_err(ctrl->ctrl.device,		dev_err(ctrl->ctrl.device,
	"NVME-FC{%d}: error_recovery: Couldn't change state "		"NVME-FC{%d}: error_recovery: Couldn't change state "

Admin message