1 files changed, 39 insertions, 22 deletions

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index bb788c109fe6..1fc1c2f04772 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -7,6 +7,7 @@
 #include "strlist.h"
 #include "thread.h"
 #include "thread_map.h"
+#include "symbol/kallsyms.h"
 
 static const char *perf_event__names[] = {
         [0]                                     = "TOTAL",
@@ -105,8 +106,12 @@ static pid_t perf_event__synthesize_comm(struct perf_tool *tool,
 
         memset(&event->comm, 0, sizeof(event->comm));
 
-        tgid = perf_event__get_comm_tgid(pid, event->comm.comm,
-                                         sizeof(event->comm.comm));
+        if (machine__is_host(machine))
+                tgid = perf_event__get_comm_tgid(pid, event->comm.comm,
+                                                 sizeof(event->comm.comm));
+        else
+                tgid = machine->pid;
+
         if (tgid < 0)
                 goto out;
 
@@ -128,7 +133,11 @@ static pid_t perf_event__synthesize_comm(struct perf_tool *tool,
                 goto out;
         }
 
-        snprintf(filename, sizeof(filename), "/proc/%d/task", pid);
+        if (machine__is_default_guest(machine))
+                return 0;
+
+        snprintf(filename, sizeof(filename), "%s/proc/%d/task",
+                 machine->root_dir, pid);
 
         tasks = opendir(filename);
         if (tasks == NULL) {
@@ -166,18 +175,22 @@ out:
         return tgid;
 }
 
-static int perf_event__synthesize_mmap_events(struct perf_tool *tool,
-                                              union perf_event *event,
-                                              pid_t pid, pid_t tgid,
-                                              perf_event__handler_t process,
-                                              struct machine *machine,
-                                              bool mmap_data)
+int perf_event__synthesize_mmap_events(struct perf_tool *tool,
+                                       union perf_event *event,
+                                       pid_t pid, pid_t tgid,
+                                       perf_event__handler_t process,
+                                       struct machine *machine,
+                                       bool mmap_data)
 {
         char filename[PATH_MAX];
         FILE *fp;
         int rc = 0;
 
-        snprintf(filename, sizeof(filename), "/proc/%d/maps", pid);
+        if (machine__is_default_guest(machine))
+                return 0;
+
+        snprintf(filename, sizeof(filename), "%s/proc/%d/maps",
+                 machine->root_dir, pid);
 
         fp = fopen(filename, "r");
         if (fp == NULL) {
@@ -217,7 +230,10 @@ static int perf_event__synthesize_mmap_events(struct perf_tool *tool,
                 /*
                  * Just like the kernel, see __perf_event_mmap in kernel/perf_event.c
                  */
-                event->header.misc = PERF_RECORD_MISC_USER;
+                if (machine__is_host(machine))
+                        event->header.misc = PERF_RECORD_MISC_USER;
+                else
+                        event->header.misc = PERF_RECORD_MISC_GUEST_USER;
 
                 if (prot[2] != 'x') {
                         if (!mmap_data || prot[0] != 'r')
@@ -386,6 +402,7 @@ int perf_event__synthesize_threads(struct perf_tool *tool,
                                    struct machine *machine, bool mmap_data)
 {
         DIR *proc;
+        char proc_path[PATH_MAX];
         struct dirent dirent, *next;
         union perf_event *comm_event, *mmap_event;
         int err = -1;
@@ -398,7 +415,12 @@ int perf_event__synthesize_threads(struct perf_tool *tool,
         if (mmap_event == NULL)
                 goto out_free_comm;
 
-        proc = opendir("/proc");
+        if (machine__is_default_guest(machine))
+                return 0;
+
+        snprintf(proc_path, sizeof(proc_path), "%s/proc", machine->root_dir);
+        proc = opendir(proc_path);
+
         if (proc == NULL)
                 goto out_free_mmap;
 
@@ -637,6 +659,7 @@ void thread__find_addr_map(struct thread *thread,
         struct map_groups *mg = &thread->mg;
         bool load_map = false;
 
+        al->machine = machine;
         al->thread = thread;
         al->addr = addr;
         al->cpumode = cpumode;
@@ -657,15 +680,10 @@ void thread__find_addr_map(struct thread *thread,
                 al->level = 'g';
                 mg = &machine->kmaps;
                 load_map = true;
+        } else if (cpumode == PERF_RECORD_MISC_GUEST_USER && perf_guest) {
+                al->level = 'u';
         } else {
-                /*
-                 * 'u' means guest os user space.
-                 * TODO: We don't support guest user space. Might support late.
-                 */
-                if (cpumode == PERF_RECORD_MISC_GUEST_USER && perf_guest)
-                        al->level = 'u';
-                else
-                        al->level = 'H';
+                al->level = 'H';
                 al->map = NULL;
 
                 if ((cpumode == PERF_RECORD_MISC_GUEST_USER ||
@@ -732,8 +750,7 @@ int perf_event__preprocess_sample(const union perf_event *event,
         if (thread == NULL)
                 return -1;
 
-        if (symbol_conf.comm_list &&
-            !strlist__has_entry(symbol_conf.comm_list, thread__comm_str(thread)))
+        if (thread__is_filtered(thread))
                 goto out_filtered;
 
         dump_printf(" ... thread: %s:%d\n", thread__comm_str(thread), thread->tid);