From: masami.hiramatsu.pt@hitachi•com (Masami Hiramatsu)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] kprobes: bugfix: checks kprobes_all_disarmed in unoptimized_kprobe().
Date: Mon, 12 Jan 2015 21:52:48 +0900 [thread overview]
Message-ID: <54B3C3A0.6010708@hitachi.com> (raw)
In-Reply-To: <1421064563-77831-1-git-send-email-wangnan0@huawei.com>
(2015/01/12 21:09), Wang Nan wrote:
> Original code failed to disarm the probed instruction after
>
> echo 0 > /sys/kernel/debug/kprobes/enabled
>
> if OPTPROBE is enabled.
>
> This patch checks kprobes_all_disarmed in unoptimized_kprobe().
>
Looks good :)
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi•com>
Thank you!
> Signed-off-by: Wang Nan <wangnan0@huawei•com>
> ---
> kernel/kprobes.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/kernel/kprobes.c b/kernel/kprobes.c
> index 9471710..f16936b 100644
> --- a/kernel/kprobes.c
> +++ b/kernel/kprobes.c
> @@ -630,6 +630,9 @@ static void unoptimize_kprobe(struct kprobe *p, bool force)
> {
> struct optimized_kprobe *op;
>
> + if (kprobes_all_disarmed)
> + return;
> +
> if (!kprobe_aggrprobe(p) || kprobe_disarmed(p))
> return; /* This is not an optprobe nor optimized */
>
>
--
Masami HIRAMATSU
Software Platform Research Dept. Linux Technology Research Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: masami.hiramatsu.pt at hitachi.com
next prev parent reply other threads:[~2015-01-12 12:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-05 12:32 [PATCH] kprobes: bugfix: force unoptimize when disable kprobes Wang Nan
2015-01-12 11:42 ` Masami Hiramatsu
2015-01-12 12:09 ` [PATCH] kprobes: bugfix: checks kprobes_all_disarmed in unoptimized_kprobe() Wang Nan
2015-01-12 12:52 ` Masami Hiramatsu [this message]
2015-01-19 3:04 ` Wang Nan
2015-01-19 9:05 ` Masami Hiramatsu
2015-01-19 11:21 ` Wang Nan
2015-01-19 12:45 ` Masami Hiramatsu
2015-01-19 12:59 ` Wang Nan
2015-01-20 2:51 ` [PATCH] kprobes: bugfix: makes kprobes/enabled works correctly for optimized kprobes Wang Nan
2015-01-20 7:12 ` 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=54B3C3A0.6010708@hitachi.com \
--to=masami.hiramatsu.pt@hitachi$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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