From patchwork Tue Sep 19 03:49:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 9958123 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 1717E6056A for ; Tue, 19 Sep 2017 03:50:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE02D28A42 for ; Tue, 19 Sep 2017 03:50:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C21EF28D61; Tue, 19 Sep 2017 03:50:32 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable 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 5F83E28A42 for ; Tue, 19 Sep 2017 03:50:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751309AbdISDub (ORCPT ); Mon, 18 Sep 2017 23:50:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52682 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751100AbdISDua (ORCPT ); Mon, 18 Sep 2017 23:50:30 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BA1004ACA4; Tue, 19 Sep 2017 03:50:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com BA1004ACA4 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=ming.lei@redhat.com Received: from localhost (ovpn-12-132.pek2.redhat.com [10.72.12.132]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0DBCD60475; Tue, 19 Sep 2017 03:50:22 +0000 (UTC) From: Ming Lei To: Jens Axboe , linux-block@vger.kernel.org, Christoph Hellwig , linux-scsi@vger.kernel.org, "Martin K . Petersen" , "James E . J . Bottomley" Cc: Bart Van Assche , Oleksandr Natalenko , Johannes Thumshirn , Cathy Avery , Ming Lei Subject: [PATCH V5 04/10] blk-mq: rename blk_mq_freeze_queue_wait as blk_freeze_queue_wait Date: Tue, 19 Sep 2017 11:49:19 +0800 Message-Id: <20170919034925.9894-5-ming.lei@redhat.com> In-Reply-To: <20170919034925.9894-1-ming.lei@redhat.com> References: <20170919034925.9894-1-ming.lei@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 19 Sep 2017 03:50:30 +0000 (UTC) Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The only change on legacy is that blk_drain_queue() is run from blk_freeze_queue(), which is called in blk_cleanup_queue(). So this patch removes the explicit call of __blk_drain_queue() in blk_cleanup_queue(). Tested-by: Cathy Avery Tested-by: Oleksandr Natalenko Signed-off-by: Ming Lei --- block/blk-core.c | 17 +++++++++++++++-- block/blk-mq.c | 8 +++++--- block/blk.h | 1 + drivers/nvme/host/core.c | 2 +- include/linux/blk-mq.h | 2 +- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index abfba798ee03..97837a5bf838 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -530,6 +530,21 @@ static void __blk_drain_queue(struct request_queue *q, bool drain_all) } /** + * blk_drain_queue - drain requests from request_queue + * @q: queue to drain + * + * Drain requests from @q. All pending requests are drained. + * The caller is responsible for ensuring that no new requests + * which need to be drained are queued. + */ +void blk_drain_queue(struct request_queue *q) +{ + spin_lock_irq(q->queue_lock); + __blk_drain_queue(q, true); + spin_unlock_irq(q->queue_lock); +} + +/** * blk_queue_bypass_start - enter queue bypass mode * @q: queue of interest * @@ -659,8 +674,6 @@ void blk_cleanup_queue(struct request_queue *q) */ blk_freeze_queue(q); spin_lock_irq(lock); - if (!q->mq_ops) - __blk_drain_queue(q, true); queue_flag_set(QUEUE_FLAG_DEAD, q); spin_unlock_irq(lock); diff --git a/block/blk-mq.c b/block/blk-mq.c index 1acebbd1fbd4..1e9bf2b987a1 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -131,11 +131,13 @@ void blk_freeze_queue_start(struct request_queue *q) } EXPORT_SYMBOL_GPL(blk_freeze_queue_start); -void blk_mq_freeze_queue_wait(struct request_queue *q) +void blk_freeze_queue_wait(struct request_queue *q) { + if (!q->mq_ops) + blk_drain_queue(q); wait_event(q->mq_freeze_wq, percpu_ref_is_zero(&q->q_usage_counter)); } -EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_wait); +EXPORT_SYMBOL_GPL(blk_freeze_queue_wait); int blk_mq_freeze_queue_wait_timeout(struct request_queue *q, unsigned long timeout) @@ -160,7 +162,7 @@ void blk_freeze_queue(struct request_queue *q) * exported to drivers as the only user for unfreeze is blk_mq. */ blk_freeze_queue_start(q); - blk_mq_freeze_queue_wait(q); + blk_freeze_queue_wait(q); } EXPORT_SYMBOL_GPL(blk_freeze_queue); diff --git a/block/blk.h b/block/blk.h index fcb9775b997d..21eed59d96db 100644 --- a/block/blk.h +++ b/block/blk.h @@ -64,6 +64,7 @@ void blk_rq_bio_prep(struct request_queue *q, struct request *rq, struct bio *bio); void blk_queue_bypass_start(struct request_queue *q); void blk_queue_bypass_end(struct request_queue *q); +void blk_drain_queue(struct request_queue *q); void __blk_queue_free_tags(struct request_queue *q); void blk_freeze_queue(struct request_queue *q); diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index a0075d40cfef..b2dc14882ee8 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2907,7 +2907,7 @@ void nvme_wait_freeze(struct nvme_ctrl *ctrl) mutex_lock(&ctrl->namespaces_mutex); list_for_each_entry(ns, &ctrl->namespaces, list) - blk_mq_freeze_queue_wait(ns->queue); + blk_freeze_queue_wait(ns->queue); mutex_unlock(&ctrl->namespaces_mutex); } EXPORT_SYMBOL_GPL(nvme_wait_freeze); diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 355d74507656..62c3d1f7d12a 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -256,7 +256,7 @@ void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset, void blk_freeze_queue(struct request_queue *q); void blk_unfreeze_queue(struct request_queue *q); void blk_freeze_queue_start(struct request_queue *q); -void blk_mq_freeze_queue_wait(struct request_queue *q); +void blk_freeze_queue_wait(struct request_queue *q); int blk_mq_freeze_queue_wait_timeout(struct request_queue *q, unsigned long timeout); int blk_mq_reinit_tagset(struct blk_mq_tag_set *set,