Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1733431

[PATCH] tracing: fix trace_pipe behavior for instance traces

Show all headers | View raw

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

Signed-off-by: Tahsin Erdogan <tahsin@google.com>
---
 kernel/trace/trace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 5360b7aec57a..f8d986d736b7 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -5667,7 +5667,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);
-- 
2.14.1.690.gbb1197296e-goog

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] tracing: fix trace_pipe behavior for instance traces Tahsin Erdogan <tahsin@google.com> - 2017-09-17 12:30 +0200

csiph-web