From: "Paul E. McKenney" <paulmck@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-kernel@vger.kernel.org, Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
stable@vger.kernel.org,
"Joel Fernandes (Google)" <joel@joelfernandes.org>
Subject: Re: [for-next][PATCH 1/5] ftrace: Protect ftrace_graph_hash with ftrace_sync
Date: Wed, 5 Feb 2020 14:28:09 -0800 [thread overview]
Message-ID: <20200205222809.GD2935@paulmck-ThinkPad-P72> (raw)
In-Reply-To: <20200205222142.810675558@goodmis.org>
On Wed, Feb 05, 2020 at 05:21:11PM -0500, Steven Rostedt wrote:
> From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
>
> As function_graph tracer can run when RCU is not "watching", it can not be
> protected by synchronize_rcu() it requires running a task on each CPU before
> it can be freed. Calling schedule_on_each_cpu(ftrace_sync) needs to be used.
>
> Link: https://lore.kernel.org/r/20200205131110.GT2935@paulmck-ThinkPad-P72
>
> Cc: stable@vger.kernel.org
> Fixes: b9b0c831bed26 ("ftrace: Convert graph filter to use hash tables")
> Reported-by: "Paul E. McKenney" <paulmck@kernel.org>
> Reviewed-by: Joel Fernandes (Google) <joel@joelfernandes.org>
> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Nice! If there is much more call for this, perhaps I should take a hint
from the ftrace_sync() comment and add synchronize_rcu_rude(). ;-)
Reviewed-by: "Paul E. McKenney" <paulmck@kernel.org>
> ---
> kernel/trace/ftrace.c | 11 +++++++++--
> kernel/trace/trace.h | 2 ++
> 2 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index 481ede3eac13..3f7ee102868a 100644
> --- a/kernel/trace/ftrace.c
> +++ b/kernel/trace/ftrace.c
> @@ -5867,8 +5867,15 @@ ftrace_graph_release(struct inode *inode, struct file *file)
>
> mutex_unlock(&graph_lock);
>
> - /* Wait till all users are no longer using the old hash */
> - synchronize_rcu();
> + /*
> + * We need to do a hard force of sched synchronization.
> + * This is because we use preempt_disable() to do RCU, but
> + * the function tracers can be called where RCU is not watching
> + * (like before user_exit()). We can not rely on the RCU
> + * infrastructure to do the synchronization, thus we must do it
> + * ourselves.
> + */
> + schedule_on_each_cpu(ftrace_sync);
>
> free_ftrace_hash(old_hash);
> }
> diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
> index 8c52f5de9384..3c75d29bd861 100644
> --- a/kernel/trace/trace.h
> +++ b/kernel/trace/trace.h
> @@ -979,6 +979,7 @@ static inline int ftrace_graph_addr(struct ftrace_graph_ent *trace)
> * Have to open code "rcu_dereference_sched()" because the
> * function graph tracer can be called when RCU is not
> * "watching".
> + * Protected with schedule_on_each_cpu(ftrace_sync)
> */
> hash = rcu_dereference_protected(ftrace_graph_hash, !preemptible());
>
> @@ -1031,6 +1032,7 @@ static inline int ftrace_graph_notrace_addr(unsigned long addr)
> * Have to open code "rcu_dereference_sched()" because the
> * function graph tracer can be called when RCU is not
> * "watching".
> + * Protected with schedule_on_each_cpu(ftrace_sync)
> */
> notrace_hash = rcu_dereference_protected(ftrace_graph_notrace_hash,
> !preemptible());
> --
> 2.24.1
>
>
next prev parent reply other threads:[~2020-02-05 22:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-05 22:21 [for-next][PATCH 0/5] tracing: Really, this is the last update for 5.6 before my pull request! Steven Rostedt
2020-02-05 22:21 ` [for-next][PATCH 1/5] ftrace: Protect ftrace_graph_hash with ftrace_sync Steven Rostedt
2020-02-05 22:28 ` Paul E. McKenney [this message]
2020-02-05 22:21 ` [for-next][PATCH 2/5] bootconfig: Use bootconfig instead of boot config Steven Rostedt
2020-02-05 22:21 ` [for-next][PATCH 3/5] bootconfig: Add more parse error messages Steven Rostedt
2020-02-05 22:21 ` [for-next][PATCH 4/5] tools/bootconfig: Show the number of bootconfig nodes Steven Rostedt
2020-02-05 22:21 ` [for-next][PATCH 5/5] bootconfig: Show the number of nodes on boot message Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200205222809.GD2935@paulmck-ThinkPad-P72 \
--to=paulmck@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=joel@joelfernandes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rostedt@goodmis.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox