From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753364AbbDCQAQ (ORCPT ); Fri, 3 Apr 2015 12:00:16 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:46187 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753131AbbDCP6c (ORCPT ); Fri, 3 Apr 2015 11:58:32 -0400 From: Jens Axboe To: , , CC: , Jens Axboe Subject: [PATCH 4/7] scsi: add scsi-mq helper for iterating over busy commands Date: Fri, 3 Apr 2015 09:58:20 -0600 Message-ID: <1428076703-31014-5-git-send-email-axboe@fb.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1428076703-31014-1-git-send-email-axboe@fb.com> References: <1428076703-31014-1-git-send-email-axboe@fb.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.52.13] X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.13.68,1.0.33,0.0.0000 definitions=2015-04-03_06:2015-04-03,2015-04-03,1970-01-01 signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is basically just a wrapper around blk_mq_queue_busy_iter(), so that LLDs don't have to deal with or worry about blk-mq hardware queues. Signed-off-by: Jens Axboe --- drivers/scsi/scsi_lib.c | 25 +++++++++++++++++++++++++ include/scsi/scsi_device.h | 3 +++ 2 files changed, 28 insertions(+) diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 54d7a6cbb98a..87a4c53c8b48 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -648,6 +648,31 @@ static void scsi_mq_uninit_cmd(struct scsi_cmnd *cmd) } } +struct scsi_mq_iter_data { + scsi_scmd_iter *fn; + void *priv; +}; + +static bool scsi_mq_iter_fn(struct blk_mq_hw_ctx *hctx, struct request *rq, + void *priv, bool reserved) +{ + struct scsi_mq_iter_data *data = priv; + struct scsi_cmnd *scmd = rq->special; + + return data->fn(scmd, data->priv); +} + +void scsi_mq_scmd_busy_iter(struct scsi_device *sdev, scsi_scmd_iter *fn, + void *priv) +{ + struct scsi_mq_iter_data data; + + data.fn = fn; + data.priv = priv; + blk_mq_queue_busy_iter(sdev->request_queue, scsi_mq_iter_fn, &data); +} +EXPORT_SYMBOL(scsi_mq_scmd_busy_iter); + /* * Function: scsi_release_buffers() * diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index a4c9336811d1..9250b03613f2 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -536,4 +536,7 @@ static inline int scsi_device_tpgs(struct scsi_device *sdev) MODULE_ALIAS("scsi:t-" __stringify(type) "*") #define SCSI_DEVICE_MODALIAS_FMT "scsi:t-0x%02x" +typedef bool (scsi_scmd_iter)(struct scsi_cmnd *, void *); +void scsi_mq_scmd_busy_iter(struct scsi_device *sdev, scsi_scmd_iter *fn, void *priv); + #endif /* _SCSI_SCSI_DEVICE_H */ -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jens Axboe Subject: [PATCH 4/7] scsi: add scsi-mq helper for iterating over busy commands Date: Fri, 3 Apr 2015 09:58:20 -0600 Message-ID: <1428076703-31014-5-git-send-email-axboe@fb.com> References: <1428076703-31014-1-git-send-email-axboe@fb.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:46187 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753131AbbDCP6c (ORCPT ); Fri, 3 Apr 2015 11:58:32 -0400 In-Reply-To: <1428076703-31014-1-git-send-email-axboe@fb.com> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: axboe@kernel.dk, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org Cc: hch@lst.de, Jens Axboe This is basically just a wrapper around blk_mq_queue_busy_iter(), so that LLDs don't have to deal with or worry about blk-mq hardware queues. Signed-off-by: Jens Axboe --- drivers/scsi/scsi_lib.c | 25 +++++++++++++++++++++++++ include/scsi/scsi_device.h | 3 +++ 2 files changed, 28 insertions(+) diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 54d7a6cbb98a..87a4c53c8b48 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -648,6 +648,31 @@ static void scsi_mq_uninit_cmd(struct scsi_cmnd *cmd) } } +struct scsi_mq_iter_data { + scsi_scmd_iter *fn; + void *priv; +}; + +static bool scsi_mq_iter_fn(struct blk_mq_hw_ctx *hctx, struct request *rq, + void *priv, bool reserved) +{ + struct scsi_mq_iter_data *data = priv; + struct scsi_cmnd *scmd = rq->special; + + return data->fn(scmd, data->priv); +} + +void scsi_mq_scmd_busy_iter(struct scsi_device *sdev, scsi_scmd_iter *fn, + void *priv) +{ + struct scsi_mq_iter_data data; + + data.fn = fn; + data.priv = priv; + blk_mq_queue_busy_iter(sdev->request_queue, scsi_mq_iter_fn, &data); +} +EXPORT_SYMBOL(scsi_mq_scmd_busy_iter); + /* * Function: scsi_release_buffers() * diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index a4c9336811d1..9250b03613f2 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -536,4 +536,7 @@ static inline int scsi_device_tpgs(struct scsi_device *sdev) MODULE_ALIAS("scsi:t-" __stringify(type) "*") #define SCSI_DEVICE_MODALIAS_FMT "scsi:t-0x%02x" +typedef bool (scsi_scmd_iter)(struct scsi_cmnd *, void *); +void scsi_mq_scmd_busy_iter(struct scsi_device *sdev, scsi_scmd_iter *fn, void *priv); + #endif /* _SCSI_SCSI_DEVICE_H */ -- 1.9.1