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

Commit fe783eea authored by Yang Jihong's avatar Yang Jihong Committed by Greg Kroah-Hartman
Browse files

blktrace: Fix output non-blktrace event when blk_classic option enabled 



[ Upstream commit f596da3efaf4130ff61cd029558845808df9bf99 ]

When the blk_classic option is enabled, non-blktrace events must be
filtered out. Otherwise, events of other types are output in the blktrace
classic format, which is unexpected.

The problem can be triggered in the following ways:

  # echo 1 > /sys/kernel/debug/tracing/options/blk_classic
  # echo 1 > /sys/kernel/debug/tracing/events/enable
  # echo blk > /sys/kernel/debug/tracing/current_tracer
  # cat /sys/kernel/debug/tracing/trace_pipe

Fixes: c71a8961 ("blktrace: add ftrace plugin")
Signed-off-by: default avatarYang Jihong <yangjihong1@huawei.com>
Link: https://lore.kernel.org/r/20221122040410.85113-1-yangjihong1@huawei.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d628d5c5

kernel/trace/blktrace.c

+2 −1
Original line number Diff line number Diff line
@@ -1589,7 +1589,8 @@ blk_trace_event_print_binary(struct trace_iterator *iter, int flags, 


static enum print_line_t blk_tracer_print_line(struct trace_iterator *iter)

{

	if (!(blk_tracer_flags.val & TRACE_BLK_OPT_CLASSIC))

	if ((iter->ent->type != TRACE_BLK) ||

	    !(blk_tracer_flags.val & TRACE_BLK_OPT_CLASSIC))

		return TRACE_TYPE_UNHANDLED;



	return print_one_line(iter, true);