From: Steven Rostedt <rostedt@goodmis.org>
To: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Alexei Starovoitov <ast@kernel.org>,
Andy Lutomirski <luto@kernel.org>, Borislav Petkov <bp@alien8.de>,
Linus Torvalds <torvalds@linux-foundation.org>,
Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
bristot@redhat.com, "Naveen N . Rao" <naveen.n.rao@linux.ibm.com>,
Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>,
David Miller <davem@davemloft.net>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [BUGFIX PATCH] kprobes: Fix to cancel optimizing/unoptimizing kprobes correctly
Date: Tue, 7 Jan 2020 18:39:07 -0500 [thread overview]
Message-ID: <20200107183907.3c87500a@gandalf.local.home> (raw)
In-Reply-To: <157840814418.7181.13478003006386303481.stgit@devnote2>
On Tue, 7 Jan 2020 23:42:24 +0900
Masami Hiramatsu <mhiramat@kernel.org> wrote:
> optimize_kprobe() and unoptimize_kprobe() cancels if given kprobe
> is on the optimizing_list or unoptimizing_list. However, since
> commit f66c0447cca1 ("kprobes: Set unoptimized flag after
> unoptimizing code") modified the update timing of the
> KPROBE_FLAG_OPTIMIZED, it doesn't work as expected anymore.
>
> The optimized_kprobe could be following states.
>
> - [optimizing]: Before inserting jump instruction
> op.kp->flags has KPROBE_FLAG_OPTIMIZED and
> op->list is not empty.
>
> - [optimized]: jump inserted
> op.kp->flags has KPROBE_FLAG_OPTIMIZED and
> op->list is empty.
>
> - [unoptimizing]: Before removing jump instruction (including unused
> optprobe)
> op.kp->flags has KPROBE_FLAG_OPTIMIZED and
> op->list is not empty.
>
> - [unoptimized]: jump removed
> op.kp->flags doesn't have KPROBE_FLAG_OPTIMIZED and
> op->list is empty.
>
> Current code mis-expects [unoptimizing] state doesn't have
> KPROBE_FLAG_OPTIMIZED, and that can cause wrong results.
>
> This introduces optprobe_queued_unopt() to distinguish [optimizing]
> and [unoptimizing] states and fixes logics in optimize_kprobe() and
> unoptimize_kprobe().
>
> Fixes: f66c0447cca1 ("kprobes: Set unoptimized flag after unoptimizing code")
> Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Looks good.
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> return;
> }
> +
> /* Optimized kprobe case */
> - if (force)
> + if (force) {
> /* Forcibly update the code: this is a special case */
> force_unoptimize_kprobe(op);
> - else {
> + } else {
> list_add(&op->list, &unoptimizing_list);
> kick_kprobe_optimizer();
> }
I see you added some clean up to this patch.
-- Steve
next prev parent reply other threads:[~2020-01-07 23:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 14:42 [BUGFIX PATCH] kprobes: Fix to cancel optimizing/unoptimizing kprobes correctly Masami Hiramatsu
2020-01-07 23:39 ` Steven Rostedt [this message]
2020-01-08 3:02 ` Masami Hiramatsu
2020-01-10 6:03 ` [tip: core/kprobes] kprobes: Fix optimize_kprobe()/unoptimize_kprobe() cancellation logic tip-bot2 for Masami Hiramatsu
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=20200107183907.3c87500a@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=anil.s.keshavamurthy@intel.com \
--cc=ast@kernel.org \
--cc=bp@alien8.de \
--cc=bristot@redhat.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=naveen.n.rao@linux.ibm.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).