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=ham 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 46698C31E49 for ; Thu, 13 Jun 2019 16:17:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 14806208CA for ; Thu, 13 Jun 2019 16:17:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560442621; bh=+fBCc4T2sa2o2oZwGHz5Caw3GFcd0By+aiDsHNq+esM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sa7kkR9aLqs/N0Nv0D9cTe2EL5Fk/sf1ZQKvhy06jaa/kPeNuNktjR42/cm7phwtE 2hRiGBAGmhXAnLv+s/k1SJkzKBaJ+zT53f2DnlSZMBYKDNyfv7lnKtwX/1mG+6o4uY G1Aic98Hl8iAJ3TJbcH86+YbiWb5KLLVeBDLixo8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391991AbfFMQRA (ORCPT ); Thu, 13 Jun 2019 12:17:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:58266 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731136AbfFMIkz (ORCPT ); Thu, 13 Jun 2019 04:40:55 -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 C6B7821479; Thu, 13 Jun 2019 08:40:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560415255; bh=+fBCc4T2sa2o2oZwGHz5Caw3GFcd0By+aiDsHNq+esM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tybY7xmXlPALpNWuyF7RR9JClj3CF7VQ8ww05CRy+SH53aHksU5YxBLPdN1TeMmfU 8TJzQbebd4q2WANZ+kWO9U0KveXGzt9dbyPCRX4YkEVLogr6gI+G4nVSKLutTIojh8 8Sm/zsvxc8P7Jlkj84Mj5UOfo968lJlwD/g48itI= 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 4.19 059/118] nvme-pci: unquiesce admin queue on shutdown Date: Thu, 13 Jun 2019 10:33:17 +0200 Message-Id: <20190613075647.242796357@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190613075643.642092651@linuxfoundation.org> References: <20190613075643.642092651@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 c8e9e9b7646ebe1c5066ddc420d7630876277eb4 ] Just like IO queues, the admin queue also will not be restarted after a controller shutdown. Unquiesce this queue so that we do not block request dispatch on a permanently disabled controller. 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 7b9ef8e734e7..377f6fff420d 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2187,8 +2187,11 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown) * must flush all entered requests to their failed completion to avoid * deadlocking blk-mq hot-cpu notifier. */ - if (shutdown) + if (shutdown) { nvme_start_queues(&dev->ctrl); + if (dev->ctrl.admin_q && !blk_queue_dying(dev->ctrl.admin_q)) + blk_mq_unquiesce_queue(dev->ctrl.admin_q); + } mutex_unlock(&dev->shutdown_lock); } -- 2.20.1