Skip to content

ftrace: updates for tip

Steven Rostedt lkml 2 versions In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest7 patches 2 repliesIn review
  2. v14 patches 12 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7ring-buffer: add NMI protection for spinlocksarch/x86/Kconfig arch/x86/kernel/ftrace.c include/linux/ftrace_irq.h +2 more+68 -72 replies
2/7ring-buffer: allow tracing_off to be used in core kernel codeinclude/linux/ring_buffer.h+9 -00 replies
3/7ftrace, x86: rename in_nmi variablearch/x86/kernel/ftrace.c+11 -110 replies
4/7nmi: add generic nmi tracking stateinclude/linux/hardirq.h+15 -00 replies
5/7ftrace: change function graph tracer to use new in_nmiarch/x86/Kconfig arch/x86/kernel/ftrace.c+2 -210 replies
6/7ring-buffer: use generic version of in_nmiarch/x86/kernel/ftrace.c include/linux/ftrace_irq.h kernel/trace/ring_buffer.c+15 -400 replies
7/7trace: trivial fixes in comment typos.include/linux/ftrace.h kernel/trace/ftrace.c kernel/trace/trace.h+7 -70 replies

Reviews trailers per patch

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

Read the v2 thread

Cover letter [PATCH v2 0/7] ftrace: updates for tip

Ingo,

This is still based off of tip/master since it is not all focused on ftrace (has NMI generic code). I'll let you cherry pick and figure out what goes where.

I tried to cherry pick them into tracing/ftrace and hit a bit of conflicts. Next time, I'll just develop against tip/tracing/ftrace or tip/tracing/core.

Changes since the first version:

- Added Mathieu Desnoyers credit in the in_nmi change log.

- Included the original ring buffer changes which these are based on and that I do not see in tip/master.

- Added a comment fix patch by Wenji.

The following patches are in:

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

branch: tip/devel

Steven Rostedt (6):
ring-buffer: add NMI protection for spinlocks
ring-buffer: allow tracing_off to be used in core kernel code ftrace, x86: rename in_nmi variable
nmi: add generic nmi tracking state
ftrace: change function graph tracer to use new in_nmi
ring-buffer: use generic version of in_nmi

Wenji Huang (1):
trace: trivial fixes in comment typos.

----

 arch/x86/Kconfig            |    1 +
 arch/x86/kernel/ftrace.c    |   35 ++++++++---------------------------
 include/linux/ftrace.h      |    2 +-
 include/linux/ftrace_irq.h  |    2 +-
 include/linux/hardirq.h     |   15 +++++++++++++++
 include/linux/ring_buffer.h |    9 +++++++++
 kernel/trace/Kconfig        |    8 ++++++++
 kernel/trace/ftrace.c       |    6 +++---
 kernel/trace/ring_buffer.c  |   31 +++++++++++++++++++++++++++++--
 kernel/trace/trace.h        |    6 +++---
 10 files changed, 78 insertions(+), 37 deletions(-)