From patchwork Thu Sep 21 21:22:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 9964825 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 75B9E6057C for ; Thu, 21 Sep 2017 21:23:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 681F3295F8 for ; Thu, 21 Sep 2017 21:23:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D351295F9; Thu, 21 Sep 2017 21:23:10 +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=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 4F283295FC for ; Thu, 21 Sep 2017 21:23:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751741AbdIUVXE (ORCPT ); Thu, 21 Sep 2017 17:23:04 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:62081 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751750AbdIUVXD (ORCPT ); Thu, 21 Sep 2017 17:23:03 -0400 X-IronPort-AV: E=Sophos;i="5.42,426,1500912000"; d="scan'208";a="155631637" Received: from sjappemgw12.hgst.com (HELO sjappemgw11.hgst.com) ([199.255.44.66]) by ob1.hgst.iphmx.com with ESMTP; 22 Sep 2017 05:23:03 +0800 Received: from thinkpad-bart.sdcorp.global.sandisk.com (HELO thinkpad-bart.int.fusionio.com) ([10.11.172.152]) by sjappemgw11.hgst.com with ESMTP; 21 Sep 2017 14:22:57 -0700 From: Bart Van Assche To: Jens Axboe Cc: linux-block@vger.kernel.org, Christoph Hellwig , "Martin K . Petersen" , =Oleksandr Natalenko , Bart Van Assche , Ming Lei , Hannes Reinecke , Johannes Thumshirn Subject: [PATCH v2 4/4] scsi-mq: Reduce suspend latency Date: Thu, 21 Sep 2017 14:22:55 -0700 Message-Id: <20170921212255.12788-5-bart.vanassche@wdc.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170921212255.12788-1-bart.vanassche@wdc.com> References: <20170921212255.12788-1-bart.vanassche@wdc.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 Avoid that it can take 200 ms too long to wait for ongoing requests to finish. Note: blk_mq_freeze_queue() uses a wait queue to wait for ongoing requests to finish. Signed-off-by: Bart Van Assche Cc: Martin K. Petersen Cc: Ming Lei Cc: Christoph Hellwig Cc: Hannes Reinecke Cc: Johannes Thumshirn --- drivers/scsi/scsi_lib.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index e76fd6e89a81..34e5f0f95d01 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -2901,10 +2901,15 @@ scsi_device_quiesce(struct scsi_device *sdev) if (err) return err; - scsi_run_queue(q); - while (atomic_read(&sdev->device_busy)) { - msleep_interruptible(200); + if (q->mq_ops) { + blk_mq_freeze_queue(q); + blk_mq_unfreeze_queue(q); + } else { scsi_run_queue(q); + while (atomic_read(&sdev->device_busy)) { + msleep_interruptible(200); + scsi_run_queue(q); + } } return 0; }