Commit 31a59782 authored by min15.li's avatar min15.li Committed by Keith Busch
Browse files

nvme: fix miss command type check 



In the function nvme_passthru_end(), only the value of the command
opcode is checked, without checking the command type (IO command or
Admin command). When we send a Dataset Management command (The opcode
of the Dataset Management command is the same as the Set Feature
command), kernel thinks it is a set feature command, then sets the
controller's keep alive interval, and calls nvme_keep_alive_work().

Signed-off-by: default avatarmin15.li <min15.li@samsung.com>
Reviewed-by: default avatarKanchan Joshi <joshi.k@samsung.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent a3a9d63d

drivers/nvme/host/core.c

+3 −1
Original line number Diff line number Diff line
@@ -1115,7 +1115,7 @@ u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns, u8 opcode) 
}

EXPORT_SYMBOL_NS_GPL(nvme_passthru_start, NVME_TARGET_PASSTHRU);



void nvme_passthru_end(struct nvme_ctrl *ctrl, u32 effects,

void nvme_passthru_end(struct nvme_ctrl *ctrl, struct nvme_ns *ns, u32 effects,

		       struct nvme_command *cmd, int status)

{

	if (effects & NVME_CMD_EFFECTS_CSE_MASK) {
@@ -1132,6 +1132,8 @@ void nvme_passthru_end(struct nvme_ctrl *ctrl, u32 effects, 
		nvme_queue_scan(ctrl);

		flush_work(&ctrl->scan_work);

	}

	if (ns)

		return;



	switch (cmd->common.opcode) {

	case nvme_admin_set_features:

drivers/nvme/host/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static int nvme_submit_user_cmd(struct request_queue *q, 
	blk_mq_free_request(req);



	if (effects)

		nvme_passthru_end(ctrl, effects, cmd, ret);

		nvme_passthru_end(ctrl, ns, effects, cmd, ret);



	return ret;

}

drivers/nvme/host/nvme.h

+1 −1
Original line number Diff line number Diff line
@@ -1077,7 +1077,7 @@ u32 nvme_command_effects(struct nvme_ctrl *ctrl, struct nvme_ns *ns, 
			 u8 opcode);

u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns, u8 opcode);

int nvme_execute_rq(struct request *rq, bool at_head);

void nvme_passthru_end(struct nvme_ctrl *ctrl, u32 effects,

void nvme_passthru_end(struct nvme_ctrl *ctrl, struct nvme_ns *ns, u32 effects,

		       struct nvme_command *cmd, int status);

struct nvme_ctrl *nvme_ctrl_from_file(struct file *file);

struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl, unsigned nsid);

drivers/nvme/target/passthru.c

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static void nvmet_passthru_execute_cmd_work(struct work_struct *w) 
	blk_mq_free_request(rq);



	if (effects)

		nvme_passthru_end(ctrl, effects, req->cmd, status);

		nvme_passthru_end(ctrl, ns, effects, req->cmd, status);

}



static enum rq_end_io_ret nvmet_passthru_req_done(struct request *rq,