From: Keith Busch <keith.busch@intel.com> To: Jens Axboe <axboe@kernel.dk>, linux-nvme@lists.infradead.org, linux-block@vger.kernel.org, Ming Lei <ming.lei@redhat.com>, Christoph Hellwig <hch@lst.de>, Bart Van Assche <bart.vanassche@wdc.com> Cc: Keith Busch <keith.busch@intel.com> Subject: [RFC PATCH 2/3] blk-mq: Fix timeout and state order Date: Mon, 21 May 2018 17:11:30 -0600 [thread overview] Message-ID: <20180521231131.6685-3-keith.busch@intel.com> (raw) In-Reply-To: <20180521231131.6685-1-keith.busch@intel.com> The block layer had been setting the state to in-flight prior to updating the timer. This is the wrong order since the timeout handler could observe the in-flight state with the older timeout, believing the request had expired when in fact it is just getting started. Signed-off-by: Keith Busch <keith.busch@intel.com> --- block/blk-mq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 8b370ed75605..66e5c768803f 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -713,8 +713,8 @@ void blk_mq_start_request(struct request *rq) preempt_disable(); write_seqcount_begin(&rq->gstate_seq); - blk_mq_rq_update_state(rq, MQ_RQ_IN_FLIGHT); blk_add_timer(rq); + blk_mq_rq_update_state(rq, MQ_RQ_IN_FLIGHT); write_seqcount_end(&rq->gstate_seq); preempt_enable(); -- 2.14.3
WARNING: multiple messages have this Message-ID (diff)
From: keith.busch@intel.com (Keith Busch) Subject: [RFC PATCH 2/3] blk-mq: Fix timeout and state order Date: Mon, 21 May 2018 17:11:30 -0600 [thread overview] Message-ID: <20180521231131.6685-3-keith.busch@intel.com> (raw) In-Reply-To: <20180521231131.6685-1-keith.busch@intel.com> The block layer had been setting the state to in-flight prior to updating the timer. This is the wrong order since the timeout handler could observe the in-flight state with the older timeout, believing the request had expired when in fact it is just getting started. Signed-off-by: Keith Busch <keith.busch at intel.com> --- block/blk-mq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 8b370ed75605..66e5c768803f 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -713,8 +713,8 @@ void blk_mq_start_request(struct request *rq) preempt_disable(); write_seqcount_begin(&rq->gstate_seq); - blk_mq_rq_update_state(rq, MQ_RQ_IN_FLIGHT); blk_add_timer(rq); + blk_mq_rq_update_state(rq, MQ_RQ_IN_FLIGHT); write_seqcount_end(&rq->gstate_seq); preempt_enable(); -- 2.14.3
next prev parent reply other threads:[~2018-05-21 23:11 UTC|newest] Thread overview: 128+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-21 23:11 [RFC PATCH 0/3] blk-mq: Timeout rework Keith Busch 2018-05-21 23:11 ` Keith Busch 2018-05-21 23:11 ` [RFC PATCH 1/3] blk-mq: Reference count request usage Keith Busch 2018-05-21 23:11 ` Keith Busch 2018-05-22 2:27 ` Ming Lei 2018-05-22 2:27 ` Ming Lei 2018-05-22 15:19 ` Christoph Hellwig 2018-05-22 15:19 ` Christoph Hellwig 2018-05-21 23:11 ` Keith Busch [this message] 2018-05-21 23:11 ` [RFC PATCH 2/3] blk-mq: Fix timeout and state order Keith Busch 2018-05-22 2:28 ` Ming Lei 2018-05-22 2:28 ` Ming Lei 2018-05-22 15:24 ` Christoph Hellwig 2018-05-22 15:24 ` Christoph Hellwig 2018-05-22 16:27 ` Bart Van Assche 2018-05-22 16:27 ` Bart Van Assche 2018-05-21 23:11 ` [RFC PATCH 3/3] blk-mq: Remove generation seqeunce Keith Busch 2018-05-21 23:11 ` Keith Busch 2018-05-21 23:29 ` Bart Van Assche 2018-05-21 23:29 ` Bart Van Assche 2018-05-22 14:15 ` Keith Busch 2018-05-22 14:15 ` Keith Busch 2018-05-22 16:29 ` Bart Van Assche 2018-05-22 16:29 ` Bart Van Assche 2018-05-22 16:34 ` Keith Busch 2018-05-22 16:34 ` Keith Busch 2018-05-22 16:48 ` Bart Van Assche 2018-05-22 16:48 ` Bart Van Assche 2018-05-22 2:49 ` Ming Lei 2018-05-22 2:49 ` Ming Lei 2018-05-22 3:16 ` Jens Axboe 2018-05-22 3:16 ` Jens Axboe 2018-05-22 3:47 ` Ming Lei 2018-05-22 3:47 ` Ming Lei 2018-05-22 3:51 ` Jens Axboe 2018-05-22 3:51 ` Jens Axboe 2018-05-22 8:51 ` Ming Lei 2018-05-22 8:51 ` Ming Lei 2018-05-22 14:35 ` Jens Axboe 2018-05-22 14:35 ` Jens Axboe 2018-05-22 14:20 ` Keith Busch 2018-05-22 14:20 ` Keith Busch 2018-05-22 14:37 ` Ming Lei 2018-05-22 14:37 ` Ming Lei 2018-05-22 14:46 ` Keith Busch 2018-05-22 14:46 ` Keith Busch 2018-05-22 14:57 ` Ming Lei 2018-05-22 14:57 ` Ming Lei 2018-05-22 15:01 ` Keith Busch 2018-05-22 15:01 ` Keith Busch 2018-05-22 15:07 ` Ming Lei 2018-05-22 15:07 ` Ming Lei 2018-05-22 15:17 ` Keith Busch 2018-05-22 15:17 ` Keith Busch 2018-05-22 15:23 ` Ming Lei 2018-05-22 15:23 ` Ming Lei 2018-05-22 16:17 ` Christoph Hellwig 2018-05-22 16:17 ` Christoph Hellwig 2018-05-23 0:34 ` Ming Lei 2018-05-23 0:34 ` Ming Lei 2018-05-23 14:35 ` Keith Busch 2018-05-23 14:35 ` Keith Busch 2018-05-24 1:52 ` Ming Lei 2018-05-24 1:52 ` Ming Lei 2018-05-23 5:48 ` Hannes Reinecke 2018-05-23 5:48 ` Hannes Reinecke 2018-07-12 18:16 ` Bart Van Assche 2018-07-12 18:16 ` Bart Van Assche 2018-07-12 19:24 ` Keith Busch 2018-07-12 19:24 ` Keith Busch 2018-07-12 22:24 ` Bart Van Assche 2018-07-12 22:24 ` Bart Van Assche 2018-07-13 1:12 ` jianchao.wang 2018-07-13 1:12 ` jianchao.wang 2018-07-13 2:40 ` jianchao.wang 2018-07-13 2:40 ` jianchao.wang 2018-07-13 15:43 ` Keith Busch 2018-07-13 15:43 ` Keith Busch 2018-07-13 15:52 ` Bart Van Assche 2018-07-13 15:52 ` Bart Van Assche 2018-07-13 18:47 ` Keith Busch 2018-07-13 18:47 ` Keith Busch 2018-07-13 23:03 ` Bart Van Assche 2018-07-13 23:03 ` Bart Van Assche 2018-07-13 23:58 ` Keith Busch 2018-07-13 23:58 ` Keith Busch 2018-07-18 19:56 ` hch 2018-07-18 19:56 ` hch 2018-07-18 20:39 ` hch 2018-07-18 20:39 ` hch 2018-07-18 21:05 ` Bart Van Assche 2018-07-18 21:05 ` Bart Van Assche 2018-07-18 22:53 ` Keith Busch 2018-07-18 22:53 ` Keith Busch 2018-07-18 20:53 ` Keith Busch 2018-07-18 20:53 ` Keith Busch 2018-07-18 20:58 ` Bart Van Assche 2018-07-18 20:58 ` Bart Van Assche 2018-07-18 21:17 ` Keith Busch 2018-07-18 21:17 ` Keith Busch 2018-07-18 21:30 ` Bart Van Assche 2018-07-18 21:30 ` Bart Van Assche 2018-07-18 21:33 ` Keith Busch 2018-07-18 21:33 ` Keith Busch 2018-07-19 13:19 ` hch 2018-07-19 13:19 ` hch 2018-07-19 14:59 ` Keith Busch 2018-07-19 14:59 ` Keith Busch 2018-07-19 15:56 ` Keith Busch 2018-07-19 15:56 ` Keith Busch 2018-07-19 16:04 ` Bart Van Assche 2018-07-19 16:04 ` Bart Van Assche 2018-07-19 16:22 ` Keith Busch 2018-07-19 16:22 ` Keith Busch 2018-07-19 16:29 ` hch 2018-07-19 16:29 ` hch 2018-07-19 20:18 ` Keith Busch 2018-07-19 20:18 ` Keith Busch 2018-07-19 13:22 ` hch 2018-07-19 13:22 ` hch 2018-05-21 23:29 ` [RFC PATCH 0/3] blk-mq: Timeout rework Bart Van Assche 2018-05-21 23:29 ` Bart Van Assche 2018-05-22 14:06 ` Keith Busch 2018-05-22 14:06 ` Keith Busch 2018-05-22 16:30 ` Bart Van Assche 2018-05-22 16:30 ` Bart Van Assche 2018-05-22 16:44 ` Keith Busch 2018-05-22 16:44 ` Keith Busch
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=20180521231131.6685-3-keith.busch@intel.com \ --to=keith.busch@intel.com \ --cc=axboe@kernel.dk \ --cc=bart.vanassche@wdc.com \ --cc=hch@lst.de \ --cc=linux-block@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=ming.lei@redhat.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.