From patchwork Wed Oct 31 17:59:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10663053 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 D5DA813A4 for ; Wed, 31 Oct 2018 17:59:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C64582B4D3 for ; Wed, 31 Oct 2018 17:59:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA87E2B4DC; Wed, 31 Oct 2018 17:59:44 +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,DKIM_SIGNED, DKIM_VALID,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 644912B4D3 for ; Wed, 31 Oct 2018 17:59:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730166AbeKAC6r (ORCPT ); Wed, 31 Oct 2018 22:58:47 -0400 Received: from mail-it1-f194.google.com ([209.85.166.194]:54174 "EHLO mail-it1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730161AbeKAC6r (ORCPT ); Wed, 31 Oct 2018 22:58:47 -0400 Received: by mail-it1-f194.google.com with SMTP id y73-v6so2906396itc.3 for ; Wed, 31 Oct 2018 10:59:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7ZM3w6jIT3KYSFUymPfCdQn1RB1pTpPODEbTmmxNDQY=; b=coxOf1TEEUsjnFrv0y0MBYuDZuCvzQlZvRBjodSvKLFiLuwzQqcCqFe9Qiv9Ttb3sX Yyx9tIsvAheI+7ANT4cG6DH39FYXUo+EH5rrLZWuyiFHFNK2qFWBVi+g4rQ9t6plm2b2 sp5TNx0ineumuv6hjSiyAHUcxYqczdVIpn5BLAwcEzNF99U5ZAeG0BXYwkFljjNz8EzE vBVDvcfhtv0iBkI8IVHHnZGCohRtL5amlOnnIdf1Fo+m6jKslNoXS8al/CBlzBAYGIU4 YYQnieuHOo4tcLKnUgSjHOpa5xUBPPextj29M71d8iFOgsJNVkDntFxdnQVCBO6MGTtF B79Q== 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=7ZM3w6jIT3KYSFUymPfCdQn1RB1pTpPODEbTmmxNDQY=; b=JK7gyOoXQC6+RTm3ekvrEBbpgQSbalO8XcBmnhPCadmRMocgMgbDzhbQZd3qPZpKxk uA0Zl5fdMsQ8ZdEjVOOrughi/NH+jvRUCmURi9LQggI52AR5qHxGrMleJTQQReSZs/0u bcnVkm1DG7fwgBemXLAA4uUI4loo+y5qsmFMgnlAjWuB1zYW5+4eiUEf0eHvN3hOYNdi 40mJq1nhWgeXKqJZLAt7bq+znG39Vt37jqkyX5IdO4EVyCbXwnbL4358uhI5l2e7titw ieSR1d84mjCqvU3gDRgyA/EZN+nRaGvg5r1VTrEBaz6xO6rI5CslV9vVHbdWgrR5/uo7 m+cw== X-Gm-Message-State: AGRZ1gJS7uzjYKS6xC3aTymc7LrD+yLHAwDgaTtG37AIuQLxhq3TN9n8 xHn5xHlbSFHarvjOQ8qGvJInQw== X-Google-Smtp-Source: AJdET5eBBDtqPjK9MNSOiKXWcPrnFfRdd+HiWwBGcNy6D/8t4iQ5r6Xq5uQZupblKP0sDI57Fxw3rA== X-Received: by 2002:a02:4b86:: with SMTP id q128-v6mr3351742jaa.63.1541008782828; Wed, 31 Oct 2018 10:59:42 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id 197-v6sm10982947iou.87.2018.10.31.10.59.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Oct 2018 10:59:41 -0700 (PDT) From: Jens Axboe To: linux-block@vger.kernel.org, linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 08/30] scsi: provide mq_ops->busy() hook Date: Wed, 31 Oct 2018 11:59:00 -0600 Message-Id: <20181031175922.8849-9-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181031175922.8849-1-axboe@kernel.dk> References: <20181031175922.8849-1-axboe@kernel.dk> 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 Only the SCSI legacy path provides a way to check if target is currently busy, provide the same for the MQ path. Cc: linux-scsi@vger.kernel.org Reviewed-by: Hannes Reinecke Signed-off-by: Jens Axboe Acked-by: Martin K. Petersen --- drivers/scsi/scsi_lib.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index c7fccbb8f554..8b0345924a92 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1675,6 +1675,11 @@ static int scsi_lld_busy(struct request_queue *q) return 0; } +static bool scsi_mq_lld_busy(struct request_queue *q) +{ + return scsi_lld_busy(q); +} + /* * Kill a request for a dead device */ @@ -2326,6 +2331,7 @@ static const struct blk_mq_ops scsi_mq_ops = { .init_request = scsi_mq_init_request, .exit_request = scsi_mq_exit_request, .initialize_rq_fn = scsi_initialize_rq, + .busy = scsi_mq_lld_busy, .map_queues = scsi_map_queues, };