Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 587562d0 authored by Ilya Dryomov's avatar Ilya Dryomov Committed by Jens Axboe
Browse files

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



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: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0f843e65

block/blk-mq.c

+2 −2
Original line number Diff line number Diff line
@@ -1628,7 +1628,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);
@@ -1648,7 +1648,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);

	}