From: "Paul E. McKenney" <paulmck@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>,
linux-kernel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@kernel.org>,
kim.phillips@amd.com
Subject: Re: [PATCH] rcu,ftrace: Fix ftrace recursion
Date: Tue, 29 Sep 2020 09:56:40 -0700 [thread overview]
Message-ID: <20200929165640.GV29330@paulmck-ThinkPad-P72> (raw)
In-Reply-To: <20200929105416.757c47f0@gandalf.local.home>
On Tue, Sep 29, 2020 at 10:54:16AM -0400, Steven Rostedt wrote:
> On Tue, 29 Sep 2020 07:41:06 -0700
> "Paul E. McKenney" <paulmck@kernel.org> wrote:
>
> > On Tue, Sep 29, 2020 at 10:36:20AM -0400, Steven Rostedt wrote:
> > > On Tue, 29 Sep 2020 13:33:40 +0200
> > > Peter Zijlstra <peterz@infradead.org> wrote:
> > >
> > > > Kim reported that perf-ftrace made his box unhappy. It turns out that
> > > > commit:
> > > >
> > > > ff5c4f5cad33 ("rcu/tree: Mark the idle relevant functions noinstr")
> > > >
> > > > removed one too many notrace. Probably due to there not being a helpful
> > > > comment.
> > > >
> > > > Reinstate the notrace and add a comment to avoid loosing it again.
> > > >
> > > > Fixes: ff5c4f5cad33 ("rcu/tree: Mark the idle relevant functions noinstr")
> > > > Reported-by: Kim Phillips <kim.phillips@amd.com>
> > > > Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> > > > ---
> > > > kernel/rcu/tree.c | 5 ++++-
> > > > 1 file changed, 4 insertions(+), 1 deletion(-)
> > > >
> > > > diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
> > > > index ee5e595501e8..33020d84ec6b 100644
> > > > --- a/kernel/rcu/tree.c
> > > > +++ b/kernel/rcu/tree.c
> > > > @@ -1098,8 +1098,11 @@ noinstr bool __rcu_is_watching(void)
> > > > * CPU can safely enter RCU read-side critical sections. In other words,
> > > > * if the current CPU is not in its idle loop or is in an interrupt or
> > > > * NMI handler, return true.
> > > > + *
> > > > + * Must be notrace because __ftrace_ops_list_func() / ftrace_ops_assist_func()
> > > > + * will call this (for every function) outside of recursion protection.
> > > > */
> > > > -bool rcu_is_watching(void)
> > > > +notrace bool rcu_is_watching(void)
> > > > {
> > > > bool ret;
> > > >
> > >
> > > I think the patch I suggested is more suitable.
> >
> > OK, I will let you guys fight it out. ;-)
> >
>
> Well, I think we should actually apply both, but the comment needs to be
> updated, as it will no longer be outside recursion. And the comment is
> wrong now as well, as its only outside recursion protection for the
> assist_func().
>
> But it does prevent it from being always called for perf.
>
> * Make notrace because it can be called by the internal functions of
> * ftrace, and making this notrace removes unnecessary recursion calls.
Fair enough. ;-)
If I don't hear otherwise by late today (Tuesday), Pacific Time, I will
update the comment and pull it into -rcu. If you guys have some other
route to mainline in mind, you have my Reviewed-by. Either way, just
let me know.
Thanx, Paul
next prev parent reply other threads:[~2020-09-29 16:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-29 11:33 [PATCH] rcu,ftrace: Fix ftrace recursion Peter Zijlstra
2020-09-29 14:31 ` Paul E. McKenney
2020-09-29 14:36 ` Steven Rostedt
2020-09-29 14:41 ` Paul E. McKenney
2020-09-29 14:54 ` Steven Rostedt
2020-09-29 16:56 ` Paul E. McKenney [this message]
2020-09-29 17:04 ` Steven Rostedt
2020-10-05 0:18 ` Paul E. McKenney
2020-09-29 14:49 ` Peter Zijlstra
2020-09-29 15:19 ` Steven Rostedt
2020-09-29 14:43 ` Kim Phillips
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=20200929165640.GV29330@paulmck-ThinkPad-P72 \
--to=paulmck@kernel.org \
--cc=kim.phillips@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).