blk-mq-debugfs: Show more request state information (ec6dcf63) · Commits · 戴 / test

Since commit ("blk-mq: remove REQ_ATOM_COMPLETE usages from blk-mq") blk_rq_is_complete() only reports whether or not a request has completed for legacy queues. Hence modify the blk-mq-debugfs code such that it shows the blk-mq request state again. Fixes: ("blk-mq: remove REQ_ATOM_COMPLETE usages from blk-mq") Signed-off-by:

Bart Van Assche <bart.vanassche@wdc.com> Cc: Tejun Heo <tj@kernel.org> Signed-off-by:

Jens Axboe <axboe@kernel.dk>

block/blk-mq-debugfs.c

+15 −1

Original line number	Diff line number	Diff line
		@@ -350,6 +350,20 @@ static const char *const rqf_name[] = {
		};
		#undef RQF_NAME

		static const char *const blk_mq_rq_state_name_array[] = {
		[MQ_RQ_IDLE] = "idle",
		[MQ_RQ_IN_FLIGHT] = "in_flight",
		[MQ_RQ_COMPLETE] = "complete",
		};

		static const char *blk_mq_rq_state_name(enum mq_rq_state rq_state)
		{
		if (WARN_ON_ONCE((unsigned int)rq_state >
		ARRAY_SIZE(blk_mq_rq_state_name_array)))
		return "(?)";
		return blk_mq_rq_state_name_array[rq_state];
		}

		int __blk_mq_debugfs_rq_show(struct seq_file m, struct request rq)
		{
		const struct blk_mq_ops *const mq_ops = rq->q->mq_ops;
		@@ -366,7 +380,7 @@ int __blk_mq_debugfs_rq_show(struct seq_file m, struct request rq)
		seq_puts(m, ", .rq_flags=");
		blk_flags_show(m, (__force unsigned int)rq->rq_flags, rqf_name,
		ARRAY_SIZE(rqf_name));
		seq_printf(m, ", complete=%d", blk_rq_is_complete(rq));
		seq_printf(m, ", .state=%s", blk_mq_rq_state_name(blk_mq_rq_state(rq)));
		seq_printf(m, ", .tag=%d, .internal_tag=%d", rq->tag,
		rq->internal_tag);
		if (mq_ops->show_rq)

Admin message