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

Commit 2da6e005 authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Christoph Hellwig
Browse files

nvmet: add error log support for admin-cmd 



This patch adds the support to maintain the error log page for admin
commands.

Signed-off-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 762a11df

drivers/nvme/target/admin-cmd.c

+18 −4
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static u16 nvmet_get_smart_log_nsid(struct nvmet_req *req, 
	if (!ns) {

		pr_err("Could not find namespace id : %d\n",

				le32_to_cpu(req->cmd->get_log_page.nsid));

		req->error_loc = offsetof(struct nvme_rw_command, nsid);

		return NVME_SC_INVALID_NS;

	}
@@ -380,6 +381,7 @@ static void nvmet_execute_identify_ns(struct nvmet_req *req) 
	u16 status = 0;



	if (le32_to_cpu(req->cmd->identify.nsid) == NVME_NSID_ALL) {

		req->error_loc = offsetof(struct nvme_identify, nsid);

		status = NVME_SC_INVALID_NS | NVME_SC_DNR;

		goto out;

	}
@@ -500,6 +502,7 @@ static void nvmet_execute_identify_desclist(struct nvmet_req *req) 


	ns = nvmet_find_namespace(req->sq->ctrl, req->cmd->identify.nsid);

	if (!ns) {

		req->error_loc = offsetof(struct nvme_identify, nsid);

		status = NVME_SC_INVALID_NS | NVME_SC_DNR;

		goto out;

	}
@@ -562,8 +565,10 @@ static u16 nvmet_set_feat_write_protect(struct nvmet_req *req) 
	u16 status = NVME_SC_FEATURE_NOT_CHANGEABLE;



	req->ns = nvmet_find_namespace(req->sq->ctrl, req->cmd->rw.nsid);

	if (unlikely(!req->ns))

	if (unlikely(!req->ns)) {

		req->error_loc = offsetof(struct nvme_common_command, nsid);

		return status;

	}



	mutex_lock(&subsys->lock);

	switch (write_protect) {
@@ -602,8 +607,10 @@ u16 nvmet_set_feat_async_event(struct nvmet_req *req, u32 mask) 
{

	u32 val32 = le32_to_cpu(req->cmd->common.cdw11);



	if (val32 & ~mask)

	if (val32 & ~mask) {

		req->error_loc = offsetof(struct nvme_common_command, cdw11);

		return NVME_SC_INVALID_FIELD | NVME_SC_DNR;

	}



	WRITE_ONCE(req->sq->ctrl->aen_enabled, val32);

	nvmet_set_result(req, val32);
@@ -635,6 +642,7 @@ static void nvmet_execute_set_features(struct nvmet_req *req) 
		status = nvmet_set_feat_write_protect(req);

		break;

	default:

		req->error_loc = offsetof(struct nvme_common_command, cdw10);

		status = NVME_SC_INVALID_FIELD | NVME_SC_DNR;

		break;

	}
@@ -648,9 +656,10 @@ static u16 nvmet_get_feat_write_protect(struct nvmet_req *req) 
	u32 result;



	req->ns = nvmet_find_namespace(req->sq->ctrl, req->cmd->common.nsid);

	if (!req->ns)

	if (!req->ns)  {

		req->error_loc = offsetof(struct nvme_common_command, nsid);

		return NVME_SC_INVALID_NS | NVME_SC_DNR;



	}

	mutex_lock(&subsys->lock);

	if (req->ns->readonly == true)

		result = NVME_NS_WRITE_PROTECT;
@@ -716,6 +725,8 @@ static void nvmet_execute_get_features(struct nvmet_req *req) 
	case NVME_FEAT_HOST_ID:

		/* need 128-bit host identifier flag */

		if (!(req->cmd->common.cdw11 & cpu_to_le32(1 << 0))) {

			req->error_loc =

				offsetof(struct nvme_common_command, cdw11);

			status = NVME_SC_INVALID_FIELD | NVME_SC_DNR;

			break;

		}
@@ -727,6 +738,8 @@ static void nvmet_execute_get_features(struct nvmet_req *req) 
		status = nvmet_get_feat_write_protect(req);

		break;

	default:

		req->error_loc =

			offsetof(struct nvme_common_command, cdw10);

		status = NVME_SC_INVALID_FIELD | NVME_SC_DNR;

		break;

	}
@@ -848,5 +861,6 @@ u16 nvmet_parse_admin_cmd(struct nvmet_req *req) 


	pr_err("unhandled cmd %d on qid %d\n", cmd->common.opcode,

	       req->sq->qid);

	req->error_loc = offsetof(struct nvme_common_command, opcode);

	return NVME_SC_INVALID_OPCODE | NVME_SC_DNR;

}