Commit 868a8329 authored by Krister Johansen's avatar Krister Johansen Committed by Arnaldo Carvalho de Melo

perf top: Support lookup of symbols in other mount namespaces.

The perf top command needs to unshare its fs from the helper threads in
order to successfully setns(2) during its symbol lookup.  It also needs
to impelement a force flag to ignore ownership of perf-<pid>.map files.
Signed-off-by: default avatarKrister Johansen <kjlx@templeofstupid.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas-Mich Richter <tmricht@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/1499305693-1599-6-git-send-email-kjlx@templeofstupid.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2b04e0f8
...@@ -237,6 +237,10 @@ Default is to monitor all CPUS. ...@@ -237,6 +237,10 @@ Default is to monitor all CPUS.
--hierarchy:: --hierarchy::
Enable hierarchy output. Enable hierarchy output.
--force::
Don't do ownership validation.
INTERACTIVE PROMPTING KEYS INTERACTIVE PROMPTING KEYS
-------------------------- --------------------------
......
...@@ -587,6 +587,13 @@ static void *display_thread_tui(void *arg) ...@@ -587,6 +587,13 @@ static void *display_thread_tui(void *arg)
.refresh = top->delay_secs, .refresh = top->delay_secs,
}; };
/* In order to read symbols from other namespaces perf to needs to call
* setns(2). This isn't permitted if the struct_fs has multiple users.
* unshare(2) the fs so that we may continue to setns into namespaces
* that we're observing.
*/
unshare(CLONE_FS);
perf_top__sort_new_samples(top); perf_top__sort_new_samples(top);
/* /*
...@@ -628,6 +635,13 @@ static void *display_thread(void *arg) ...@@ -628,6 +635,13 @@ static void *display_thread(void *arg)
struct perf_top *top = arg; struct perf_top *top = arg;
int delay_msecs, c; int delay_msecs, c;
/* In order to read symbols from other namespaces perf to needs to call
* setns(2). This isn't permitted if the struct_fs has multiple users.
* unshare(2) the fs so that we may continue to setns into namespaces
* that we're observing.
*/
unshare(CLONE_FS);
display_setup_sig(); display_setup_sig();
pthread__unblock_sigwinch(); pthread__unblock_sigwinch();
repeat: repeat:
...@@ -1206,6 +1220,7 @@ int cmd_top(int argc, const char **argv) ...@@ -1206,6 +1220,7 @@ int cmd_top(int argc, const char **argv)
"Show raw trace event output (do not use print fmt or plugins)"), "Show raw trace event output (do not use print fmt or plugins)"),
OPT_BOOLEAN(0, "hierarchy", &symbol_conf.report_hierarchy, OPT_BOOLEAN(0, "hierarchy", &symbol_conf.report_hierarchy,
"Show entries in a hierarchy"), "Show entries in a hierarchy"),
OPT_BOOLEAN(0, "force", &symbol_conf.force, "don't complain, do it"),
OPT_END() OPT_END()
}; };
const char * const top_usage[] = { const char * const top_usage[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment