From: Tejun Heo <tj@kernel.org>
To: jack@suse.cz, axboe@kernel.dk, clm@fb.com, jbacik@fb.com
Cc: kernel-team@fb.com, linux-kernel@vger.kernel.org,
linux-btrfs@vger.kernel.org, peterz@infradead.org,
jianchao.w.wang@oracle.com, Bart.VanAssche@wdc.com,
linux-block@vger.kernel.org, Tejun Heo <tj@kernel.org>
Subject: [PATCH 2/8] blk-mq: protect completion path with RCU
Date: Tue, 9 Jan 2018 08:29:47 -0800 [thread overview]
Message-ID: <20180109162953.1211451-3-tj@kernel.org> (raw)
In-Reply-To: <20180109162953.1211451-1-tj@kernel.org>
Currently, blk-mq protects only the issue path with RCU. This patch
puts the completion path under the same RCU protection. This will be
used to synchronize issue/completion against timeout by later patches,
which will also add the comments.
Signed-off-by: Tejun Heo <tj@kernel.org>
---
block/blk-mq.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index ddc9261..6741c3e 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -584,11 +584,16 @@ static void hctx_lock(struct blk_mq_hw_ctx *hctx, int *srcu_idx)
void blk_mq_complete_request(struct request *rq)
{
struct request_queue *q = rq->q;
+ struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, rq->mq_ctx->cpu);
+ int srcu_idx;
if (unlikely(blk_should_fake_timeout(q)))
return;
+
+ hctx_lock(hctx, &srcu_idx);
if (!blk_mark_rq_complete(rq))
__blk_mq_complete_request(rq);
+ hctx_unlock(hctx, srcu_idx);
}
EXPORT_SYMBOL(blk_mq_complete_request);
--
2.9.5
next prev parent reply other threads:[~2018-01-09 16:30 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-09 16:29 [PATCHSET v5] blk-mq: reimplement timeout handling Tejun Heo
2018-01-09 16:29 ` [PATCH 1/8] blk-mq: move hctx lock/unlock into a helper Tejun Heo
2018-01-09 16:29 ` Tejun Heo [this message]
2018-01-09 16:29 ` [PATCH 3/8] blk-mq: replace timeout synchronization with a RCU and generation based scheme Tejun Heo
2018-01-09 16:29 ` [PATCH 4/8] blk-mq: use blk_mq_rq_state() instead of testing REQ_ATOM_COMPLETE Tejun Heo
2018-01-09 16:29 ` [PATCH 5/8] blk-mq: make blk_abort_request() trigger timeout path Tejun Heo
2018-01-09 16:29 ` [PATCH 6/8] blk-mq: remove REQ_ATOM_COMPLETE usages from blk-mq Tejun Heo
2018-01-09 16:29 ` [PATCH 7/8] blk-mq: remove REQ_ATOM_STARTED Tejun Heo
2018-01-09 16:29 ` [PATCH 8/8] blk-mq: rename blk_mq_hw_ctx->queue_rq_srcu to ->srcu Tejun Heo
2018-01-09 16:53 ` [PATCHSET v5] blk-mq: reimplement timeout handling Jens Axboe
2018-01-12 20:57 ` Bart Van Assche
2018-01-12 21:07 ` Jens Axboe
2018-01-12 21:19 ` Bart Van Assche
2018-01-12 21:55 ` Jens Axboe
2018-01-14 15:12 ` jianchao.wang
2018-01-14 15:45 ` Ming Lei
2018-01-12 21:55 ` Laurence Oberman
2018-01-13 12:39 ` Ming Lei
2018-01-13 14:45 ` Ming Lei
2018-01-13 17:59 ` Ming Lei
-- strict thread matches above, loose matches on Subject: below --
2018-01-08 19:15 [PATCHSET v4] " Tejun Heo
2018-01-08 19:15 ` [PATCH 2/8] blk-mq: protect completion path with RCU Tejun Heo
2018-01-08 19:57 ` Holger Hoffstätte
2018-01-08 20:15 ` Jens Axboe
2018-01-08 22:55 ` Jens Axboe
2018-01-08 23:27 ` Holger Hoffstätte
2018-01-08 23:33 ` Holger Hoffstätte
2018-01-09 7:08 ` Hannes Reinecke
2018-01-09 15:22 ` Jens Axboe
2018-01-09 16:12 ` Bart Van Assche
2018-01-09 16:17 ` Jens Axboe
2018-01-09 16:19 ` tj
2018-01-09 16:22 ` 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=20180109162953.1211451-3-tj@kernel.org \
--to=tj@kernel.org \
--cc=Bart.VanAssche@wdc.com \
--cc=axboe@kernel.dk \
--cc=clm@fb.com \
--cc=jack@suse.cz \
--cc=jbacik@fb.com \
--cc=jianchao.w.wang@oracle.com \
--cc=kernel-team@fb.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).