Skip to content

ftrace updates for 2.6.28

Steven Rostedt linux-next lkml 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest2 patches 6 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2ftrace: disable tracing on resizekernel/trace/trace.c+16 -14 replies
2/2ring-buffer: prevent infinite looping on time stampingkernel/trace/ring_buffer.c+1 -10 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/2] ftrace updates for 2.6.28

Stephen and Ingo,

The following patches are needed for 2.6.28. The first one solves a bug where the resizing of the buffer array was not protected against modifications by ftrace.

The second patch solves an issue tha Thomas Gleixner was seeing where the tracer would detect the infinite recursion too easily by tracing the timer code. This patch prevents the loop from happening and still does not lose any trace entries.

The changes caused by these patches are low in risk, but I would still like to put them through linux-next before passing them off to Linus.

Note, these changes are based against Linus's mainline and not tip. Also note that the branch in this tree is "devel" and not "tip/devel".

The following patches are in:

git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git

branch: devel

Steven Rostedt (2):
ftrace: disable tracing on resize
ring-buffer: prevent infinite looping on time stamping

----

 kernel/trace/ring_buffer.c |    2 +-
 kernel/trace/trace.c       |   17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)