Commit 8e2e2192 authored Sep 26, 2018 by Ilya Dryomov Committed by Greg Kroah-Hartman Oct 13, 2018

blk-mq: I/O and timer unplugs are inverted in blktrace



commit 587562d0c7cd6861f4f90a2eb811cccb1a376f5f upstream.

trace_block_unplug() takes true for explicit unplugs and false for
implicit unplugs.  schedule() unplugs are implicit and should be
reported as timer unplugs.  While correct in the legacy code, this has
been inverted in blk-mq since 4.11.

Cc: stable@vger.kernel.org
Fixes: bd166ef1 ("blk-mq-sched: add framework for MQ capable IO schedulers")
Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 87a9d1cc

block/blk-mq.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1512,7 +1512,7 @@ void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule)
		BUG_ON(!rq->q);
		if (rq->mq_ctx != this_ctx) {
		if (this_ctx) {
		trace_block_unplug(this_q, depth, from_schedule);
		trace_block_unplug(this_q, depth, !from_schedule);
		blk_mq_sched_insert_requests(this_q, this_ctx,
		&ctx_list,
		from_schedule);
		@@ -1532,7 +1532,7 @@ void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule)
		* on 'ctx_list'. Do those.
		*/
		if (this_ctx) {
		trace_block_unplug(this_q, depth, from_schedule);
		trace_block_unplug(this_q, depth, !from_schedule);
		blk_mq_sched_insert_requests(this_q, this_ctx, &ctx_list,
		from_schedule);
		}