nvmet: Introduce common execute function for get_log_page and identify (2cb6963a) · Commits · 戴 / test

drivers/nvme/target/admin-cmd.c

+50 −43

Original line number	Diff line number	Diff line
		@@ -282,6 +282,33 @@ out:
		nvmet_req_complete(req, status);
		}

		static void nvmet_execute_get_log_page(struct nvmet_req *req)
		{
		switch (req->cmd->get_log_page.lid) {
		case NVME_LOG_ERROR:
		return nvmet_execute_get_log_page_error(req);
		case NVME_LOG_SMART:
		return nvmet_execute_get_log_page_smart(req);
		case NVME_LOG_FW_SLOT:
		/*
		* We only support a single firmware slot which always is
		* active, so we can zero out the whole firmware slot log and
		* still claim to fully implement this mandatory log page.
		*/
		return nvmet_execute_get_log_page_noop(req);
		case NVME_LOG_CHANGED_NS:
		return nvmet_execute_get_log_changed_ns(req);
		case NVME_LOG_CMD_EFFECTS:
		return nvmet_execute_get_log_cmd_effects_ns(req);
		case NVME_LOG_ANA:
		return nvmet_execute_get_log_page_ana(req);
		}
		pr_err("unhandled lid %d on qid %d\n",
		req->cmd->get_log_page.lid, req->sq->qid);
		req->error_loc = offsetof(struct nvme_get_log_page_command, lid);
		nvmet_req_complete(req, NVME_SC_INVALID_FIELD \| NVME_SC_DNR);
		}

		static void nvmet_execute_identify_ctrl(struct nvmet_req *req)
		{
		struct nvmet_ctrl *ctrl = req->sq->ctrl;
		@@ -565,6 +592,25 @@ out:
		nvmet_req_complete(req, status);
		}

		static void nvmet_execute_identify(struct nvmet_req *req)
		{
		switch (req->cmd->identify.cns) {
		case NVME_ID_CNS_NS:
		return nvmet_execute_identify_ns(req);
		case NVME_ID_CNS_CTRL:
		return nvmet_execute_identify_ctrl(req);
		case NVME_ID_CNS_NS_ACTIVE_LIST:
		return nvmet_execute_identify_nslist(req);
		case NVME_ID_CNS_NS_DESC_LIST:
		return nvmet_execute_identify_desclist(req);
		}

		pr_err("unhandled identify cns %d on qid %d\n",
		req->cmd->identify.cns, req->sq->qid);
		req->error_loc = offsetof(struct nvme_identify, cns);
		nvmet_req_complete(req, NVME_SC_INVALID_FIELD \| NVME_SC_DNR);
		}

		/*
		* A "minimum viable" abort implementation: the command is mandatory in the
		* spec, but we are not required to do any useful work. We couldn't really
		@@ -819,52 +865,13 @@ u16 nvmet_parse_admin_cmd(struct nvmet_req *req)

		switch (cmd->common.opcode) {
		case nvme_admin_get_log_page:
		req->execute = nvmet_execute_get_log_page;
		req->data_len = nvmet_get_log_page_len(cmd);

		switch (cmd->get_log_page.lid) {
		case NVME_LOG_ERROR:
		req->execute = nvmet_execute_get_log_page_error;
		return 0;
		case NVME_LOG_SMART:
		req->execute = nvmet_execute_get_log_page_smart;
		return 0;
		case NVME_LOG_FW_SLOT:
		/*
		* We only support a single firmware slot which always
		* is active, so we can zero out the whole firmware slot
		* log and still claim to fully implement this mandatory
		* log page.
		*/
		req->execute = nvmet_execute_get_log_page_noop;
		return 0;
		case NVME_LOG_CHANGED_NS:
		req->execute = nvmet_execute_get_log_changed_ns;
		return 0;
		case NVME_LOG_CMD_EFFECTS:
		req->execute = nvmet_execute_get_log_cmd_effects_ns;
		return 0;
		case NVME_LOG_ANA:
		req->execute = nvmet_execute_get_log_page_ana;
		return 0;
		}
		break;
		case nvme_admin_identify:
		req->execute = nvmet_execute_identify;
		req->data_len = NVME_IDENTIFY_DATA_SIZE;
		switch (cmd->identify.cns) {
		case NVME_ID_CNS_NS:
		req->execute = nvmet_execute_identify_ns;
		return 0;
		case NVME_ID_CNS_CTRL:
		req->execute = nvmet_execute_identify_ctrl;
		return 0;
		case NVME_ID_CNS_NS_ACTIVE_LIST:
		req->execute = nvmet_execute_identify_nslist;
		return 0;
		case NVME_ID_CNS_NS_DESC_LIST:
		req->execute = nvmet_execute_identify_desclist;
		return 0;
		}
		break;
		case nvme_admin_abort_cmd:
		req->execute = nvmet_execute_abort;
		req->data_len = 0;

Admin message