nvme: fix miss command type check
Subsystems (2)
PATCH 1/1 nvme: fix miss command type check
From: "min15.li" <[email protected]>
commit 31a5978243d24d77be4bacca56c78a0fbc43b00d upstream.
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 min15.li <[email protected]>
Reviewed-by Kanchan Joshi <[email protected]>
Reviewed-by Christoph Hellwig <[email protected]>
Signed-off-by Keith Busch <[email protected]>
Fixes b58da2d270db ("nvme: update keep alive interval when kato is modified")
Signed-off-by Tokunori Ikegami <[email protected]>
--- drivers/nvme/host/core.c | 4 +++- drivers/nvme/host/ioctl.c | 3 ++- drivers/nvme/host/nvme.h | 2 +- drivers/nvme/target/passthru.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-)
drivers/nvme/host/core.c +3 -1
@@ -1151,7 +1151,7 @@ static u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns,return effects; } -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 ) {
@@ -1167,6 +1167,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 +2 -1
@@ -147,6 +147,7 @@ static int nvme_submit_user_cmd(struct request_queue *q, unsigned bufflen, void __user *meta_buffer, unsigned meta_len, u32 meta_seed, u64 *result, unsigned timeout, bool vec) { + struct nvme_ns *ns = q->queuedata;struct nvme_ctrl *ctrl;struct request *req;void *meta =NULL ;
@@ -181,7 +182,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
@@ -1063,7 +1063,7 @@ static inline void nvme_auth_free(struct nvme_ctrl *ctrl) {};u32 nvme_command_effects (struct nvme_ctrl *ctrl,struct nvme_ns *ns,u8 opcode);int nvme_execute_passthru_rq (struct request *rq,u32 *effects); -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 +2 -1
@@ -216,6 +216,7 @@ static void nvmet_passthru_execute_cmd_work(struct work_struct *w) struct nvmet_req *req = container_of(w, struct nvmet_req, p.work);struct request *rq = req->p.rq;struct nvme_ctrl *ctrl =nvme_req (rq)->ctrl; +struct nvme_ns *ns = rq->q->queuedata;u32 effects;int status;
@@ -242,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,
Signature · 1 line
2.40.1