Commit 75df6e68 authored Sep 17, 2017 by Tahsin Erdogan Committed by Steven Rostedt (VMware) Sep 19, 2017

tracing: Fix trace_pipe behavior for instance traces

When reading data from trace_pipe, tracing_wait_pipe() performs a
check to see if tracing has been turned off after some data was read.
Currently, this check always looks at global trace state, but it
should be checking the trace instance where trace_pipe is located at.

Because of this bug, cat instances/i1/trace_pipe in the following
script will immediately exit instead of waiting for data:

cd /sys/kernel/debug/tracing
echo 0 > tracing_on
mkdir -p instances/i1
echo 1 > instances/i1/tracing_on
echo 1 > instances/i1/events/sched/sched_process_exec/enable
cat instances/i1/trace_pipe

Link: http://lkml.kernel.org/r/20170917102348.1615-1-tahsin@google.com



Cc: stable@vger.kernel.org
Fixes: 10246fa3 ("tracing: give easy way to clear trace buffer")
Signed-off-by: Tahsin Erdogan <tahsin@google.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

parent c7b3ae0b

kernel/trace/trace.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -5680,7 +5680,7 @@ static int tracing_wait_pipe(struct file *filp)
		*
		* iter->pos will be 0 if we haven't read anything.
		*/
		if (!tracing_is_on() && iter->pos)
		if (!tracer_tracing_is_on(iter->tr) && iter->pos)
		break;

		mutex_unlock(&iter->mutex);

Admin message