perf updates
Subsystems (2)
Ingo,
Please pull the perf/core branch that can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
perf/core
I'm only posting Oleg's patches as only those are new in my queues.
Thanks,
Frederic
---
Frederic Weisbecker (2):
x86: Unify dumpstack.h and stacktrace.h
perf: Drop the skip argument from perf_arch_fetch_regs_caller
Oleg Nesterov (2):
x86: Make save_stack_address() !CONFIG_FRAME_POINTER friendly
x86: Unify save_stack_address() and save_stack_address_nosched()
Américo Wang (1):
tracing: Remove boot tracer
Li Zefan (1):
tracing: Remove kmemtrace ftrace plugin
Documentation/ABI/testing/debugfs-kmemtrace | 71 ---- Documentation/trace/kmemtrace.txt | 126 ------- MAINTAINERS | 7 - arch/powerpc/include/asm/perf_event.h | 12 + arch/powerpc/kernel/misc.S | 26 -- arch/sparc/include/asm/perf_event.h | 8 + arch/sparc/kernel/helpers.S | 6 +- arch/x86/include/asm/perf_event.h | 13 + arch/x86/include/asm/stacktrace.h | 49 +++ arch/x86/kernel/cpu/perf_event.c | 18 - arch/x86/kernel/dumpstack.c | 1 - arch/x86/kernel/dumpstack.h | 56 --- arch/x86/kernel/dumpstack_32.c | 2 - arch/x86/kernel/dumpstack_64.c | 1 - arch/x86/kernel/stacktrace.c | 31 +- include/linux/kmemtrace.h | 25 -- include/linux/perf_event.h | 32 +-- include/linux/slab_def.h | 3 +- include/linux/slub_def.h | 3 +- include/trace/boot.h | 60 --- include/trace/ftrace.h | 2 +- init/main.c | 29 +- kernel/perf_event.c | 5 - kernel/trace/Kconfig | 37 -- kernel/trace/Makefile | 2 - kernel/trace/kmemtrace.c | 529 --------------------------- kernel/trace/trace.c | 3 - kernel/trace/trace.h | 20 - kernel/trace/trace_boot.c | 185 ---------- kernel/trace/trace_entries.h | 62 ---- kernel/trace/trace_event_perf.c | 2 - mm/slab.c | 1 - mm/slub.c | 1 - 33 files changed, 123 insertions(+), 1305 deletions(-)
PATCH 1/2 x86: Make save_stack_address() !CONFIG_FRAME_POINTER friendly
From: Oleg Nesterov <[email protected]>
If CONFIG_FRAME_POINTER=n, print_context_stack() shouldn't neglect the non-reliable addresses on stack, this is all we have if dump_trace(bp) is called with the wrong or zero bp.
For example, /proc/pid/stack doesn't work if CONFIG_FRAME_POINTER=n.
This patch obviously has no effect if CONFIG_FRAME_POINTER=y, otherwise it reverts 1650743c "x86: don't save unreliable stack trace entries".
Also, remove the unnecessary type-cast.
LKML-Reference: <[email protected]>
--- arch/x86/kernel/stacktrace.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
arch/x86/kernel/stacktrace.c +5 -1
@@ -26,8 +26,10 @@ static int save_stack_stack(void *data, char *name)static void save_stack_address (void *data,unsigned long addr,int reliable) {struct stack_trace *trace = data; +#ifdef CONFIG_FRAME_POINTER if (!reliable)return ; +#endif if (trace->skip >0 ) { trace->skip--;return ;
@@ -39,9 +41,11 @@ static void save_stack_address(void *data, unsigned long addr, int reliable)static void save_stack_address_nosched (void *data,unsigned long addr,int reliable) { -struct stack_trace *trace = (struct stack_trace *)data; +struct stack_trace *trace = data; +#ifdef CONFIG_FRAME_POINTER if (!reliable)return ; +#endif if (in_sched_functions (addr))return ;if (trace->skip >0 ) {
Signature · 1 line
1.6.2.3
PATCH 2/2 x86: Unify save_stack_address() and save_stack_address_nosched()
In reply to Frederic WeisbeckerFrom: Oleg Nesterov <[email protected]>
Cleanup. Factor the common code in save_stack_address() and save_stack_address_nosched().
LKML-Reference: <[email protected]>
--- arch/x86/kernel/stacktrace.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-)
arch/x86/kernel/stacktrace.c +10 -14
@@ -23,13 +23,16 @@ static int save_stack_stack(void *data, char *name)return 0 ; } -static void save_stack_address (void *data,unsigned long addr,int reliable) +static void +__save_stack_address (void *data,unsigned long addr,bool reliable,bool nosched) {struct stack_trace *trace = data;#ifdef CONFIG_FRAME_POINTER if (!reliable)return ;#endif +if (nosched &&in_sched_functions (addr)) +return ;if (trace->skip >0 ) { trace->skip--;return ;
@@ -38,22 +41,15 @@ static void save_stack_address(void *data, unsigned long addr, int reliable) trace->entries[trace->nr_entries++] = addr; } +static void save_stack_address (void *data,unsigned long addr,int reliable) +{ +return __save_stack_address (data, addr, reliable, false); +} +static void save_stack_address_nosched (void *data,unsigned long addr,int reliable) { -struct stack_trace *trace = data; -#ifdef CONFIG_FRAME_POINTER -if (!reliable) -return ; -#endif -if (in_sched_functions (addr)) -return ; -if (trace->skip >0 ) { - trace->skip--; -return ; - } -if (trace->nr_entries < trace->max_entries) - trace->entries[trace->nr_entries++] = addr; +return __save_stack_address (data, addr, reliable, true); }static const struct stacktrace_ops save_stack_ops = {
Signature · 1 line
1.6.2.3
Quoted 54 lines · Frederic Weisbecker
Ingo,
Please pull the perf/core branch that can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
perf/coreI'm only posting Oleg's patches as only those are new in my queues.
Thanks,
Frederic
---Frederic Weisbecker (2):
x86: Unifydumpstack.handstacktrace.h
perf: Drop the skip argument fromperf_arch_fetch_regs_callerOleg Nesterov (2):
x86: Makesave_stack_address()!CONFIG_FRAME_POINTER friendly
x86: Unifysave_stack_address()andsave_stack_address_nosched()Américo Wang (1):
tracing: Remove boot tracerLi Zefan (1):
tracing: Remove kmemtrace ftrace pluginDocumentation/ABI/testing/debugfs-kmemtrace | 71 ---- Documentation/trace/kmemtrace.txt | 126 ------- MAINTAINERS | 7 - arch/powerpc/include/asm/perf_event.h | 12 + arch/powerpc/kernel/misc.S | 26 -- arch/sparc/include/asm/perf_event.h | 8 + arch/sparc/kernel/helpers.S | 6 +- arch/x86/include/asm/perf_event.h | 13 + arch/x86/include/asm/stacktrace.h | 49 +++ arch/x86/kernel/cpu/perf_event.c | 18 - arch/x86/kernel/dumpstack.c | 1 - arch/x86/kernel/dumpstack.h | 56 --- arch/x86/kernel/dumpstack_32.c | 2 - arch/x86/kernel/dumpstack_64.c | 1 - arch/x86/kernel/stacktrace.c | 31 +- include/linux/kmemtrace.h | 25 -- include/linux/perf_event.h | 32 +-- include/linux/slab_def.h | 3 +- include/linux/slub_def.h | 3 +- include/trace/boot.h | 60 --- include/trace/ftrace.h | 2 +- init/main.c | 29 +- kernel/perf_event.c | 5 - kernel/trace/Kconfig | 37 -- kernel/trace/Makefile | 2 - kernel/trace/kmemtrace.c | 529 ---------------------------
Quoted 8 lines
kernel/trace/trace.c | 3 - kernel/trace/trace.h | 20 - kernel/trace/trace_boot.c | 185 ---------- kernel/trace/trace_entries.h | 62 ---- kernel/trace/trace_event_perf.c | 2 - mm/slab.c | 1 - mm/slub.c | 1 - 33 files changed, 123 insertions(+), 1305 deletions(-)
Pulled, thanks a lot Frederic!
Ingo