* [for-next][PATCH 05/30] arm64: function_graph: Remove use of FTRACE_NOTRACE_DEPTH [not found] <20181205234749.372720574@goodmis.org> @ 2018-12-05 23:47 ` Steven Rostedt 2018-12-06 3:55 ` Steven Rostedt 2018-12-06 15:49 ` Will Deacon 0 siblings, 2 replies; 4+ messages in thread From: Steven Rostedt @ 2018-12-05 23:47 UTC (permalink / raw) To: linux-kernel Cc: Tom Zanussi, Catalin Marinas, Will Deacon, Ravi Bangoria, Masami Hiramatsu, Joel Fernandes (Google), Namhyung Kim, Andrew Morton, Ingo Molnar, linux-arm-kernel From: "Steven Rostedt (VMware)" <rostedt@goodmis.org> Functions in the set_graph_notrace no longer subtract FTRACE_NOTRACE_DEPTH from curr_ret_stack, as that is now implemented via the trace_recursion flags. Access to curr_ret_stack no longer needs to worry about checking for this. curr_ret_stack is still initialized to -1, when there's not a shadow stack allocated. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: linux-arm-kernel@lists.infradead.org Reviewed-by: Joel Fernandes (Google) <joel@joelfernandes.org> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> --- arch/arm64/kernel/stacktrace.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c index 4989f7ea1e59..7723dadf25be 100644 --- a/arch/arm64/kernel/stacktrace.c +++ b/arch/arm64/kernel/stacktrace.c @@ -61,9 +61,6 @@ int notrace unwind_frame(struct task_struct *tsk, struct stackframe *frame) (frame->pc == (unsigned long)return_to_handler)) { if (WARN_ON_ONCE(frame->graph == -1)) return -EINVAL; - if (frame->graph < -1) - frame->graph += FTRACE_NOTRACE_DEPTH; - /* * This is a case where function graph tracer has * modified a return address (LR) in a stack frame -- 2.19.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [for-next][PATCH 05/30] arm64: function_graph: Remove use of FTRACE_NOTRACE_DEPTH 2018-12-05 23:47 ` [for-next][PATCH 05/30] arm64: function_graph: Remove use of FTRACE_NOTRACE_DEPTH Steven Rostedt @ 2018-12-06 3:55 ` Steven Rostedt 2018-12-06 15:49 ` Will Deacon 1 sibling, 0 replies; 4+ messages in thread From: Steven Rostedt @ 2018-12-06 3:55 UTC (permalink / raw) To: linux-kernel Cc: Tom Zanussi, Catalin Marinas, Will Deacon, Ravi Bangoria, Masami Hiramatsu, Joel Fernandes (Google), Namhyung Kim, Andrew Morton, Ingo Molnar, linux-arm-kernel On Wed, 05 Dec 2018 18:47:54 -0500 Steven Rostedt <rostedt@goodmis.org> wrote: > From: "Steven Rostedt (VMware)" <rostedt@goodmis.org> > > Functions in the set_graph_notrace no longer subtract FTRACE_NOTRACE_DEPTH > from curr_ret_stack, as that is now implemented via the trace_recursion > flags. Access to curr_ret_stack no longer needs to worry about checking for > this. curr_ret_stack is still initialized to -1, when there's not a shadow > stack allocated. > > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will.deacon@arm.com> I haven't pushed this to Linux next yet. I tested the entire tree as well as crossed compiled it against arm64. Can you give me an ack for this patch? Thanks! -- Steve > Cc: linux-arm-kernel@lists.infradead.org > Reviewed-by: Joel Fernandes (Google) <joel@joelfernandes.org> > Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> > --- > arch/arm64/kernel/stacktrace.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c > index 4989f7ea1e59..7723dadf25be 100644 > --- a/arch/arm64/kernel/stacktrace.c > +++ b/arch/arm64/kernel/stacktrace.c > @@ -61,9 +61,6 @@ int notrace unwind_frame(struct task_struct *tsk, struct stackframe *frame) > (frame->pc == (unsigned long)return_to_handler)) { > if (WARN_ON_ONCE(frame->graph == -1)) > return -EINVAL; > - if (frame->graph < -1) > - frame->graph += FTRACE_NOTRACE_DEPTH; > - > /* > * This is a case where function graph tracer has > * modified a return address (LR) in a stack frame _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [for-next][PATCH 05/30] arm64: function_graph: Remove use of FTRACE_NOTRACE_DEPTH 2018-12-05 23:47 ` [for-next][PATCH 05/30] arm64: function_graph: Remove use of FTRACE_NOTRACE_DEPTH Steven Rostedt 2018-12-06 3:55 ` Steven Rostedt @ 2018-12-06 15:49 ` Will Deacon 2018-12-06 15:55 ` Steven Rostedt 1 sibling, 1 reply; 4+ messages in thread From: Will Deacon @ 2018-12-06 15:49 UTC (permalink / raw) To: Steven Rostedt Cc: Tom Zanussi, Catalin Marinas, linux-kernel, Ravi Bangoria, Masami Hiramatsu, Joel Fernandes (Google), Namhyung Kim, Andrew Morton, Ingo Molnar, linux-arm-kernel On Wed, Dec 05, 2018 at 06:47:54PM -0500, Steven Rostedt wrote: > From: "Steven Rostedt (VMware)" <rostedt@goodmis.org> > > Functions in the set_graph_notrace no longer subtract FTRACE_NOTRACE_DEPTH > from curr_ret_stack, as that is now implemented via the trace_recursion > flags. Access to curr_ret_stack no longer needs to worry about checking for > this. curr_ret_stack is still initialized to -1, when there's not a shadow > stack allocated. > > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will.deacon@arm.com> > Cc: linux-arm-kernel@lists.infradead.org > Reviewed-by: Joel Fernandes (Google) <joel@joelfernandes.org> > Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> > --- > arch/arm64/kernel/stacktrace.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c > index 4989f7ea1e59..7723dadf25be 100644 > --- a/arch/arm64/kernel/stacktrace.c > +++ b/arch/arm64/kernel/stacktrace.c > @@ -61,9 +61,6 @@ int notrace unwind_frame(struct task_struct *tsk, struct stackframe *frame) > (frame->pc == (unsigned long)return_to_handler)) { > if (WARN_ON_ONCE(frame->graph == -1)) > return -EINVAL; > - if (frame->graph < -1) > - frame->graph += FTRACE_NOTRACE_DEPTH; > - Acked-by: Will Deacon <will.deacon@arm.com> Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [for-next][PATCH 05/30] arm64: function_graph: Remove use of FTRACE_NOTRACE_DEPTH 2018-12-06 15:49 ` Will Deacon @ 2018-12-06 15:55 ` Steven Rostedt 0 siblings, 0 replies; 4+ messages in thread From: Steven Rostedt @ 2018-12-06 15:55 UTC (permalink / raw) To: Will Deacon Cc: Tom Zanussi, Catalin Marinas, linux-kernel, Ravi Bangoria, Masami Hiramatsu, Joel Fernandes (Google), Namhyung Kim, Andrew Morton, Ingo Molnar, linux-arm-kernel On Thu, 6 Dec 2018 15:49:32 +0000 Will Deacon <will.deacon@arm.com> wrote: > On Wed, Dec 05, 2018 at 06:47:54PM -0500, Steven Rostedt wrote: > > From: "Steven Rostedt (VMware)" <rostedt@goodmis.org> > > > > Functions in the set_graph_notrace no longer subtract FTRACE_NOTRACE_DEPTH > > from curr_ret_stack, as that is now implemented via the trace_recursion > > flags. Access to curr_ret_stack no longer needs to worry about checking for > > this. curr_ret_stack is still initialized to -1, when there's not a shadow > > stack allocated. > > > > Cc: Catalin Marinas <catalin.marinas@arm.com> > > Cc: Will Deacon <will.deacon@arm.com> > > Cc: linux-arm-kernel@lists.infradead.org > > Reviewed-by: Joel Fernandes (Google) <joel@joelfernandes.org> > > Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> > > --- > > arch/arm64/kernel/stacktrace.c | 3 --- > > 1 file changed, 3 deletions(-) > > > > diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c > > index 4989f7ea1e59..7723dadf25be 100644 > > --- a/arch/arm64/kernel/stacktrace.c > > +++ b/arch/arm64/kernel/stacktrace.c > > @@ -61,9 +61,6 @@ int notrace unwind_frame(struct task_struct *tsk, struct stackframe *frame) > > (frame->pc == (unsigned long)return_to_handler)) { > > if (WARN_ON_ONCE(frame->graph == -1)) > > return -EINVAL; > > - if (frame->graph < -1) > > - frame->graph += FTRACE_NOTRACE_DEPTH; > > - > > Acked-by: Will Deacon <will.deacon@arm.com> > Thanks Will! -- Steve _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-12-06 15:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20181205234749.372720574@goodmis.org>
2018-12-05 23:47 ` [for-next][PATCH 05/30] arm64: function_graph: Remove use of FTRACE_NOTRACE_DEPTH Steven Rostedt
2018-12-06 3:55 ` Steven Rostedt
2018-12-06 15:49 ` Will Deacon
2018-12-06 15:55 ` Steven Rostedt
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).