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.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 CCC22C43441 for ; Wed, 21 Nov 2018 16:24:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9669B21479 for ; Wed, 21 Nov 2018 16:24:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="G/j1RHTv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9669B21479 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-block-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731720AbeKVC7Z (ORCPT ); Wed, 21 Nov 2018 21:59:25 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:37484 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730375AbeKVC7Z (ORCPT ); Wed, 21 Nov 2018 21:59:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type: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=wrU72pwaZrETvvaZrm+CvBu2+OHTFfSWCHBU0BmvwSQ=; b=G/j1RHTvSDz5Va11FCXN4ph3Ib +RKo9Ni/3+SI0Y8RIYal0SyghXOoADOX/LR274Ko72bVlaQ4P8IcPZZqCmxnzZWfuxgStD3maB/Vb DyIZKf46jeHPr9DMmCUZj5CMOCidMu9QyR4wFMhv9/H54OxPjOoKVX4Arz1H0QpsR86QY9J74EoZQ vqgjeayhIccwsRNr2L66IklMccrWIvScvs3D1pQdrtcUIerFZHULZIdWNJSjbtuD38nXTkUz9E0sU LuEt7ndk3hzCygdOMDjict+Q/JgMZFBSg/lWEnp+xGnI3fc//MZAmALkNRaOq/FoX//t9novDkjpn HEi0c+mA==; Received: from 089144201193.atnat0010.highway.a1.net ([89.144.201.193] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPVIP-00038o-Kb; Wed, 21 Nov 2018 16:24:10 +0000 From: Christoph Hellwig To: Jens Axboe , Keith Busch , Sagi Grimberg Cc: Max Gurtovoy , linux-nvme@lists.infradead.org, linux-block@vger.kernel.org Subject: [PATCH 07/13] nvme-pci: don't poll from irq context when deleting queues Date: Wed, 21 Nov 2018 17:23:41 +0100 Message-Id: <20181121162347.17430-8-hch@lst.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181121162347.17430-1-hch@lst.de> References: <20181121162347.17430-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org This is the last place outside of nvme_irq that handles CQEs from interrupt context, and thus is in the way of removing the cq_lock for normal queues, and avoiding lockdep warnings on the poll queues, for which we already take it without IRQ disabling. Signed-off-by: Christoph Hellwig --- drivers/nvme/host/pci.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 29072ad0a268..ef10279f4e58 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -202,6 +202,7 @@ struct nvme_queue { unsigned long flags; #define NVMEQ_ENABLED 0 #define NVMEQ_SQ_CMB 1 +#define NVMEQ_DELETE_ERROR 2 u32 *dbbuf_sq_db; u32 *dbbuf_cq_db; u32 *dbbuf_sq_ei; @@ -2185,7 +2186,7 @@ static void nvme_del_cq_end(struct request *req, blk_status_t error) struct nvme_queue *nvmeq = req->end_io_data; if (!error) - nvme_poll_irqdisable(nvmeq, -1); + set_bit(NVMEQ_DELETE_ERROR, &nvmeq->flags); nvme_del_queue_end(req, error); } @@ -2227,11 +2228,20 @@ static bool nvme_disable_io_queues(struct nvme_dev *dev, u8 opcode) nr_queues--; sent++; } - while (sent--) { + while (sent) { + struct nvme_queue *nvmeq = &dev->queues[nr_queues + sent]; + timeout = wait_for_completion_io_timeout(&dev->ioq_wait, timeout); if (timeout == 0) return false; + + /* handle any remaining CQEs */ + if (opcode == nvme_admin_delete_cq && + !test_bit(NVMEQ_DELETE_ERROR, &nvmeq->flags)) + nvme_poll_irqdisable(nvmeq, -1); + + sent--; if (nr_queues) goto retry; } -- 2.19.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: hch@lst.de (Christoph Hellwig) Date: Wed, 21 Nov 2018 17:23:41 +0100 Subject: [PATCH 07/13] nvme-pci: don't poll from irq context when deleting queues In-Reply-To: <20181121162347.17430-1-hch@lst.de> References: <20181121162347.17430-1-hch@lst.de> Message-ID: <20181121162347.17430-8-hch@lst.de> This is the last place outside of nvme_irq that handles CQEs from interrupt context, and thus is in the way of removing the cq_lock for normal queues, and avoiding lockdep warnings on the poll queues, for which we already take it without IRQ disabling. Signed-off-by: Christoph Hellwig --- drivers/nvme/host/pci.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 29072ad0a268..ef10279f4e58 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -202,6 +202,7 @@ struct nvme_queue { unsigned long flags; #define NVMEQ_ENABLED 0 #define NVMEQ_SQ_CMB 1 +#define NVMEQ_DELETE_ERROR 2 u32 *dbbuf_sq_db; u32 *dbbuf_cq_db; u32 *dbbuf_sq_ei; @@ -2185,7 +2186,7 @@ static void nvme_del_cq_end(struct request *req, blk_status_t error) struct nvme_queue *nvmeq = req->end_io_data; if (!error) - nvme_poll_irqdisable(nvmeq, -1); + set_bit(NVMEQ_DELETE_ERROR, &nvmeq->flags); nvme_del_queue_end(req, error); } @@ -2227,11 +2228,20 @@ static bool nvme_disable_io_queues(struct nvme_dev *dev, u8 opcode) nr_queues--; sent++; } - while (sent--) { + while (sent) { + struct nvme_queue *nvmeq = &dev->queues[nr_queues + sent]; + timeout = wait_for_completion_io_timeout(&dev->ioq_wait, timeout); if (timeout == 0) return false; + + /* handle any remaining CQEs */ + if (opcode == nvme_admin_delete_cq && + !test_bit(NVMEQ_DELETE_ERROR, &nvmeq->flags)) + nvme_poll_irqdisable(nvmeq, -1); + + sent--; if (nr_queues) goto retry; } -- 2.19.1