From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D70A9C31E45 for ; Thu, 13 Jun 2019 16:03:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A263C20665 for ; Thu, 13 Jun 2019 16:03:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560441828; bh=3E7zvyKMEjD+t36Er0289E2wlAmli+NDn+SyiAea6Xg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=U3JSJ3moyZyU+5oSpRarDZzGBp4ITj/4lLeMXM9HSHZIudwSHMnLs1lCLu9wLj7uQ OU4Hr48vISnkcWMyufuHL9WuwvrC1MwHkyZHOecEsHQF6VcQjBkzKHOH+kSqRzBKs0 Y+OWdB7cd6tc5Jt8M/MOqZgd72R77AH/ByB4bcEQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391055AbfFMQDR (ORCPT ); Thu, 13 Jun 2019 12:03:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:35698 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731384AbfFMIr1 (ORCPT ); Thu, 13 Jun 2019 04:47:27 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3AB472147A; Thu, 13 Jun 2019 08:47:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560415646; bh=3E7zvyKMEjD+t36Er0289E2wlAmli+NDn+SyiAea6Xg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HwOTAI5gbf9t8Anhy57M4YTimFM0FYz4vrJ6svCZtZaXp1WOqYWRujXQWDhvPOEuv fnUh/FpLvdrgwF3mXe4g4nSbr8dtTUNUnSo+azC2Rtdl2zUwHgSqy4DBxstyoI0ano 5nZxPhqt600YmWg66wBZwny7JWJ7EvKid9m68Yg8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yufen Yu , Keith Busch , Christoph Hellwig , Sasha Levin Subject: [PATCH 5.1 076/155] nvme-pci: shutdown on timeout during deletion Date: Thu, 13 Jun 2019 10:33:08 +0200 Message-Id: <20190613075657.247721523@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190613075652.691765927@linuxfoundation.org> References: <20190613075652.691765927@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 9dc1a38ef1925d23c2933c5867df816386d92ff8 ] We do not restart a controller in a deleting state for timeout errors. When in this state, unblock potential request dispatchers with failed completions by shutting down the controller on timeout detection. Reported-by: Yufen Yu Signed-off-by: Keith Busch Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/host/pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index e5dcc769ab8f..372d3f4a106a 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1271,6 +1271,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) struct nvme_dev *dev = nvmeq->dev; struct request *abort_req; struct nvme_command cmd; + bool shutdown = false; u32 csts = readl(dev->bar + NVME_REG_CSTS); /* If PCI error recovery process is happening, we cannot reset or @@ -1307,12 +1308,14 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) * shutdown, so we return BLK_EH_DONE. */ switch (dev->ctrl.state) { + case NVME_CTRL_DELETING: + shutdown = true; case NVME_CTRL_CONNECTING: case NVME_CTRL_RESETTING: dev_warn_ratelimited(dev->ctrl.device, "I/O %d QID %d timeout, disable controller\n", req->tag, nvmeq->qid); - nvme_dev_disable(dev, false); + nvme_dev_disable(dev, shutdown); nvme_req(req)->flags |= NVME_REQ_CANCELLED; return BLK_EH_DONE; default: -- 2.20.1