From patchwork Fri Mar 24 12:36:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 9642783 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 8035560327 for ; Fri, 24 Mar 2017 12:36:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7AFD827F07 for ; Fri, 24 Mar 2017 12:36:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E4392823E; Fri, 24 Mar 2017 12:36:55 +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.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 EB41F27F07 for ; Fri, 24 Mar 2017 12:36:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934204AbdCXMgy (ORCPT ); Fri, 24 Mar 2017 08:36:54 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34798 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932434AbdCXMgw (ORCPT ); Fri, 24 Mar 2017 08:36:52 -0400 Received: by mail-pf0-f194.google.com with SMTP id o126so207017pfb.1 for ; Fri, 24 Mar 2017 05:36:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bPfFVXS6ewy+PmblO2PGmJc0U6Cg0RoALeJ08Itt4uA=; b=rKdQ31OZ2dMKcHb9CbvoduPFbK/VXeqAUoRH5JmMmGhGVt7NRtpBnhzpZTauOYgr+z 8jjlMjEpqg5TpUa3zznZPkSn1K8iv5vGsttVBGfrhhYzi8ryFw0PO6tmRKvNK56gfgIB +IosUupAMrLhY8VzouJWio+BDUTYsUt33yGx5a6sFapn2f1aF63WSQJvw7LCz7fMSn1o q7IOVEjcQ/HUZkuaEBXm5oQ51FqOJsJy0WKL5yY2u29M8xI1yN1/SHlKJeJsxhkWlqpi oDaZr0KOWAbmdTHkjOTEjC8a6/nKAHSuR7ernei7+Phuq6UoglqASz/XEpS4rwPHFkVV 4PiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bPfFVXS6ewy+PmblO2PGmJc0U6Cg0RoALeJ08Itt4uA=; b=RPorqAfF8gIawwoLnXu14qtvND4N7VwPZ7af0kZ619/+L7pilodxSkOCXEikw+mPZY FkBqIYMGz11oKjd/UUWHD1WXIMZBD4xixL1blc17H3HpGFj+EbFZ1KurQPI+MYGsIZnM bX9E4DSDmftNGmvTD5+IeskymX3P+DqLjdYKVuhgR6HYSsYNunC6EcHxDO7LEXjd9Y39 5Fgpz08yEp28ObmNkpLw75X5Zj6j33lY269uLTGUrxsg0eEfeBbX3f4mw/yJzV34/qOz Ucv6k18UXpEf5QOUShnlPj06gCMf5Rw9OBVLDAYDIef5whA5VUzlce6dKvjFkFeT80V2 pZWw== X-Gm-Message-State: AFeK/H0xugrgf+kOnVUpXsGfOD6q7Q47vkTtNKgApboJINkDND/c03U7MGzIfVIXFcZf4w== X-Received: by 10.99.94.198 with SMTP id s189mr8805443pgb.211.1490359011568; Fri, 24 Mar 2017 05:36:51 -0700 (PDT) Received: from localhost (li405-222.members.linode.com. [106.187.53.222]) by smtp.gmail.com with ESMTPSA id 23sm4611149pfz.127.2017.03.24.05.36.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 24 Mar 2017 05:36:50 -0700 (PDT) From: Ming Lei To: Jens Axboe , linux-block@vger.kernel.org, Christoph Hellwig Cc: Bart Van Assche , Hannes Reinecke , Ming Lei , Tejun Heo Subject: [PATCH v2 4/4] block: block new I/O just after queue is set as dying Date: Fri, 24 Mar 2017 20:36:21 +0800 Message-Id: <20170324123621.5227-5-tom.leiming@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170324123621.5227-1-tom.leiming@gmail.com> References: <20170324123621.5227-1-tom.leiming@gmail.com> 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 Before commit 780db2071a(blk-mq: decouble blk-mq freezing from generic bypassing), the dying flag is checked before entering queue, and Tejun converts the checking into .mq_freeze_depth, and assumes the counter is increased just after dying flag is set. Unfortunately we doesn't do that in blk_set_queue_dying(). This patch calls blk_freeze_queue_start() in blk_set_queue_dying(), so that we can block new I/O coming once the queue is set as dying. Given blk_set_queue_dying() is always called in remove path of block device, and queue will be cleaned up later, we don't need to worry about undoing the counter. Cc: Bart Van Assche Cc: Tejun Heo Reviewed-by: Hannes Reinecke Signed-off-by: Ming Lei --- block/blk-core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 5901133d105f..f0dd9b0054ed 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -500,6 +500,9 @@ void blk_set_queue_dying(struct request_queue *q) queue_flag_set(QUEUE_FLAG_DYING, q); spin_unlock_irq(q->queue_lock); + /* block new I/O coming */ + blk_freeze_queue_start(q); + if (q->mq_ops) blk_mq_wake_waiters(q); else { @@ -672,8 +675,9 @@ int blk_queue_enter(struct request_queue *q, bool nowait) /* * read pair of barrier in blk_freeze_queue_start(), * we need to order reading DEAD flag of .q_usage_counter - * and reading .mq_freeze_depth, otherwise the following - * wait may never return if the two read are reordered. + * and reading .mq_freeze_depth or dying flag, otherwise + * the following wait may never return if the two read + * are reordered. */ smp_rmb();