6 files changed, 403 insertions, 98 deletions

diff --git a/tools/perf/Documentation/perf-probe.txt b/tools/perf/Documentation/perf-probe.txt
index 2780d9ce48bf..fb673bef4798 100644
--- a/tools/perf/Documentation/perf-probe.txt
+++ b/tools/perf/Documentation/perf-probe.txt
@@ -77,7 +77,8 @@ OPTIONS
 
 -F::
 --funcs::
-        Show available functions in given module or kernel.
+        Show available functions in given module or kernel. With -x/--exec,
+        can also list functions in a user space executable / shared library.
 
 --filter=FILTER::
         (Only for --vars and --funcs) Set filter. FILTER is a combination of glob
@@ -98,6 +99,11 @@ OPTIONS
 --max-probes::
         Set the maximum number of probe points for an event. Default is 128.
 
+-x::
+--exec=PATH::
+        Specify path to the executable or shared library file for user
+        space tracing. Can also be used with --funcs option.
+
 PROBE SYNTAX
 ------------
 Probe points are defined by following syntax.
@@ -182,6 +188,13 @@ Delete all probes on schedule().
 
  ./perf probe --del='schedule*'
 
+Add probes at zfree() function on /bin/zsh
+
+ ./perf probe -x /bin/zsh zfree
+
+Add probes at malloc() function on libc
+
+ ./perf probe -x /lib/libc.so.6 malloc
 
 SEE ALSO
 --------
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 4935c09dd5b5..ee3d84a7c895 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -54,6 +54,7 @@ static struct {
         bool show_ext_vars;
         bool show_funcs;
         bool mod_events;
+        bool uprobes;
         int nevents;
         struct perf_probe_event events[MAX_PROBES];
         struct strlist *dellist;
@@ -75,6 +76,8 @@ static int parse_probe_event(const char *str)
                 return -1;
         }
 
+        pev->uprobes = params.uprobes;
+
         /* Parse a perf-probe command into event */
         ret = parse_perf_probe_command(str, pev);
         pr_debug("%d arguments\n", pev->nargs);
@@ -125,6 +128,28 @@ static int opt_del_probe_event(const struct option *opt __used,
         return 0;
 }
 
+static int opt_set_target(const struct option *opt, const char *str,
+                        int unset __used)
+{
+        int ret = -ENOENT;
+
+        if  (str && !params.target) {
+                if (!strcmp(opt->long_name, "exec"))
+                        params.uprobes = true;
+#ifdef DWARF_SUPPORT
+                else if (!strcmp(opt->long_name, "module"))
+                        params.uprobes = false;
+#endif
+                else
+                        return ret;
+
+                params.target = str;
+                ret = 0;
+        }
+
+        return ret;
+}
+
 #ifdef DWARF_SUPPORT
 static int opt_show_lines(const struct option *opt __used,
                           const char *str, int unset __used)
@@ -246,9 +271,9 @@ static const struct option options[] = {
                    "file", "vmlinux pathname"),
         OPT_STRING('s', "source", &symbol_conf.source_prefix,
                    "directory", "path to kernel source"),
-        OPT_STRING('m', "module", &params.target,
-                   "modname|path",
-                   "target module name (for online) or path (for offline)"),
+        OPT_CALLBACK('m', "module", NULL, "modname|path",
+                "target module name (for online) or path (for offline)",
+                opt_set_target),
 #endif
         OPT__DRY_RUN(&probe_event_dry_run),
         OPT_INTEGER('\0', "max-probes", &params.max_probe_points,
@@ -260,6 +285,8 @@ static const struct option options[] = {
                      "\t\t\t(default: \"" DEFAULT_VAR_FILTER "\" for --vars,\n"
                      "\t\t\t \"" DEFAULT_FUNC_FILTER "\" for --funcs)",
                      opt_set_filter),
+        OPT_CALLBACK('x', "exec", NULL, "executable|path",
+                        "target executable name or path", opt_set_target),
         OPT_END()
 };
 
@@ -310,6 +337,10 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
                         pr_err("  Error: Don't use --list with --funcs.\n");
                         usage_with_options(probe_usage, options);
                 }
+                if (params.uprobes) {
+                        pr_warning("  Error: Don't use --list with --exec.\n");
+                        usage_with_options(probe_usage, options);
+                }
                 ret = show_perf_probe_events();
                 if (ret < 0)
                         pr_err("  Error: Failed to show event list. (%d)\n",
@@ -333,8 +364,8 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
                 if (!params.filter)
                         params.filter = strfilter__new(DEFAULT_FUNC_FILTER,
                                                        NULL);
-                ret = show_available_funcs(params.target,
-                                           params.filter);
+                ret = show_available_funcs(params.target, params.filter,
+                                        params.uprobes);
                 strfilter__delete(params.filter);
                 if (ret < 0)
                         pr_err("  Error: Failed to show functions."
@@ -343,7 +374,7 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
         }
 
 #ifdef DWARF_SUPPORT
-        if (params.show_lines) {
+        if (params.show_lines && !params.uprobes) {
                 if (params.mod_events) {
                         pr_err("  Error: Don't use --line with"
                                " --add/--del.\n");
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 8a8ee64e72d1..59dccc98b554 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -44,6 +44,7 @@
 #include "trace-event.h"        /* For __unused */
 #include "probe-event.h"
 #include "probe-finder.h"
+#include "session.h"
 
 #define MAX_CMDLEN 256
 #define MAX_PROBE_ARGS 128
@@ -70,6 +71,8 @@ static int e_snprintf(char *str, size_t size, const char *format, ...)
 }
 
 static char *synthesize_perf_probe_point(struct perf_probe_point *pp);
+static int convert_name_to_addr(struct perf_probe_event *pev,
+                                const char *exec);
 static struct machine machine;
 
 /* Initialize symbol maps and path of vmlinux/modules */
@@ -170,6 +173,34 @@ const char *kernel_get_module_path(const char *module)
         return (dso) ? dso->long_name : NULL;
 }
 
+static int init_user_exec(void)
+{
+        int ret = 0;
+
+        symbol_conf.try_vmlinux_path = false;
+        symbol_conf.sort_by_name = true;
+        ret = symbol__init();
+
+        if (ret < 0)