From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f42.google.com ([209.85.221.42]:39287 "EHLO mail-wr1-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728641AbeKLGRS (ORCPT ); Mon, 12 Nov 2018 01:17:18 -0500 Received: by mail-wr1-f42.google.com with SMTP id b13so7107678wrx.6 for ; Sun, 11 Nov 2018 12:27:47 -0800 (PST) Date: Sun, 11 Nov 2018 20:27:43 +0000 From: Sudip Mukherjee To: Greg Kroah-Hartman Cc: stable@vger.kernel.org, Ming Lei , Christoph Hellwig , Keith Busch Subject: request for 4.14-stable: 11d9ea6f2ca6 ("nvme-loop: fix kernel oops in case of unhandled command") Message-ID: <20181111202743.j2eflv75gqco6bdx@debian> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="ty3mex32c3kfvrxp" Content-Disposition: inline Sender: stable-owner@vger.kernel.org List-ID: --ty3mex32c3kfvrxp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --ty3mex32c3kfvrxp Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-nvme-loop-fix-kernel-oops-in-case-of-unhandled-comma.patch" >>From 214e946aaf94cfbb14ffdc7b646e82e8f8bfb35b Mon Sep 17 00:00:00 2001 From: Ming Lei 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 Reviewed-by: Christoph Hellwig [trimmed changelog] Signed-off-by: Keith Busch Signed-off-by: Jens Axboe Signed-off-by: Sudip Mukherjee --- 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 --ty3mex32c3kfvrxp--