From patchwork Wed Jul 5 06:53:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sagi Grimberg X-Patchwork-Id: 9825921 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C83CF602F0 for ; Wed, 5 Jul 2017 06:54:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1C54262FF for ; Wed, 5 Jul 2017 06:54:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B69C326E16; Wed, 5 Jul 2017 06:54:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, URIBL_BLACK autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6370F262FF for ; Wed, 5 Jul 2017 06:54:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752427AbdGEGy2 (ORCPT ); Wed, 5 Jul 2017 02:54:28 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:57010 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752418AbdGEGy1 (ORCPT ); Wed, 5 Jul 2017 02:54:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=mVEexjuKacoyfOilrLvuddXSYVDx8n4xlDp1DbQ8SI0=; b=UdR/KgShqT2B7A9TFfSYGZA5s Yt/WAHU5WlBYaANMzlwJ3R8STOaF6YkrDqnhKOlUbrmECzjaQ0qMGwY117aNaMGKxOkepADMaWpsT 5jg4CH/Z8inF/gYbrNEPxi0nyvRuuswFSHdvoVkIcTND6oadUviWPAMprQHtXBphVWVCaMom6LxVz wZY8v4WWkg2VFsD/MBVFXavjXdATXTHWV6ylaAAwUsTaUxndzgcHoHzhWxyIstxNK/qytwa+AZEHQ DkTabsBoZhlW1ZbkG0wSyfwjnGi5E1qk4YV86vXg9QZVG74UK4NuQ3r5pKVXhXwELqXI0Yw/m8+La B1oQUSOag==; Received: from bzq-82-81-101-184.red.bezeqint.net ([82.81.101.184] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dSeCe-0008IF-G9; Wed, 05 Jul 2017 06:54:26 +0000 From: Sagi Grimberg To: Jens Axboe , linux-block@vger.kernel.org Cc: linux-nvme@lists.infradead.org, Christoph Hellwig , Keith Busch , Ming Lei Subject: [PATCH v2 4/8] nvme-pci: quiesce/unquiesce admin_q instead of start/stop its hw queues Date: Wed, 5 Jul 2017 09:53:07 +0300 Message-Id: <1499237591-15861-5-git-send-email-sagi@grimberg.me> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1499237591-15861-1-git-send-email-sagi@grimberg.me> References: <1499237591-15861-1-git-send-email-sagi@grimberg.me> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP unlike blk_mq_stop_hw_queues and blk_mq_start_stopped_hw_queues quiescing/unquiescing respects the submission path rcu grace. Signed-off-by: Sagi Grimberg --- drivers/nvme/host/pci.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index eb729ff70e7d..df7c8a355075 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1125,7 +1125,7 @@ static int nvme_suspend_queue(struct nvme_queue *nvmeq) spin_unlock_irq(&nvmeq->q_lock); if (!nvmeq->qid && nvmeq->dev->ctrl.admin_q) - blk_mq_stop_hw_queues(nvmeq->dev->ctrl.admin_q); + blk_mq_quiesce_queue(nvmeq->dev->ctrl.admin_q); pci_free_irq(to_pci_dev(nvmeq->dev->dev), vector, nvmeq); @@ -1315,7 +1315,7 @@ static void nvme_dev_remove_admin(struct nvme_dev *dev) * user requests may be waiting on a stopped queue. Start the * queue to flush these to completion. */ - blk_mq_start_stopped_hw_queues(dev->ctrl.admin_q, true); + blk_mq_unquiesce_queue(dev->ctrl.admin_q); blk_cleanup_queue(dev->ctrl.admin_q); blk_mq_free_tag_set(&dev->admin_tagset); } @@ -1351,8 +1351,10 @@ static int nvme_alloc_admin_tags(struct nvme_dev *dev) dev->ctrl.admin_q = NULL; return -ENODEV; } - } else - blk_mq_start_stopped_hw_queues(dev->ctrl.admin_q, true); + } else { + blk_mq_unquiesce_queue(dev->ctrl.admin_q); + blk_mq_kick_requeue_list(dev->ctrl.admin_q); + } return 0; }