Re: [PATCH v2] fprobe: add unlock to match a succeeded ftrace_test_recursion_trylock
From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Date: 2023-07-03 10:04:03
Also in:
lkml
On Mon, 3 Jul 2023 17:23:36 +0800 Ze Gao [off-list ref] wrote:
Unlock ftrace recursion lock when fprobe_kprobe_handler() is failed because of some running kprobe.
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Thanks!
quoted hunk ↗ jump to hunk
Fixes: 3cc4e2c5fbae ("fprobe: make fprobe_kprobe_handler recursion free") Reported-by: Yafang <redacted> Closes: https://lore.kernel.org/linux-trace-kernel/CALOAHbC6UpfFOOibdDiC7xFc5YFUgZnk3MZ=3Ny6we=AcrNbew@mail.gmail.com/ (local) Signed-off-by: Ze Gao <redacted> --- kernel/trace/fprobe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c index 18d36842faf5..93b3e361bb97 100644 --- a/kernel/trace/fprobe.c +++ b/kernel/trace/fprobe.c@@ -102,12 +102,14 @@ static void fprobe_kprobe_handler(unsigned long ip, unsigned long parent_ip, if (unlikely(kprobe_running())) { fp->nmissed++; - return; + goto recursion_unlock; } kprobe_busy_begin(); __fprobe_handler(ip, parent_ip, ops, fregs); kprobe_busy_end(); + +recursion_unlock: ftrace_test_recursion_unlock(bit); }-- 2.40.1
-- Masami Hiramatsu (Google) [off-list ref]