From: Jiri Olsa <jolsa@redhat.com>
To: "Ziqian SUN (Zamir)" <zsun@redhat.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
Jiri Olsa <jolsa@kernel.org>,
"Naveen N. Rao" <naveen.n.rao@linux.ibm.com>,
Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>,
"David S. Miller" <davem@davemloft.net>,
Peter Zijlstra <peterz@infradead.org>,
lkml <linux-kernel@vger.kernel.org>,
"bibo,mao" <bibo.mao@intel.com>,
sztsian@gmail.com
Subject: Re: [RFC] kretprobe: Prevent triggering kretprobe from within kprobe_flush_task
Date: Tue, 14 Apr 2020 18:03:21 +0200 [thread overview]
Message-ID: <20200414160321.GA215906@krava> (raw)
In-Reply-To: <5334d3b4-4020-6705-9bcc-e6777070c9c7@redhat.com>
On Fri, Apr 10, 2020 at 09:31:07AM +0800, Ziqian SUN (Zamir) wrote:
>
>
> On 4/10/20 4:13 AM, Jiri Olsa wrote:
> > On Thu, Apr 09, 2020 at 08:45:01PM +0200, Jiri Olsa wrote:
> > > On Thu, Apr 09, 2020 at 11:41:01PM +0900, Masami Hiramatsu wrote:
> > >
> > > SNIP
> > >
> > > > > ---
> > > > > kernel/kprobes.c | 6 ++++++
> > > > > 1 file changed, 6 insertions(+)
> > > > >
> > > > > diff --git a/kernel/kprobes.c b/kernel/kprobes.c
> > > > > index 2625c241ac00..b13247cae752 100644
> > > > > --- a/kernel/kprobes.c
> > > > > +++ b/kernel/kprobes.c
> > > > > @@ -1236,6 +1236,10 @@ __releases(hlist_lock)
> > > > > }
> > > > > NOKPROBE_SYMBOL(kretprobe_table_unlock);
> > > > > +static struct kprobe kretprobe_dummy = {
> > > > > + .addr = (void *)kretprobe_trampoline,
> > > > > +};
> > > > > +
> > > > > /*
> > > > > * This function is called from finish_task_switch when task tk becomes dead,
> > > > > * so that we can recycle any function-return probe instances associated
> > > > > @@ -1256,12 +1260,14 @@ void kprobe_flush_task(struct task_struct *tk)
> > > > > INIT_HLIST_HEAD(&empty_rp);
> > > > > hash = hash_ptr(tk, KPROBE_HASH_BITS);
> > > > > head = &kretprobe_inst_table[hash];
> > > > > + __this_cpu_write(current_kprobe, &kretprobe_dummy);
> > > >
> > > > Can you also set the kcb->kprobe_state = KPROBE_HIT_ACTIVE?
> > > >
> > > > BTW, we may be better to introduce a common kprobe_reject_section_start()
> > > > and kprobe_reject_section_end() so that the user don't need to prepare
> > > > dummy kprobes.
> > >
> > > sure, will do
> > >
> > > thank you both for review
> >
> > ok, found out it's actually arch code.. would you guys be ok with something like below?
> >
> > jirka
> >
>
> Hi Jiri,
>
> In my origin test lockup happens on both x86_64 and ppc64le. So I would
> appreciate if you can also come up with a solution for both of the
> architectures.
aaaah right.. will update the fix
thanks,
jirka
prev parent reply other threads:[~2020-04-14 16:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-08 16:46 [RFC] kretprobe: Prevent triggering kretprobe from within kprobe_flush_task Jiri Olsa
2020-04-09 9:02 ` Naveen N. Rao
2020-04-09 18:43 ` Jiri Olsa
2020-04-09 12:38 ` Masami Hiramatsu
2020-04-09 12:52 ` Jiri Olsa
2020-04-09 14:16 ` Masami Hiramatsu
2020-04-09 13:16 ` Naveen N. Rao
2020-04-09 14:26 ` Masami Hiramatsu
2020-04-09 14:41 ` Masami Hiramatsu
2020-04-09 18:44 ` Jiri Olsa
2020-04-09 20:13 ` Jiri Olsa
2020-04-10 0:31 ` Masami Hiramatsu
2020-04-14 16:03 ` Jiri Olsa
2020-04-15 9:05 ` [PATCH] " Jiri Olsa
2020-04-16 1:55 ` Masami Hiramatsu
2020-04-16 9:13 ` Jiri Olsa
2020-04-16 13:42 ` Masami Hiramatsu
2020-04-16 14:31 ` [PATCHv2] " Jiri Olsa
2020-04-17 7:38 ` Masami Hiramatsu
2020-04-28 21:36 ` Jiri Olsa
2020-05-01 2:01 ` Masami Hiramatsu
2020-05-07 10:15 ` Jiri Olsa
2020-04-10 1:31 ` [RFC] " Ziqian SUN (Zamir)
2020-04-14 16:03 ` Jiri Olsa [this message]
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=20200414160321.GA215906@krava \
--to=jolsa@redhat.com \
--cc=anil.s.keshavamurthy@intel.com \
--cc=bibo.mao@intel.com \
--cc=davem@davemloft.net \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=naveen.n.rao@linux.ibm.com \
--cc=peterz@infradead.org \
--cc=sztsian@gmail.com \
--cc=zsun@redhat.com \
/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).