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 04/12] blk-mq: Move more code into blk_mq_direct_issue_request() Date: Wed, 26 Oct 2016 15:52:35 -0700 [thread overview] Message-ID: <32b0bd88-cb8e-754a-89fc-b1825778b05a@sandisk.com> (raw) In-Reply-To: <b22edafc-725f-0419-d074-34d35d57d126@sandisk.com> Move the "hctx stopped" test and the insert request calls into blk_mq_direct_issue_request(). Rename that function into blk_mq_try_issue_directly() to reflect its new semantics. Pass the hctx pointer to that function instead of looking it up a second time. These changes avoid that code has to be duplicated in the next patch. Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Hannes Reinecke <hare@suse.com> Cc: Sagi Grimberg <sagi@grimberg.me> Cc: Johannes Thumshirn <jthumshirn@suse.de> --- block/blk-mq.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 4643fa8..0cf21c2 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1243,11 +1243,11 @@ static struct request *blk_mq_map_request(struct request_queue *q, return rq; } -static int blk_mq_direct_issue_request(struct request *rq, blk_qc_t *cookie) +static void blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx, + struct request *rq, blk_qc_t *cookie) { int ret; struct request_queue *q = rq->q; - struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, rq->mq_ctx->cpu); struct blk_mq_queue_data bd = { .rq = rq, .list = NULL, @@ -1255,6 +1255,9 @@ static int blk_mq_direct_issue_request(struct request *rq, blk_qc_t *cookie) }; blk_qc_t new_cookie = blk_tag_to_qc_t(rq->tag, hctx->queue_num); + if (blk_mq_hctx_stopped(hctx)) + goto insert; + /* * For OK queue, we are done. For error, kill it. Any other * error (busy), just add it to our list as we previously @@ -1263,7 +1266,7 @@ static int blk_mq_direct_issue_request(struct request *rq, blk_qc_t *cookie) ret = q->mq_ops->queue_rq(hctx, &bd); if (ret == BLK_MQ_RQ_QUEUE_OK) { *cookie = new_cookie; - return 0; + return; } __blk_mq_requeue_request(rq); @@ -1272,10 +1275,11 @@ static int blk_mq_direct_issue_request(struct request *rq, blk_qc_t *cookie) *cookie = BLK_QC_T_NONE; rq->errors = -EIO; blk_mq_end_request(rq, rq->errors); - return 0; + return; } - return -1; +insert: + blk_mq_insert_request(rq, false, true, true); } /* @@ -1352,9 +1356,7 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) blk_mq_put_ctx(data.ctx); if (!old_rq) goto done; - if (blk_mq_hctx_stopped(data.hctx) || - blk_mq_direct_issue_request(old_rq, &cookie) != 0) - blk_mq_insert_request(old_rq, false, true, true); + blk_mq_try_issue_directly(data.hctx, old_rq, &cookie); goto done; } -- 2.10.1
WARNING: multiple messages have this Message-ID (diff)
From: bart.vanassche@sandisk.com (Bart Van Assche) Subject: [PATCH 04/12] blk-mq: Move more code into blk_mq_direct_issue_request() Date: Wed, 26 Oct 2016 15:52:35 -0700 [thread overview] Message-ID: <32b0bd88-cb8e-754a-89fc-b1825778b05a@sandisk.com> (raw) In-Reply-To: <b22edafc-725f-0419-d074-34d35d57d126@sandisk.com> Move the "hctx stopped" test and the insert request calls into blk_mq_direct_issue_request(). Rename that function into blk_mq_try_issue_directly() to reflect its new semantics. Pass the hctx pointer to that function instead of looking it up a second time. These changes avoid that code has to be duplicated in the next patch. Signed-off-by: Bart Van Assche <bart.vanassche at sandisk.com> Cc: Christoph Hellwig <hch at lst.de> Cc: Hannes Reinecke <hare at suse.com> Cc: Sagi Grimberg <sagi at grimberg.me> Cc: Johannes Thumshirn <jthumshirn at suse.de> --- block/blk-mq.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 4643fa8..0cf21c2 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1243,11 +1243,11 @@ static struct request *blk_mq_map_request(struct request_queue *q, return rq; } -static int blk_mq_direct_issue_request(struct request *rq, blk_qc_t *cookie) +static void blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx, + struct request *rq, blk_qc_t *cookie) { int ret; struct request_queue *q = rq->q; - struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, rq->mq_ctx->cpu); struct blk_mq_queue_data bd = { .rq = rq, .list = NULL, @@ -1255,6 +1255,9 @@ static int blk_mq_direct_issue_request(struct request *rq, blk_qc_t *cookie) }; blk_qc_t new_cookie = blk_tag_to_qc_t(rq->tag, hctx->queue_num); + if (blk_mq_hctx_stopped(hctx)) + goto insert; + /* * For OK queue, we are done. For error, kill it. Any other * error (busy), just add it to our list as we previously @@ -1263,7 +1266,7 @@ static int blk_mq_direct_issue_request(struct request *rq, blk_qc_t *cookie) ret = q->mq_ops->queue_rq(hctx, &bd); if (ret == BLK_MQ_RQ_QUEUE_OK) { *cookie = new_cookie; - return 0; + return; } __blk_mq_requeue_request(rq); @@ -1272,10 +1275,11 @@ static int blk_mq_direct_issue_request(struct request *rq, blk_qc_t *cookie) *cookie = BLK_QC_T_NONE; rq->errors = -EIO; blk_mq_end_request(rq, rq->errors); - return 0; + return; } - return -1; +insert: + blk_mq_insert_request(rq, false, true, true); } /* @@ -1352,9 +1356,7 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) blk_mq_put_ctx(data.ctx); if (!old_rq) goto done; - if (blk_mq_hctx_stopped(data.hctx) || - blk_mq_direct_issue_request(old_rq, &cookie) != 0) - blk_mq_insert_request(old_rq, false, true, true); + blk_mq_try_issue_directly(data.hctx, old_rq, &cookie); goto done; } -- 2.10.1
next prev parent reply other threads:[~2016-10-26 22:52 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 ` Bart Van Assche [this message] 2016-10-26 22:52 ` [PATCH 04/12] blk-mq: Move more code into blk_mq_direct_issue_request() 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 ` [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-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=32b0bd88-cb8e-754a-89fc-b1825778b05a@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: linkBe 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.