From patchwork Tue Mar 26 12:07:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 10870919 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 57B32922 for ; Tue, 26 Mar 2019 12:07:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 44E5428DCA for ; Tue, 26 Mar 2019 12:07:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3732F28FB5; Tue, 26 Mar 2019 12:07:16 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 D7F8128DCA for ; Tue, 26 Mar 2019 12:07:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726248AbfCZMHP (ORCPT ); Tue, 26 Mar 2019 08:07:15 -0400 Received: from mx2.suse.de ([195.135.220.15]:42078 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726241AbfCZMHO (ORCPT ); Tue, 26 Mar 2019 08:07:14 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id BE0B6AC94; Tue, 26 Mar 2019 12:07:13 +0000 (UTC) From: Hannes Reinecke To: Jens Axboe Cc: Christoph Hellwig , Ming Lei , linux-block@vger.kernel.org, Hannes Reinecke , Hannes Reinecke Subject: [PATCH] block: don't call blk_mq_run_hw_queues() for dead or dying queues Date: Tue, 26 Mar 2019 13:07:12 +0100 Message-Id: <20190326120712.41657-1-hare@suse.de> X-Mailer: git-send-email 2.16.4 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 When a queue is dying or dead there is no point in calling blk_mq_run_hw_queues() in blk_mq_unquiesce_queue(); in fact, doing so might crash the machine as the queue structures are in the process of being deleted. Signed-off-by: Hannes Reinecke --- block/blk-mq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index a9c181603cbd..b1eeba38bc79 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -258,7 +258,8 @@ void blk_mq_unquiesce_queue(struct request_queue *q) blk_queue_flag_clear(QUEUE_FLAG_QUIESCED, q); /* dispatch requests which are inserted during quiescing */ - blk_mq_run_hw_queues(q, true); + if (!blk_queue_dying(q) && !blk_queue_dead(q)) + blk_mq_run_hw_queues(q, true); } EXPORT_SYMBOL_GPL(blk_mq_unquiesce_queue);