Commit 75ddf64d authored May 12, 2020 by Masami Hiramatsu Committed by Steven Rostedt (VMware) Jun 16, 2020

kprobes: Remove redundant arch_disarm_kprobe() call

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.

Link: http://lkml.kernel.org/r/158927058719.27680.17183632908465341189.stgit@devnote2



Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

parent 1a0aa991

kernel/kprobes.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -675,8 +675,6 @@ static void force_unoptimize_kprobe(struct optimized_kprobe *op)
	lockdep_assert_cpus_held();		lockdep_assert_cpus_held();
	arch_unoptimize_kprobe(op);		arch_unoptimize_kprobe(op);
	op->kp.flags &= ~KPROBE_FLAG_OPTIMIZED;		op->kp.flags &= ~KPROBE_FLAG_OPTIMIZED;
	if (kprobe_disabled(&op->kp))
	arch_disarm_kprobe(&op->kp);
	}		}

	/* Unoptimize a kprobe if p is optimized */		/* Unoptimize a kprobe if p is optimized */

Admin message