x86, stacktrace: avoid recording save_stack_trace wrappers
Subsystems (2)
PATCH 1/1 x86, stacktrace: avoid recording save_stack_trace wrappers
The save_stack_trace() and save_stack_trace_tsk() wrappers of __save_stack_trace() add themselves to the call stack, and thus appear in the recorded stacktraces. This is redundant and wasteful when we have limited space to record the useful part of the backtrace with e.g. page_owner functionality.
Fix this by making sure __save_stack_trace() is noinline (which matches the current gcc decision) and bumping the skip in the wrappers. This is similar to what was done for arm in 3683f44c42e9 ("ARM: stacktrace: avoid listing stacktrace functions in stacktrace") and is pending for arm64.
--- arch/x86/kernel/stacktrace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/kernel/stacktrace.c +3 -1
@@ -30,7 +30,7 @@ static int save_stack_address(struct stack_trace *trace, unsigned long addr,return 0 ; } -static void __save_stack_trace (struct stack_trace *trace, +static void noinline __save_stack_trace(struct stack_trace *trace,struct task_struct *task,struct pt_regs *regs,bool nosched) {
@@ -56,6 +56,7 @@ static void __save_stack_trace(struct stack_trace *trace,*/ void save_stack_trace (struct stack_trace *trace) { + trace->skip++;__save_stack_trace (trace, current,NULL , false); }EXPORT_SYMBOL_GPL (save_stack_trace);
@@ -70,6 +71,7 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)if (!try_get_task_stack (tsk))return ; + trace->skip++;__save_stack_trace (trace, tsk,NULL , true);put_task_stack (tsk);
Signature · 1 line
2.14.1
Quoted 37 lines · Vlastimil Babka
The
save_stack_trace()andsave_stack_trace_tsk()wrappers of__save_stack_trace()add themselves to the call stack, and thus appear in the recorded stacktraces. This is redundant and wasteful when we have limited space to record the useful part of the backtrace with e.g.page_ownerfunctionality.Fix this by making sure
__save_stack_trace()is noinline (which matches the current gcc decision) and bumping the skip in the wrappers. This is similar to what was done for arm in3683f44c42e9("ARM: stacktrace: avoid listing stacktrace functions in stacktrace") and is pending for arm64.Signed-off-by Vlastimil Babka <[email protected]>--- arch/x86/kernel/stacktrace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)arch/x86/kernel/stacktrace.c +2
-1@@ -30,7 +30,7 @@ static int save_stack_address(struct stack_trace *trace, unsigned long addr,return 0 ; } -static void __save_stack_trace (struct stack_trace *trace, +static void noinline __save_stack_trace(struct stack_trace *trace,struct task_struct *task,struct pt_regs *regs,bool nosched) {@@ -56,6 +56,7 @@ static void __save_stack_trace(struct stack_trace *trace,*/ void save_stack_trace (struct stack_trace *trace) { + trace->skip++;__save_stack_trace (trace, current,NULL , false); }EXPORT_SYMBOL_GPL (save_stack_trace);
arch/x86/kernel/stacktrace.c void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) · line 77
Quoted 7 lines
arch/x86/kernel/stacktrace.c +1
-0@@ -70,6 +71,7 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)if (!try_get_task_stack (tsk))return ; + trace->skip++;__save_stack_trace (trace, tsk,NULL , true);put_task_stack (tsk);
save_stack_trace_tsk() is usually called for other tasks, in which case these functions aren't on the stack. So the skip should only be done when task == current.
Also, I think __save_stack_trace_reliable() should be made __always_inline (which matches its current GCC behavior) so that it doesn't accidentally get this problem in the future.
Signature · 1 line
Josh
PATCH v2 1/1 x86, stacktrace: avoid recording save_stack_trace wrappers
In reply to Vlastimil BabkaThe save_stack_trace() and save_stack_trace_tsk() wrappers of __save_stack_trace() add themselves to the call stack, and thus appear in the recorded stacktraces. This is redundant and wasteful when we have limited space to record the useful part of the backtrace with e.g. page_owner functionality.
Fix this by making sure __save_stack_trace() is noinline (which matches the current gcc decision) and bumping the skip in the wrappers (save_stack_trace_tsk() only when called for the current task). This is similar to what was done for arm in 3683f44c42e9 ("ARM: stacktrace: avoid listing stacktrace functions in stacktrace") and is pending for arm64.
Also make sure that __save_stack_trace_reliable() doesn't get this problem in the future by marking it __always_inline (which matches current gcc decision), per Josh Poimboeuf.
---
v2: save_stack_trace_tsk(): skip only when tsk == current; make
__save_stack_trace_reliable() __always_inline (both suggested by Josh)
arch/x86/kernel/stacktrace.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
arch/x86/kernel/stacktrace.c +7 -3
@@ -30,7 +30,7 @@ static int save_stack_address(struct stack_trace *trace, unsigned long addr,return 0 ; } -static void __save_stack_trace (struct stack_trace *trace, +static void noinline __save_stack_trace(struct stack_trace *trace,struct task_struct *task,struct pt_regs *regs,bool nosched) {
@@ -56,6 +56,7 @@ static void __save_stack_trace(struct stack_trace *trace,*/ void save_stack_trace (struct stack_trace *trace) { + trace->skip++;__save_stack_trace (trace, current,NULL , false); }EXPORT_SYMBOL_GPL (save_stack_trace);
@@ -70,6 +71,8 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)if (!try_get_task_stack (tsk))return ; +if (tsk == current) + trace->skip++;__save_stack_trace (trace, tsk,NULL , true);put_task_stack (tsk);
@@ -88,8 +91,9 @@ EXPORT_SYMBOL_GPL(save_stack_trace_tsk); } \ }) -static int __save_stack_trace_reliable (struct stack_trace *trace, -struct task_struct *task) +static int __always_inline +__save_stack_trace_reliable (struct stack_trace *trace, +struct task_struct *task) {struct unwind_state state;struct pt_regs *regs;
Signature · 1 line
2.14.1
Quoted 11 lines · Vlastimil Babka
The
save_stack_trace()andsave_stack_trace_tsk()wrappers of__save_stack_trace()add themselves to the call stack, and thus appear in the recorded stacktraces. This is redundant and wasteful when we have limited space to record the useful part of the backtrace with e.g.page_ownerfunctionality.Fix this by making sure
__save_stack_trace()is noinline (which matches the current gcc decision) and bumping the skip in the wrappers (save_stack_trace_tsk()only when called for the current task). This is similar to what was done for arm in3683f44c42e9("ARM: stacktrace: avoid listing stacktrace functions in stacktrace") and is pending for arm64.
Quoted 5 lines
Also make sure that
__save_stack_trace_reliable()doesn't get this problem in the future by marking it__always_inline(which matches current gcc decision), per Josh Poimboeuf.Signed-off-by Vlastimil Babka <[email protected]>
Signature · 1 line
Josh
tip-bot for Vlastimil Babka
merge bot[tip:x86/debug] x86/stacktrace: Avoid recording save_stack_trace() wrappers
In reply to Vlastimil Babkax86/stacktrace: Avoid recording save_stack_trace() wrappers
Commit-ID: 77072f09eab19326dd2424c8dad0a443341a228f Gitweb: https://git.kernel.org/tip/77072f09eab19326dd2424c8dad0a443341a228f Author: Vlastimil Babka <[email protected]> AuthorDate: Fri, 29 Sep 2017 11:23:35 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 29 Sep 2017 19:44:03 +0200
x86/stacktrace: Avoid recording save_stack_trace() wrappers
The save_stack_trace() and save_stack_trace_tsk() wrappers of __save_stack_trace() add themselves to the call stack, and thus appear in the recorded stacktraces. This is redundant and wasteful when we have limited space to record the useful part of the backtrace with e.g. page_owner functionality.
Fix this by making sure __save_stack_trace() is noinline (which matches the current gcc decision) and bumping the skip in the wrappers (save_stack_trace_tsk() only when called for the current task). This is similar to what was done for arm in 3683f44c42e9 ("ARM: stacktrace: avoid listing stacktrace functions in stacktrace") and is pending for arm64.
Also make sure that __save_stack_trace_reliable() doesn't get this problem in the future by marking it __always_inline (which matches current gcc decision), per Josh Poimboeuf.
--- arch/x86/kernel/stacktrace.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
arch/x86/kernel/stacktrace.c +7 -3
@@ -30,7 +30,7 @@ static int save_stack_address(struct stack_trace *trace, unsigned long addr,return 0 ; } -static void __save_stack_trace (struct stack_trace *trace, +static void noinline __save_stack_trace(struct stack_trace *trace,struct task_struct *task,struct pt_regs *regs,bool nosched) {
@@ -56,6 +56,7 @@ static void __save_stack_trace(struct stack_trace *trace,*/ void save_stack_trace (struct stack_trace *trace) { + trace->skip++;__save_stack_trace (trace, current,NULL , false); }EXPORT_SYMBOL_GPL (save_stack_trace);
@@ -70,6 +71,8 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)if (!try_get_task_stack (tsk))return ; +if (tsk == current) + trace->skip++;__save_stack_trace (trace, tsk,NULL , true);put_task_stack (tsk);
@@ -88,8 +91,9 @@ EXPORT_SYMBOL_GPL(save_stack_trace_tsk); } \ }) -static int __save_stack_trace_reliable (struct stack_trace *trace, -struct task_struct *task) +static int __always_inline +__save_stack_trace_reliable (struct stack_trace *trace, +struct task_struct *task) {struct unwind_state state;struct pt_regs *regs;