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

Commit 74bd8cbe authored by James Smart's avatar James Smart Committed by Sagi Grimberg
Browse files

nvme-fc: Fail transport errors with NVME_SC_HOST_PATH 



NVME_SC_INTERNAL should indicate an internal controller errors
and not host transport errors. These errors will propagate to
upper layers (essentially nvme core) and be interpereted as
transport errors which should not be taken into account for
namespace state or condition.

Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarJames Smart <james.smart@broadcom.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
parent 16686010

drivers/nvme/host/fc.c

+30 −7
Original line number Diff line number Diff line
@@ -1608,9 +1608,13 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req) 
				sizeof(op->rsp_iu), DMA_FROM_DEVICE);



	if (opstate == FCPOP_STATE_ABORTED)

		status = cpu_to_le16(NVME_SC_ABORT_REQ << 1);

	else if (freq->status)

		status = cpu_to_le16(NVME_SC_INTERNAL << 1);

		status = cpu_to_le16(NVME_SC_HOST_PATH_ERROR << 1);

	else if (freq->status) {

		status = cpu_to_le16(NVME_SC_HOST_PATH_ERROR << 1);

		dev_info(ctrl->ctrl.device,

			"NVME-FC{%d}: io failed due to lldd error %d\n",

			ctrl->cnum, freq->status);

	}



	/*

	 * For the linux implementation, if we have an unsuccesful
@@ -1638,7 +1642,12 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req) 
		 */

		if (freq->transferred_length !=

		    be32_to_cpu(op->cmd_iu.data_len)) {

			status = cpu_to_le16(NVME_SC_INTERNAL << 1);

			status = cpu_to_le16(NVME_SC_HOST_PATH_ERROR << 1);

			dev_info(ctrl->ctrl.device,

				"NVME-FC{%d}: io failed due to bad transfer "

				"length: %d vs expected %d\n",

				ctrl->cnum, freq->transferred_length,

				be32_to_cpu(op->cmd_iu.data_len));

			goto done;

		}

		result.u64 = 0;
@@ -1655,7 +1664,17 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req) 
					freq->transferred_length ||

			     op->rsp_iu.status_code ||

			     sqe->common.command_id != cqe->command_id)) {

			status = cpu_to_le16(NVME_SC_INTERNAL << 1);

			status = cpu_to_le16(NVME_SC_HOST_PATH_ERROR << 1);

			dev_info(ctrl->ctrl.device,

				"NVME-FC{%d}: io failed due to bad NVMe_ERSP: "

				"iu len %d, xfr len %d vs %d, status code "

				"%d, cmdid %d vs %d\n",

				ctrl->cnum, be16_to_cpu(op->rsp_iu.iu_len),

				be32_to_cpu(op->rsp_iu.xfrd_len),

				freq->transferred_length,

				op->rsp_iu.status_code,

				sqe->common.command_id,

				cqe->command_id);

			goto done;

		}

		result = cqe->result;
@@ -1663,7 +1682,11 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req) 
		break;



	default:

		status = cpu_to_le16(NVME_SC_INTERNAL << 1);

		status = cpu_to_le16(NVME_SC_HOST_PATH_ERROR << 1);

		dev_info(ctrl->ctrl.device,

			"NVME-FC{%d}: io failed due to odd NVMe_xRSP iu "

			"len %d\n",

			ctrl->cnum, freq->rcv_rsplen);

		goto done;

	}