iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fprobe: add unlock to match a succeeded ftrace_test_recursion_trylock

Browse Source 
Unlock ftrace recursion lock when fprobe_kprobe_handler() is failed
because of some running kprobe.

Link: https://lore.kernel.org/all/20230703092336.268371-1-zegao@tencent.com/

Fixes: 3cc4e2c5fb ("fprobe: make fprobe_kprobe_handler recursion free")
Reported-by: Yafang <laoar.shao@gmail.com>
Closes: https://lore.kernel.org/linux-trace-kernel/CALOAHbC6UpfFOOibdDiC7xFc5YFUgZnk3MZ=3Ny6we=AcrNbew@mail.gmail.com/
Signed-off-by: Ze Gao <zegao@tencent.com>
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Acked-by: Yafang Shao <laoar.shao@gmail.com>
Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
This commit is contained in:
Ze Gao
2023-07-03 17:23:36 +08:00
committed by Masami Hiramatsu (Google)
parent cf0a624dc7
commit 5f0c584daf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/trace/fprobe.c
View File

@ -102,12 +102,14 @@ static void fprobe_kprobe_handler(unsigned long ip, unsigned long parent_ip,
if (unlikely(kprobe_running())) { if (unlikely(kprobe_running())) {
fp->nmissed++; fp->nmissed++;
return; goto recursion_unlock;
} }
kprobe_busy_begin(); kprobe_busy_begin();
__fprobe_handler(ip, parent_ip, ops, fregs); __fprobe_handler(ip, parent_ip, ops, fregs);
kprobe_busy_end(); kprobe_busy_end();
recursion_unlock:
ftrace_test_recursion_unlock(bit); ftrace_test_recursion_unlock(bit);
} }