Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit cc59c9e8d0165c632fd056c4a23e36f917507fb4

Authored by Lai Jiangshan
Committed by Ingo Molnar
1 parent be6f164a02
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ftrace: show virtual PID 

Impact: fix PID output under namespaces

When current namespace is not the global namespace,
pid read from set_ftrace_pid is no correct.

 # ~/newpid_namespace_run bash
 # echo $$
 1
 # echo 1 > set_ftrace_pid
 # cat set_ftrace_pid
 3756

Since we write virtual PID to set_ftrace_pid, we need get
virtual PID when we read it.

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Steven Rostedt <srostedt@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <49C84D65.9050606@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

kernel/trace/ftrace.c
Diff comments   View file @ cc59c9e
... ... @@ -2264,7 +2264,7 @@
2264 2264 if (ftrace_pid_trace == ftrace_swapper_pid)
2265 2265 r = sprintf(buf, "swapper tasks\n");
2266 2266 else if (ftrace_pid_trace)
2267   - r = sprintf(buf, "%u\n", pid_nr(ftrace_pid_trace));
  2267 + r = sprintf(buf, "%u\n", pid_vnr(ftrace_pid_trace));
2268 2268 else
2269 2269 r = sprintf(buf, "no pid\n");
2270 2270