From: Bart Van Assche <bart.vanassche@sandisk.com>
To: Jens Axboe <axboe@fb.com>
Cc: "linux-block@vger.kernel.org" <linux-block@vger.kernel.org>,
James Bottomley <jejb@linux.vnet.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Mike Snitzer <snitzer@redhat.com>,
"linux-rdma@vger.kernel.org" <linux-rdma@vger.kernel.org>,
Ming Lei <tom.leiming@gmail.com>,
"linux-nvme@lists.infradead.org" <linux-nvme@lists.infradead.org>,
Keith Busch <keith.busch@intel.com>,
Doug Ledford <dledford@redhat.com>,
"linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
Laurence Oberman <loberman@redhat.com>,
Christoph Hellwig <hch@lst.de>
Subject: [PATCH 10/12] SRP transport, scsi-mq: Wait for .queue_rq() if necessary
Date: Wed, 26 Oct 2016 15:55:34 -0700 [thread overview]
Message-ID: <0cd77719-1f11-d5c3-3186-1c7c3cfd6886@sandisk.com> (raw)
In-Reply-To: <b22edafc-725f-0419-d074-34d35d57d126@sandisk.com>
Ensure that if scsi-mq is enabled that scsi_wait_for_queuecommand()
waits until ongoing shost->hostt->queuecommand() calls have finished.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: James Bottomley <jejb@linux.vnet.ibm.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Doug Ledford <dledford@redhat.com>
---
drivers/scsi/scsi_lib.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index c1561e7..9b8b19e 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2724,8 +2724,6 @@ EXPORT_SYMBOL_GPL(sdev_evt_send_simple);
/**
* scsi_request_fn_active() - number of kernel threads inside scsi_request_fn()
* @shost: SCSI host for which to count the number of scsi_request_fn() callers.
- *
- * To do: add support for scsi-mq in this function.
*/
static int scsi_request_fn_active(struct Scsi_Host *shost)
{
@@ -2744,12 +2742,20 @@ static int scsi_request_fn_active(struct Scsi_Host *shost)
return request_fn_active;
}
+static void scsi_mq_wait_for_queuecommand(struct Scsi_Host *shost)
+{
+ struct scsi_device *sdev;
+
+ shost_for_each_device(sdev, shost)
+ blk_mq_quiesce_queue(sdev->request_queue);
+}
+
/**
* scsi_wait_for_queuecommand() - wait for ongoing queuecommand() calls
* @shost: SCSI host pointer.
*
* Wait until the ongoing shost->hostt->queuecommand() calls that are
- * invoked from scsi_request_fn() have finished.
+ * invoked from either scsi_request_fn() or scsi_queue_rq() have finished.
*
* To do: avoid that scsi_send_eh_cmnd() calls queuecommand() after
* scsi_internal_device_block() has blocked a SCSI device and remove and also
@@ -2757,8 +2763,12 @@ static int scsi_request_fn_active(struct Scsi_Host *shost)
*/
void scsi_wait_for_queuecommand(struct Scsi_Host *shost)
{
- while (scsi_request_fn_active(shost))
- msleep(20);
+ if (shost->use_blk_mq) {
+ scsi_mq_wait_for_queuecommand(shost);
+ } else {
+ while (scsi_request_fn_active(shost))
+ msleep(20);
+ }
}
EXPORT_SYMBOL(scsi_wait_for_queuecommand);
--
2.10.1
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
WARNING: multiple messages have this Message-ID (diff)
From: Bart Van Assche <bart.vanassche@sandisk.com>
To: Jens Axboe <axboe@fb.com>
Cc: Christoph Hellwig <hch@lst.de>,
James Bottomley <jejb@linux.vnet.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Mike Snitzer <snitzer@redhat.com>,
Doug Ledford <dledford@redhat.com>,
Keith Busch <keith.busch@intel.com>,
Ming Lei <tom.leiming@gmail.com>,
Laurence Oberman <loberman@redhat.com>,
"linux-block@vger.kernel.org" <linux-block@vger.kernel.org>,
"linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
"linux-rdma@vger.kernel.org" <linux-rdma@vger.kernel.org>,
"linux-nvme@lists.infradead.org" <linux-nvme@lists.infradead.org>
Subject: [PATCH 10/12] SRP transport, scsi-mq: Wait for .queue_rq() if necessary
Date: Wed, 26 Oct 2016 15:55:34 -0700 [thread overview]
Message-ID: <0cd77719-1f11-d5c3-3186-1c7c3cfd6886@sandisk.com> (raw)
In-Reply-To: <b22edafc-725f-0419-d074-34d35d57d126@sandisk.com>
Ensure that if scsi-mq is enabled that scsi_wait_for_queuecommand()
waits until ongoing shost->hostt->queuecommand() calls have finished.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: James Bottomley <jejb@linux.vnet.ibm.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Doug Ledford <dledford@redhat.com>
---
drivers/scsi/scsi_lib.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index c1561e7..9b8b19e 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2724,8 +2724,6 @@ EXPORT_SYMBOL_GPL(sdev_evt_send_simple);
/**
* scsi_request_fn_active() - number of kernel threads inside scsi_request_fn()
* @shost: SCSI host for which to count the number of scsi_request_fn() callers.
- *
- * To do: add support for scsi-mq in this function.
*/
static int scsi_request_fn_active(struct Scsi_Host *shost)
{
@@ -2744,12 +2742,20 @@ static int scsi_request_fn_active(struct Scsi_Host *shost)
return request_fn_active;
}
+static void scsi_mq_wait_for_queuecommand(struct Scsi_Host *shost)
+{
+ struct scsi_device *sdev;
+
+ shost_for_each_device(sdev, shost)
+ blk_mq_quiesce_queue(sdev->request_queue);
+}
+
/**
* scsi_wait_for_queuecommand() - wait for ongoing queuecommand() calls
* @shost: SCSI host pointer.
*
* Wait until the ongoing shost->hostt->queuecommand() calls that are
- * invoked from scsi_request_fn() have finished.
+ * invoked from either scsi_request_fn() or scsi_queue_rq() have finished.
*
* To do: avoid that scsi_send_eh_cmnd() calls queuecommand() after
* scsi_internal_device_block() has blocked a SCSI device and remove and also
@@ -2757,8 +2763,12 @@ static int scsi_request_fn_active(struct Scsi_Host *shost)
*/
void scsi_wait_for_queuecommand(struct Scsi_Host *shost)
{
- while (scsi_request_fn_active(shost))
- msleep(20);
+ if (shost->use_blk_mq) {
+ scsi_mq_wait_for_queuecommand(shost);
+ } else {
+ while (scsi_request_fn_active(shost))
+ msleep(20);
+ }
}
EXPORT_SYMBOL(scsi_wait_for_queuecommand);
--
2.10.1
WARNING: multiple messages have this Message-ID (diff)
From: bart.vanassche@sandisk.com (Bart Van Assche)
Subject: [PATCH 10/12] SRP transport, scsi-mq: Wait for .queue_rq() if necessary
Date: Wed, 26 Oct 2016 15:55:34 -0700 [thread overview]
Message-ID: <0cd77719-1f11-d5c3-3186-1c7c3cfd6886@sandisk.com> (raw)
In-Reply-To: <b22edafc-725f-0419-d074-34d35d57d126@sandisk.com>
Ensure that if scsi-mq is enabled that scsi_wait_for_queuecommand()
waits until ongoing shost->hostt->queuecommand() calls have finished.
Signed-off-by: Bart Van Assche <bart.vanassche at sandisk.com>
Reviewed-by: Christoph Hellwig <hch at lst.de>
Cc: James Bottomley <jejb at linux.vnet.ibm.com>
Cc: Martin K. Petersen <martin.petersen at oracle.com>
Cc: Doug Ledford <dledford at redhat.com>
---
drivers/scsi/scsi_lib.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index c1561e7..9b8b19e 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2724,8 +2724,6 @@ EXPORT_SYMBOL_GPL(sdev_evt_send_simple);
/**
* scsi_request_fn_active() - number of kernel threads inside scsi_request_fn()
* @shost: SCSI host for which to count the number of scsi_request_fn() callers.
- *
- * To do: add support for scsi-mq in this function.
*/
static int scsi_request_fn_active(struct Scsi_Host *shost)
{
@@ -2744,12 +2742,20 @@ static int scsi_request_fn_active(struct Scsi_Host *shost)
return request_fn_active;
}
+static void scsi_mq_wait_for_queuecommand(struct Scsi_Host *shost)
+{
+ struct scsi_device *sdev;
+
+ shost_for_each_device(sdev, shost)
+ blk_mq_quiesce_queue(sdev->request_queue);
+}
+
/**
* scsi_wait_for_queuecommand() - wait for ongoing queuecommand() calls
* @shost: SCSI host pointer.
*
* Wait until the ongoing shost->hostt->queuecommand() calls that are
- * invoked from scsi_request_fn() have finished.
+ * invoked from either scsi_request_fn() or scsi_queue_rq() have finished.
*
* To do: avoid that scsi_send_eh_cmnd() calls queuecommand() after
* scsi_internal_device_block() has blocked a SCSI device and remove and also
@@ -2757,8 +2763,12 @@ static int scsi_request_fn_active(struct Scsi_Host *shost)
*/
void scsi_wait_for_queuecommand(struct Scsi_Host *shost)
{
- while (scsi_request_fn_active(shost))
- msleep(20);
+ if (shost->use_blk_mq) {
+ scsi_mq_wait_for_queuecommand(shost);
+ } else {
+ while (scsi_request_fn_active(shost))
+ msleep(20);
+ }
}
EXPORT_SYMBOL(scsi_wait_for_queuecommand);
--
2.10.1
next prev parent reply other threads:[~2016-10-26 22:55 UTC|newest]
Thread overview: 149+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-26 22:49 [PATCH v4 0/12] Fix race conditions related to stopping block layer queues Bart Van Assche
2016-10-26 22:49 ` Bart Van Assche
2016-10-26 22:49 ` Bart Van Assche
2016-10-26 22:50 ` [PATCH 01/12] blk-mq: Do not invoke .queue_rq() for a stopped queue Bart Van Assche
2016-10-26 22:50 ` Bart Van Assche
2016-10-26 22:50 ` Bart Van Assche
2016-10-27 5:47 ` Hannes Reinecke
2016-10-27 5:47 ` Hannes Reinecke
2016-10-27 8:14 ` Johannes Thumshirn
2016-10-27 8:14 ` Johannes Thumshirn
2016-10-27 8:14 ` Johannes Thumshirn
2016-10-27 12:14 ` Sagi Grimberg
2016-10-27 12:14 ` Sagi Grimberg
2016-10-27 12:14 ` Sagi Grimberg
2016-10-26 22:51 ` [PATCH 02/12] blk-mq: Introduce blk_mq_hctx_stopped() Bart Van Assche
2016-10-26 22:51 ` Bart Van Assche
2016-10-26 22:51 ` Bart Van Assche
2016-10-27 1:33 ` Ming Lei
2016-10-27 1:33 ` Ming Lei
2016-10-27 5:48 ` Hannes Reinecke
2016-10-27 8:15 ` Johannes Thumshirn
2016-10-27 8:15 ` Johannes Thumshirn
2016-10-27 8:15 ` Johannes Thumshirn
2016-10-27 12:15 ` Sagi Grimberg
2016-10-27 12:15 ` Sagi Grimberg
2016-10-27 12:15 ` Sagi Grimberg
2016-10-27 12:40 ` Christoph Hellwig
2016-10-27 12:40 ` Christoph Hellwig
2016-10-27 12:40 ` Christoph Hellwig
2016-10-26 22:52 ` [PATCH 03/12] blk-mq: Introduce blk_mq_queue_stopped() Bart Van Assche
2016-10-26 22:52 ` Bart Van Assche
2016-10-26 22:52 ` Bart Van Assche
2016-10-27 5:49 ` Hannes Reinecke
2016-10-27 5:49 ` Hannes Reinecke
2016-10-27 8:16 ` Johannes Thumshirn
2016-10-27 8:16 ` Johannes Thumshirn
2016-10-27 8:16 ` Johannes Thumshirn
2016-10-26 22:52 ` [PATCH 04/12] blk-mq: Move more code into blk_mq_direct_issue_request() Bart Van Assche
2016-10-26 22:52 ` Bart Van Assche
2016-10-27 5:50 ` Hannes Reinecke
2016-10-27 5:50 ` Hannes Reinecke
2016-10-27 5:50 ` Hannes Reinecke
2016-10-27 8:17 ` Johannes Thumshirn
2016-10-27 8:17 ` Johannes Thumshirn
2016-10-27 8:17 ` Johannes Thumshirn
2016-10-27 8:18 ` Johannes Thumshirn
2016-10-27 8:18 ` Johannes Thumshirn
2016-10-27 8:18 ` Johannes Thumshirn
2016-10-27 12:16 ` Sagi Grimberg
2016-10-27 12:16 ` Sagi Grimberg
2016-10-27 12:16 ` Sagi Grimberg
2016-10-27 12:40 ` Christoph Hellwig
2016-10-27 12:40 ` Christoph Hellwig
2016-10-27 12:40 ` Christoph Hellwig
2016-10-26 22:53 ` [PATCH 05/12] blk-mq: Introduce blk_mq_quiesce_queue() Bart Van Assche
2016-10-26 22:53 ` Bart Van Assche
2016-10-27 1:30 ` Ming Lei
2016-10-27 1:30 ` Ming Lei
2016-10-27 1:30 ` Ming Lei
2016-10-27 2:04 ` Bart Van Assche
2016-10-27 2:04 ` Bart Van Assche
2016-10-27 2:04 ` Bart Van Assche
2016-10-27 2:31 ` Ming Lei
2016-10-27 2:31 ` Ming Lei
2016-10-27 2:40 ` Bart Van Assche
2016-10-27 2:40 ` Bart Van Assche
2016-10-27 2:40 ` Bart Van Assche
2016-10-27 2:48 ` Ming Lei
2016-10-27 2:48 ` Ming Lei
2016-10-27 3:05 ` Bart Van Assche
2016-10-27 3:05 ` Bart Van Assche
2016-10-27 3:05 ` Bart Van Assche
2016-10-27 12:42 ` Christoph Hellwig
2016-10-27 12:42 ` Christoph Hellwig
2016-10-27 12:42 ` Christoph Hellwig
2016-10-27 13:16 ` Ming Lei
2016-10-27 13:16 ` Ming Lei
2016-10-27 13:16 ` Ming Lei
2016-10-27 5:52 ` Hannes Reinecke
2016-10-27 5:52 ` Hannes Reinecke
2016-10-27 5:52 ` Hannes Reinecke
2016-10-27 15:56 ` Bart Van Assche
2016-10-27 15:56 ` Bart Van Assche
2016-10-27 15:56 ` Bart Van Assche
2016-10-27 12:41 ` Christoph Hellwig
2016-10-27 12:41 ` Christoph Hellwig
2016-10-27 12:41 ` Christoph Hellwig
2016-10-26 22:53 ` [PATCH 06/12] blk-mq: Add a kick_requeue_list argument to blk_mq_requeue_request() Bart Van Assche
2016-10-26 22:53 ` Bart Van Assche
2016-10-26 22:53 ` Bart Van Assche
2016-10-27 7:26 ` Hannes Reinecke
2016-10-27 7:26 ` Hannes Reinecke
2016-10-27 8:28 ` Johannes Thumshirn
2016-10-27 8:28 ` Johannes Thumshirn
2016-10-27 8:28 ` Johannes Thumshirn
2016-10-27 12:44 ` Christoph Hellwig
2016-10-27 12:44 ` Christoph Hellwig
2016-10-27 12:44 ` Christoph Hellwig
2016-10-26 22:54 ` [PATCH 07/12] dm: Use BLK_MQ_S_STOPPED instead of QUEUE_FLAG_STOPPED in blk-mq code Bart Van Assche
2016-10-26 22:54 ` Bart Van Assche
2016-10-27 7:27 ` Hannes Reinecke
2016-10-27 7:27 ` Hannes Reinecke
2016-10-27 8:28 ` Johannes Thumshirn
2016-10-27 8:28 ` Johannes Thumshirn
2016-10-27 8:28 ` Johannes Thumshirn
2016-10-27 14:01 ` Mike Snitzer
2016-10-27 14:01 ` Mike Snitzer
2016-10-27 14:01 ` Mike Snitzer
2016-10-26 22:54 ` [PATCH 08/12] dm: Fix a race condition related to stopping and starting queues Bart Van Assche
2016-10-26 22:54 ` Bart Van Assche
2016-10-27 14:01 ` Mike Snitzer
2016-10-27 14:01 ` Mike Snitzer
2016-10-27 14:01 ` Mike Snitzer
2016-10-26 22:55 ` [PATCH 09/12] SRP transport: Move queuecommand() wait code to SCSI core Bart Van Assche
2016-10-26 22:55 ` Bart Van Assche
2016-10-26 22:55 ` Bart Van Assche
2016-10-27 8:27 ` Johannes Thumshirn
2016-10-27 8:27 ` Johannes Thumshirn
2016-10-27 8:27 ` Johannes Thumshirn
2016-10-27 12:20 ` Sagi Grimberg
2016-10-27 12:20 ` Sagi Grimberg
2016-10-27 12:20 ` Sagi Grimberg
2016-10-26 22:55 ` Bart Van Assche [this message]
2016-10-26 22:55 ` [PATCH 10/12] SRP transport, scsi-mq: Wait for .queue_rq() if necessary Bart Van Assche
2016-10-26 22:55 ` Bart Van Assche
2016-10-27 8:27 ` Johannes Thumshirn
2016-10-27 8:27 ` Johannes Thumshirn
2016-10-27 8:27 ` Johannes Thumshirn
2016-10-27 12:19 ` Sagi Grimberg
2016-10-27 12:19 ` Sagi Grimberg
2016-10-27 12:19 ` Sagi Grimberg
2016-10-26 22:56 ` [PATCH 11/12] nvme: Use BLK_MQ_S_STOPPED instead of QUEUE_FLAG_STOPPED in blk-mq code Bart Van Assche
2016-10-26 22:56 ` Bart Van Assche
2016-10-26 22:56 ` Bart Van Assche
2016-10-27 12:19 ` Sagi Grimberg
2016-10-27 12:19 ` Sagi Grimberg
2016-10-27 12:19 ` Sagi Grimberg
2016-10-28 16:01 ` Keith Busch
2016-10-28 16:01 ` Keith Busch
2016-10-28 18:51 ` Bart Van Assche
2016-10-28 18:51 ` Bart Van Assche
2016-10-28 21:06 ` Keith Busch
2016-10-28 21:06 ` Keith Busch
2016-10-26 22:56 ` [PATCH 12/12] nvme: Fix a race condition related to stopping queues Bart Van Assche
2016-10-26 22:56 ` Bart Van Assche
2016-10-26 22:56 ` Bart Van Assche
2016-10-26 23:28 ` [PATCH v4 0/12] Fix race conditions related to stopping block layer queues Jens Axboe
2016-10-26 23:28 ` Jens Axboe
2016-10-26 23:28 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0cd77719-1f11-d5c3-3186-1c7c3cfd6886@sandisk.com \
--to=bart.vanassche@sandisk.com \
--cc=axboe@fb.com \
--cc=dledford@redhat.com \
--cc=hch@lst.de \
--cc=jejb@linux.vnet.ibm.com \
--cc=keith.busch@intel.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=loberman@redhat.com \
--cc=martin.petersen@oracle.com \
--cc=snitzer@redhat.com \
--cc=tom.leiming@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.