1 files changed, 131 insertions, 42 deletions

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index f0223166e76..eb25900e221 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -117,6 +117,10 @@ static struct map *kernel_get_module_map(const char *module)
         struct rb_node *nd;
         struct map_groups *grp = &machine.kmaps;
 
+        /* A file path -- this is an offline module */
+        if (module && strchr(module, '/'))
+                return machine__new_module(&machine, 0, module);
+
         if (!module)
                 module = "kernel";
 
@@ -170,16 +174,24 @@ const char *kernel_get_module_path(const char *module)
 }
 
 #ifdef DWARF_SUPPORT
-static int open_vmlinux(const char *module)
+/* Open new debuginfo of given module */
+static struct debuginfo *open_debuginfo(const char *module)
 {
-        const char *path = kernel_get_module_path(module);
-        if (!path) {
-                pr_err("Failed to find path of %s module.\n",
-                       module ?: "kernel");
-                return -ENOENT;
+        const char *path;
+
+        /* A file path -- this is an offline module */
+        if (module && strchr(module, '/'))
+                path = module;
+        else {
+                path = kernel_get_module_path(module);
+
+                if (!path) {
+                        pr_err("Failed to find path of %s module.\n",
+                               module ?: "kernel");
+                        return NULL;
+                }
         }
-        pr_debug("Try to open %s\n", path);
-        return open(path, O_RDONLY);
+        return debuginfo__new(path);
 }
 
 /*
@@ -193,13 +205,24 @@ static int kprobe_convert_to_perf_probe(struct probe_trace_point *tp,
         struct map *map;
         u64 addr;
         int ret = -ENOENT;
+        struct debuginfo *dinfo;
 
         sym = __find_kernel_function_by_name(tp->symbol, &map);
         if (sym) {
                 addr = map->unmap_ip(map, sym->start + tp->offset);
                 pr_debug("try to find %s+%ld@%" PRIx64 "\n", tp->symbol,
                          tp->offset, addr);
-                ret = find_perf_probe_point((unsigned long)addr, pp);
+
+                dinfo = debuginfo__new_online_kernel(addr);
+                if (dinfo) {
+                        ret = debuginfo__find_probe_point(dinfo,
+                                                 (unsigned long)addr, pp);
+                        debuginfo__delete(dinfo);
+                } else {
+                        pr_debug("Failed to open debuginfo at 0x%" PRIx64 "\n",
+                                 addr);
+                        ret = -ENOENT;
+                }
         }
         if (ret <= 0) {
                 pr_debug("Failed to find corresponding probes from "
@@ -214,30 +237,70 @@ static int kprobe_convert_to_perf_probe(struct probe_trace_point *tp,
         return 0;
 }
 
+static int add_module_to_probe_trace_events(struct probe_trace_event *tevs,
+                                            int ntevs, const char *module)
+{
+        int i, ret = 0;
+        char *tmp;
+
+        if (!module)
+                return 0;
+
+        tmp = strrchr(module, '/');
+        if (tmp) {
+                /* This is a module path -- get the module name */
+                module = strdup(tmp + 1);
+                if (!module)
+                        return -ENOMEM;
+                tmp = strchr(module, '.');
+                if (tmp)
+                        *tmp = '\0';
+                tmp = (char *)module;   /* For free() */
+        }
+
+        for (i = 0; i < ntevs; i++) {
+                tevs[i].point.module = strdup(module);
+                if (!tevs[i].point.module) {
+                        ret = -ENOMEM;
+                        break;
+                }
+        }
+
+        if (tmp)
+                free(tmp);
+
+        return ret;
+}
+
 /* Try to find perf_probe_event with debuginfo */
 static int try_to_find_probe_trace_events(struct perf_probe_event *pev,
-                                           struct probe_trace_event **tevs,
-                                           int max_tevs, const char *module)
+                                          struct probe_trace_event **tevs,
+                                          int max_tevs, const char *module)
 {
         bool need_dwarf = perf_probe_event_need_dwarf(pev);
-        int fd, ntevs;
+        struct debuginfo *dinfo = open_debuginfo(module);
+        int ntevs, ret = 0;
 
-        fd = open_vmlinux(module);
-        if (fd < 0) {
+        if (!dinfo) {
                 if (need_dwarf) {
                         pr_warning("Failed to open debuginfo file.\n");
-                        return fd;
+                        return -ENOENT;
                 }
-                pr_debug("Could not open vmlinux. Try to use symbols.\n");
+                pr_debug("Could not open debuginfo. Try to use symbols.\n");
                 return 0;
         }
 
-        /* Searching trace events corresponding to probe event */
-        ntevs = find_probe_trace_events(fd, pev, tevs, max_tevs);
+        /* Searching trace events corresponding to a probe event */
+        ntevs = debuginfo__find_trace_events(dinfo, pev, tevs, max_tevs);
+
+        debuginfo__delete(dinfo);
 
         if (ntevs > 0) {        /* Succeeded to find trace events */
                 pr_debug("find %d probe_trace_events.\n", ntevs);
-                return ntevs;
+                if (module)
+                        ret = add_module_to_probe_trace_events(*tevs, ntevs,
+                                                               module);
+                return ret < 0 ? ret : ntevs;
         }
 
         if (ntevs == 0) {       /* No error but failed to find probe point. */
@@ -371,8 +434,9 @@ int show_line_range(struct line_range *lr, const char *module)
 {
         int l = 1;
         struct line_node *ln;
+        struct debuginfo *dinfo;
         FILE *fp;
-        int fd, ret;
+        int ret;
         char *tmp;
 
         /* Search a line range */
@@ -380,13 +444,14 @@ int show_line_range(struct line_range *lr, const char *module)
         if (ret < 0)
                 return ret;
 
-        fd = open_vmlinux(module);
-        if (fd < 0) {
+        dinfo = open_debuginfo(module);
+        if (!dinfo) {
                 pr_warning("Failed to open debuginfo file.\n");
-                return fd;
+                return -ENOENT;
         }
 
-        ret = find_line_range(fd, lr);
+        ret = debuginfo__find_line_range(dinfo, lr);
+        debuginfo__delete(dinfo);
         if (ret == 0) {
                 pr_warning("Specified source line is not found.\n");
                 return -ENOENT;
@@ -448,7 +513,8 @@ end:
         return ret;
 }
 
-static int show_available_vars_at(int fd, struct perf_probe_event *pev,
+static int show_available_vars_at(struct debuginfo *dinfo,
+                                  struct perf_probe_event *pev,
                                   int max_vls, struct strfilter *_filter,
                                   bool externs)
 {
@@ -463,7 +529,8 @@ static int show_available_vars_at(int fd, struct perf_probe_event *pev,
                 return -EINVAL;
         pr_debug("Searching variables at %s\n", buf);
 
-        ret = find_available_vars_at(fd, pev, &vls, max_vls, externs);
+        ret = debuginfo__find_available_vars_at(dinfo, pev, &vls,
+                                                max_vls, externs);
         if (ret <= 0) {
                 pr_err("Failed to find variables at %s (%d)\n", buf, ret);
                 goto end;
@@ -504,24 +571,26 @@ int show_available_vars(struct perf_probe_event *pevs, int npevs,
                         int max_vls, const char *module,
                         struct strfilter *_filter, bool externs)
 {
-        int i, fd, ret = 0;
+        int i, ret = 0;
+        struct debuginfo *dinfo;
 
         ret = init_vmlinux();
         if (ret < 0)
                 return ret;
 
+        dinfo = open_debuginfo(module);
+        if (!dinfo) {
+                pr_warning("Failed to open debuginfo file.\n");
+                return -ENOENT;
+        }
+
         setup_pager();
 
-        for (i = 0; i < npevs && ret >= 0; i++) {
-                fd = open_vmlinux(module);
-                if (fd < 0) {
-                        pr_warning("Failed to open debug information file.\n");
-                        ret = fd;
-                        break;
-                }
-                ret = show_available_vars_at(fd, &pevs[i], max_vls, _filter,
+        for (i = 0; i < npevs && ret >= 0; i++)
+                ret = show_available_vars_at(dinfo, &pevs[i], max_vls, _filter,
                                              externs);
-        }
+
+        debuginfo__delete(dinfo);
         return ret;
 }
 
@@ -990,7 +1059,7 @@ bool perf_probe_event_need_dwarf(struct perf_probe_event *pev)
 
 /* Parse probe_events event into struct probe_point */
 static int parse_probe_trace_command(const char *cmd,
-                                        struct probe_trace_event *tev)
+                                     struct probe_trace_event *tev)
 {
         struct probe_trace_point *tp = &tev->point;
         char pr;
@@ -1023,8 +1092,14 @@ static int parse_probe_trace_command(const char *cmd,
 
         tp->retprobe = (pr == 'r');
 
-        /* Scan function name and offset */
-        ret = sscanf(argv[1], "%a[^+]+%lu", (float *)(void *)&tp->symbol,
+        /* Scan module name(if there), function name and offset */
+        p = strchr(argv[1], ':');
+        if (p) {
+                tp->module = strndup(argv[1], p - argv[1]);
+                p++;
+        } else
+                p = argv[1];
+        ret = sscanf(p, "%a[^+]+%lu", (float *)(void *)&tp->symbol,
                      &tp->offset);
         if (ret == 1)
                 tp->offset = 0;
@@ -1269,9 +1344,10 @@ char *synthesize_probe_trace_command(struct probe_trace_event *tev)
         if (buf == NULL)
                 return NULL;
 
-        len = e_snprintf(buf, MAX_CMDLEN, "%c:%s/%s %s+%lu",
+        len = e_snprintf(buf, MAX_CMDLEN, "%c:%s/%s %s%s%s+%lu",
                          tp->retprobe ? 'r' : 'p',
                          tev->group, tev->event,
+                         tp->module ?: "", tp->module ? ":" : "",
                          tp->symbol, tp->offset);
         if (len <= 0)
                 goto error;
@@ -1378,6 +1454,8 @@ static void clear_probe_trace_event(struct probe_trace_event *tev)
                 free(tev->group);
         if (tev->point.symbol)
                 free(tev->point.symbol);
+        if (tev->point.module)
+                free(tev->point.module);
         for (i = 0; i < tev->nargs; i++) {
                 if (tev->args[i].name)
                         free(tev->args[i].name);
@@ -1729,7 +1807,7 @@ static int convert_to_probe_trace_events(struct perf_probe_event *pev,
         /* Convert perf_probe_event with debuginfo */
         ret = try_to_find_probe_trace_events(pev, tevs, max_tevs, module);
         if (ret != 0)
-                return ret;
+                return ret;     /* Found in debuginfo or got an error */
 
         /* Allocate trace event buffer */
         tev = *tevs = zalloc(sizeof(struct probe_trace_event));
@@ -1742,6 +1820,15 @@ static int convert_to_probe_trace_events(struct perf_probe_event *pev,
                 ret = -ENOMEM;
                 goto error;
         }
+
+        if (module) {
+                tev->point.module = strdup(module);
+                if (tev->point.module == NULL) {
+                        ret = -ENOMEM;
+                        goto error;
+                }
+        }
+
         tev->point.offset = pev->point.offset;
         tev->point.retprobe = pev->point.retprobe;
         tev->nargs = pev->nargs;
@@ -1869,8 +1956,10 @@ static int __del_trace_probe_event(int fd, struct str_node *ent)
 
         pr_debug("Writing event: %s\n", buf);
         ret = write(fd, buf, strlen(buf));
-        if (ret < 0)
+        if (ret < 0) {
+                ret = -errno;
                 goto error;
+        }
 
         printf("Remove event: %s\n", ent->s);
         return 0;