提交 f24f075a 编写于 作者: X Xiangyang Zhang 提交者: Zheng Zengkai

tracing/kprobes: 'nmissed' not showed correctly for kretprobe

stable inclusion
from stable-v5.10.94
commit c524f4cfb3e59d412dc6b532481bbe4190f9e5a6
bugzilla: https://gitee.com/openeuler/kernel/issues/I531X9

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c524f4cfb3e59d412dc6b532481bbe4190f9e5a6

--------------------------------

commit dfea08a2 upstream.

The 'nmissed' column of the 'kprobe_profile' file for kretprobe is
not showed correctly, kretprobe can be skipped by two reasons,
shortage of kretprobe_instance which is counted by tk->rp.nmissed,
and kprobe itself is missed by some reason, so to show the sum.

Link: https://lkml.kernel.org/r/20220107150242.5019-1-xyz.sun.ok@gmail.com

Cc: stable@vger.kernel.org
Fixes: 4a846b44 ("tracing/kprobes: Cleanup kprobe tracer code")
Acked-by: NMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: NXiangyang Zhang <xyz.sun.ok@gmail.com>
Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
上级 ea1b0033
...@@ -1183,15 +1183,18 @@ static int probes_profile_seq_show(struct seq_file *m, void *v) ...@@ -1183,15 +1183,18 @@ static int probes_profile_seq_show(struct seq_file *m, void *v)
{ {
struct dyn_event *ev = v; struct dyn_event *ev = v;
struct trace_kprobe *tk; struct trace_kprobe *tk;
unsigned long nmissed;
if (!is_trace_kprobe(ev)) if (!is_trace_kprobe(ev))
return 0; return 0;
tk = to_trace_kprobe(ev); tk = to_trace_kprobe(ev);
nmissed = trace_kprobe_is_return(tk) ?
tk->rp.kp.nmissed + tk->rp.nmissed : tk->rp.kp.nmissed;
seq_printf(m, " %-44s %15lu %15lu\n", seq_printf(m, " %-44s %15lu %15lu\n",
trace_probe_name(&tk->tp), trace_probe_name(&tk->tp),
trace_kprobe_nhit(tk), trace_kprobe_nhit(tk),
tk->rp.kp.nmissed); nmissed);
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册