* request for 4.14-stable: 11d9ea6f2ca6 ("nvme-loop: fix kernel oops in case of unhandled command")
@ 2018-11-11 20:27 Sudip Mukherjee
2018-11-19 15:18 ` Greg Kroah-Hartman
0 siblings, 1 reply; 2+ messages in thread
From: Sudip Mukherjee @ 2018-11-11 20:27 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: stable, Ming Lei, Christoph Hellwig, Keith Busch
[-- Attachment #1: Type: text/plain, Size: 136 bytes --]
Hi Greg,
This was not marked for stable but seems it should be in stable.
Please apply to your queue of 4.14-stable.
--
Regards
Sudip
[-- Attachment #2: 0001-nvme-loop-fix-kernel-oops-in-case-of-unhandled-comma.patch --]
[-- Type: text/x-diff, Size: 2148 bytes --]
>From 214e946aaf94cfbb14ffdc7b646e82e8f8bfb35b Mon Sep 17 00:00:00 2001
From: Ming Lei <ming.lei@redhat.com>
Date: Thu, 12 Apr 2018 09:16:04 -0600
Subject: [PATCH] nvme-loop: fix kernel oops in case of unhandled command
commit 11d9ea6f2ca69237d35d6c55755beba3e006b106 upstream
When nvmet_req_init() fails, __nvmet_req_complete() is called
to handle the target request via .queue_response(), so
nvme_loop_queue_response() shouldn't be called again for
handling the failure.
This patch fixes this case by the following way:
- move blk_mq_start_request() before nvmet_req_init(), so
nvme_loop_queue_response() may work well to complete this
host request
- don't call nvme_cleanup_cmd() which is done in nvme_loop_complete_rq()
- don't call nvme_loop_queue_response() which is done via
.queue_response()
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
[trimmed changelog]
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
---
drivers/nvme/target/loop.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c
index 02aff5cc48bf..3388d2788fe0 100644
--- a/drivers/nvme/target/loop.c
+++ b/drivers/nvme/target/loop.c
@@ -183,15 +183,12 @@ static blk_status_t nvme_loop_queue_rq(struct blk_mq_hw_ctx *hctx,
if (ret)
return ret;
+ blk_mq_start_request(req);
iod->cmd.common.flags |= NVME_CMD_SGL_METABUF;
iod->req.port = nvmet_loop_port;
if (!nvmet_req_init(&iod->req, &queue->nvme_cq,
- &queue->nvme_sq, &nvme_loop_ops)) {
- nvme_cleanup_cmd(req);
- blk_mq_start_request(req);
- nvme_loop_queue_response(&iod->req);
+ &queue->nvme_sq, &nvme_loop_ops))
return BLK_STS_OK;
- }
if (blk_rq_bytes(req)) {
iod->sg_table.sgl = iod->first_sgl;
@@ -204,8 +201,6 @@ static blk_status_t nvme_loop_queue_rq(struct blk_mq_hw_ctx *hctx,
iod->req.sg_cnt = blk_rq_map_sg(req->q, req, iod->sg_table.sgl);
}
- blk_mq_start_request(req);
-
schedule_work(&iod->work);
return BLK_STS_OK;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: request for 4.14-stable: 11d9ea6f2ca6 ("nvme-loop: fix kernel oops in case of unhandled command")
2018-11-11 20:27 request for 4.14-stable: 11d9ea6f2ca6 ("nvme-loop: fix kernel oops in case of unhandled command") Sudip Mukherjee
@ 2018-11-19 15:18 ` Greg Kroah-Hartman
0 siblings, 0 replies; 2+ messages in thread
From: Greg Kroah-Hartman @ 2018-11-19 15:18 UTC (permalink / raw)
To: Sudip Mukherjee; +Cc: stable, Ming Lei, Christoph Hellwig, Keith Busch
On Sun, Nov 11, 2018 at 08:27:43PM +0000, Sudip Mukherjee wrote:
> Hi Greg,
>
> This was not marked for stable but seems it should be in stable.
> Please apply to your queue of 4.14-stable.
Now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-20 1:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-11 20:27 request for 4.14-stable: 11d9ea6f2ca6 ("nvme-loop: fix kernel oops in case of unhandled command") Sudip Mukherjee
2018-11-19 15:18 ` Greg Kroah-Hartman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.