This is a note to let you know that I've just added the patch titled
tracing: Keep overwrite in sync between regular and snapshot buffers
to the 3.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
tracing-keep-overwrite-in-sync-between-regular-and-snapshot-buffers.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 80902822658aab18330569587cdb69ac1dfdcea8 Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (Red Hat)" <rostedt@xxxxxxxxxxx>
Date: Thu, 14 Mar 2013 14:20:54 -0400
Subject: tracing: Keep overwrite in sync between regular and snapshot buffers
From: "Steven Rostedt (Red Hat)" <rostedt@xxxxxxxxxxx>
commit 80902822658aab18330569587cdb69ac1dfdcea8 upstream.
Changing the overwrite mode for the ring buffer via the trace
option only sets the normal buffer. But the snapshot buffer could
swap with it, and then the snapshot would be in non overwrite mode
and the normal buffer would be in overwrite mode, even though the
option flag states otherwise.
Keep the two buffers overwrite modes in sync.
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Rui Xiang <rui.xiang@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
kernel/trace/trace.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2782,8 +2782,12 @@ int set_tracer_flag(unsigned int mask, i
if (mask == TRACE_ITER_RECORD_CMD)
trace_event_enable_cmd_record(enabled);
- if (mask == TRACE_ITER_OVERWRITE)
+ if (mask == TRACE_ITER_OVERWRITE) {
ring_buffer_change_overwrite(global_trace.buffer, enabled);
+#ifdef CONFIG_TRACER_MAX_TRACE
+ ring_buffer_change_overwrite(max_tr.buffer, enabled);
+#endif
+ }
return 0;
}
Patches currently in stable-queue which might be from rostedt@xxxxxxxxxxx are
queue-3.4/tracing-keep-overwrite-in-sync-between-regular-and-snapshot-buffers.patch
queue-3.4/ftrace-module-hardcode-ftrace_module_init-call-into-load_module.patch
queue-3.4/futex-add-another-early-deadlock-detection-check.patch
queue-3.4/futex-prevent-attaching-to-kernel-threads.patch
queue-3.4/trace-module-maintain-a-valid-user-count.patch
queue-3.4/ftrace-check-module-functions-being-traced-on-reload.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html