Messages in this thread Patch in this message | | | From | Masami Hiramatsu <> | Subject | [PATCH -tip V6 4/6] kprobes: Remove redundant arch_disarm_kprobe() call | Date | Tue, 12 May 2020 17:03:07 +0900 |
| |
Fix to remove redundant arch_disarm_kprobe() call in force_unoptimize_kprobe(). This arch_disarm_kprobe() will be invoked if the kprobe is optimized but disabled, but that means the kprobe (optprobe) is unused (and unoptimized) state.
In that case, unoptimize_kprobe() puts it in freeing_list and kprobe_optimizer (do_unoptimize_kprobes()) automatically disarm it. Thus this arch_disarm_kprobe() is redundant.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> --- kernel/kprobes.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 6d76a6e3e1a5..627fc1b7011a 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -675,8 +675,6 @@ static void force_unoptimize_kprobe(struct optimized_kprobe *op) lockdep_assert_cpus_held(); arch_unoptimize_kprobe(op); op->kp.flags &= ~KPROBE_FLAG_OPTIMIZED; - if (kprobe_disabled(&op->kp)) - arch_disarm_kprobe(&op->kp); } /* Unoptimize a kprobe if p is optimized */
| |