2009-12-01 00:19:58 +00:00
|
|
|
/*
|
2010-07-29 14:13:51 +00:00
|
|
|
* probe-event.c : perf-probe definition to probe_events format converter
|
2009-12-01 00:19:58 +00:00
|
|
|
*
|
|
|
|
* Written by Masami Hiramatsu <mhiramat@redhat.com>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <sys/utsname.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2009-12-01 00:20:17 +00:00
|
|
|
#include <stdarg.h>
|
|
|
|
#include <limits.h>
|
2011-01-13 12:46:11 +00:00
|
|
|
#include <elf.h>
|
2009-12-01 00:19:58 +00:00
|
|
|
|
2010-03-16 22:05:30 +00:00
|
|
|
#include "util.h"
|
2009-12-01 00:19:58 +00:00
|
|
|
#include "event.h"
|
2009-12-01 00:20:17 +00:00
|
|
|
#include "strlist.h"
|
2009-12-01 00:19:58 +00:00
|
|
|
#include "debug.h"
|
2010-01-05 22:47:10 +00:00
|
|
|
#include "cache.h"
|
2010-01-06 14:45:34 +00:00
|
|
|
#include "color.h"
|
2010-03-16 22:05:37 +00:00
|
|
|
#include "symbol.h"
|
|
|
|
#include "thread.h"
|
2013-12-09 16:14:23 +00:00
|
|
|
#include <api/fs/debugfs.h>
|
2015-02-02 19:35:07 +00:00
|
|
|
#include <api/fs/tracefs.h>
|
2012-09-10 22:15:03 +00:00
|
|
|
#include "trace-event.h" /* For __maybe_unused */
|
2009-12-01 00:19:58 +00:00
|
|
|
#include "probe-event.h"
|
2010-03-16 22:06:12 +00:00
|
|
|
#include "probe-finder.h"
|
2015-07-15 09:14:07 +00:00
|
|
|
#include "probe-file.h"
|
2012-04-16 12:09:09 +00:00
|
|
|
#include "session.h"
|
2009-12-01 00:19:58 +00:00
|
|
|
|
|
|
|
#define MAX_CMDLEN 256
|
|
|
|
#define PERFPROBE_GROUP "probe"
|
|
|
|
|
2010-03-16 22:06:05 +00:00
|
|
|
bool probe_event_dry_run; /* Dry run flag */
|
2015-05-08 01:03:31 +00:00
|
|
|
struct probe_conf probe_conf;
|
2010-03-16 22:06:05 +00:00
|
|
|
|
2010-04-12 17:17:42 +00:00
|
|
|
#define semantic_error(msg ...) pr_err("Semantic error :" msg)
|
2009-12-01 00:19:58 +00:00
|
|
|
|
2015-07-15 09:14:07 +00:00
|
|
|
int e_snprintf(char *str, size_t size, const char *format, ...)
|
2009-12-01 00:20:17 +00:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
va_list ap;
|
|
|
|
va_start(ap, format);
|
|
|
|
ret = vsnprintf(str, size, format, ap);
|
|
|
|
va_end(ap);
|
|
|
|
if (ret >= (int)size)
|
|
|
|
ret = -E2BIG;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2010-03-22 16:10:26 +00:00
|
|
|
static char *synthesize_perf_probe_point(struct perf_probe_point *pp);
|
2014-02-06 05:32:04 +00:00
|
|
|
static struct machine *host_machine;
|
2010-03-16 22:05:37 +00:00
|
|
|
|
2010-10-21 10:13:41 +00:00
|
|
|
/* Initialize symbol maps and path of vmlinux/modules */
|
2014-02-06 05:32:04 +00:00
|
|
|
static int init_symbol_maps(bool user_only)
|
2010-03-16 22:05:37 +00:00
|
|
|
{
|
2010-04-12 17:17:42 +00:00
|
|
|
int ret;
|
|
|
|
|
2010-03-16 22:05:37 +00:00
|
|
|
symbol_conf.sort_by_name = true;
|
2015-03-06 07:31:27 +00:00
|
|
|
symbol_conf.allow_aliases = true;
|
2014-08-12 06:40:45 +00:00
|
|
|
ret = symbol__init(NULL);
|
2010-04-12 17:17:42 +00:00
|
|
|
if (ret < 0) {
|
|
|
|
pr_debug("Failed to init symbol map.\n");
|
|
|
|
goto out;
|
|
|
|
}
|
2010-03-16 22:05:37 +00:00
|
|
|
|
2014-02-06 05:32:04 +00:00
|
|
|
if (host_machine || user_only) /* already initialized */
|
|
|
|
return 0;
|
2010-04-28 00:20:43 +00:00
|
|
|
|
2014-02-06 05:32:04 +00:00
|
|
|
if (symbol_conf.vmlinux_name)
|
|
|
|
pr_debug("Use vmlinux: %s\n", symbol_conf.vmlinux_name);
|
|
|
|
|
|
|
|
host_machine = machine__new_host();
|
|
|
|
if (!host_machine) {
|
|
|
|
pr_debug("machine__new_host() failed.\n");
|
|
|
|
symbol__exit();
|
|
|
|
ret = -1;
|
2010-10-21 10:13:41 +00:00
|
|
|
}
|
2010-04-12 17:17:42 +00:00
|
|
|
out:
|
|
|
|
if (ret < 0)
|
|
|
|
pr_warning("Failed to init vmlinux path.\n");
|
|
|
|
return ret;
|
2010-03-16 22:05:37 +00:00
|
|
|
}
|
|
|
|
|
2014-02-06 05:32:04 +00:00
|
|
|
static void exit_symbol_maps(void)
|
|
|
|
{
|
|
|
|
if (host_machine) {
|
|
|
|
machine__delete(host_machine);
|
|
|
|
host_machine = NULL;
|
|
|
|
}
|
|
|
|
symbol__exit();
|
|
|
|
}
|
|
|
|
|
2010-10-21 10:13:41 +00:00
|
|
|
static struct symbol *__find_kernel_function_by_name(const char *name,
|
|
|
|
struct map **mapp)
|
|
|
|
{
|
2014-02-06 05:32:04 +00:00
|
|
|
return machine__find_kernel_function_by_name(host_machine, name, mapp,
|
2010-10-21 10:13:41 +00:00
|
|
|
NULL);
|
|
|
|
}
|
|
|
|
|
2014-02-06 05:32:20 +00:00
|
|
|
static struct symbol *__find_kernel_function(u64 addr, struct map **mapp)
|
|
|
|
{
|
|
|
|
return machine__find_kernel_function(host_machine, addr, mapp, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ref_reloc_sym *kernel_get_ref_reloc_sym(void)
|
|
|
|
{
|
|
|
|
/* kmap->ref_reloc_sym should be set if host_machine is initialized */
|
|
|
|
struct kmap *kmap;
|
|
|
|
|
|
|
|
if (map__load(host_machine->vmlinux_maps[MAP__FUNCTION], NULL) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
kmap = map__kmap(host_machine->vmlinux_maps[MAP__FUNCTION]);
|
2015-04-07 08:22:45 +00:00
|
|
|
if (!kmap)
|
|
|
|
return NULL;
|
2014-02-06 05:32:20 +00:00
|
|
|
return kmap->ref_reloc_sym;
|
|
|
|
}
|
|
|
|
|
|
|
|
static u64 kernel_get_symbol_address_by_name(const char *name, bool reloc)
|
|
|
|
{
|
|
|
|
struct ref_reloc_sym *reloc_sym;
|
|
|
|
struct symbol *sym;
|
|
|
|
struct map *map;
|
|
|
|
|
|
|
|
/* ref_reloc_sym is just a label. Need a special fix*/
|
|
|
|
reloc_sym = kernel_get_ref_reloc_sym();
|
|
|
|
if (reloc_sym && strcmp(name, reloc_sym->name) == 0)
|
|
|
|
return (reloc) ? reloc_sym->addr : reloc_sym->unrelocated_addr;
|
|
|
|
else {
|
|
|
|
sym = __find_kernel_function_by_name(name, &map);
|
|
|
|
if (sym)
|
|
|
|
return map->unmap_ip(map, sym->start) -
|
2015-02-27 10:52:53 +00:00
|
|
|
((reloc) ? 0 : map->reloc);
|
2014-02-06 05:32:20 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-01-13 12:46:11 +00:00
|
|
|
static struct map *kernel_get_module_map(const char *module)
|
|
|
|
{
|
2014-02-06 05:32:04 +00:00
|
|
|
struct map_groups *grp = &host_machine->kmaps;
|
2015-05-22 15:58:53 +00:00
|
|
|
struct maps *maps = &grp->maps[MAP__FUNCTION];
|
2015-05-22 14:52:22 +00:00
|
|
|
struct map *pos;
|
2011-01-13 12:46:11 +00:00
|
|
|
|
2011-06-27 07:27:51 +00:00
|
|
|
/* A file path -- this is an offline module */
|
|
|
|
if (module && strchr(module, '/'))
|
perf machine: Fix up some more method names
Calling the function 'machine__new_module' implies a new 'module' will
be allocated, when in fact what is returned is a 'struct map' instance,
that not necessarily will be instantiated, as if one already exists with
the given module name, it will be returned instead.
So be consistent with other "find and if not there, create" like
functions, like machine__findnew_thread, machine__findnew_dso, etc, and
rename it to machine__findnew_module_map(), that in turn will call
machine__findnew_module_dso().
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/n/tip-acv830vd3hwww2ih5vjtbmu3@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-06-01 15:01:02 +00:00
|
|
|
return machine__findnew_module_map(host_machine, 0, module);
|
2011-06-27 07:27:51 +00:00
|
|
|
|
2011-01-13 12:46:11 +00:00
|
|
|
if (!module)
|
|
|
|
module = "kernel";
|
|
|
|
|
2015-05-22 14:52:22 +00:00
|
|
|
for (pos = maps__first(maps); pos; pos = map__next(pos)) {
|
2011-01-13 12:46:11 +00:00
|
|
|
if (strncmp(pos->dso->short_name + 1, module,
|
|
|
|
pos->dso->short_name_len - 2) == 0) {
|
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
static struct map *get_target_map(const char *target, bool user)
|
|
|
|
{
|
|
|
|
/* Init maps of given executable or kernel */
|
|
|
|
if (user)
|
|
|
|
return dso__new_map(target);
|
|
|
|
else
|
|
|
|
return kernel_get_module_map(target);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void put_target_map(struct map *map, bool user)
|
|
|
|
{
|
|
|
|
if (map && user) {
|
|
|
|
/* Only the user map needs to be released */
|
2015-05-25 19:59:56 +00:00
|
|
|
map__put(map);
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
perf probe: Support basic dwarf-based operations on uprobe events
Support basic dwarf(debuginfo) based operations for uprobe events. With
this change, perf probe can analyze debuginfo of user application binary
to set up new uprobe event.
This allows perf-probe --add(with local variables, line numbers) and
--line works with -x option. (Actually, --vars has already accepted -x
option)
For example, the following command shows the probe-able lines of a given
user space function. Something that so far was only available in the
'perf probe' tool for kernel space functions:
# ./perf probe -x perf --line map__load
<map__load@/home/fedora/ksrc/linux-2.6/tools/perf/util/map.c:0>
0 int map__load(struct map *map, symbol_filter_t filter)
1 {
2 const char *name = map->dso->long_name;
int nr;
5 if (dso__loaded(map->dso, map->type))
6 return 0;
8 nr = dso__load(map->dso, map, filter);
9 if (nr < 0) {
10 if (map->dso->has_build_id) {
And this shows the available variables at the given line of the
function.
# ./perf probe -x perf --vars map__load:8
Available variables at map__load:8
@<map__load+96>
char* name
struct map* map
symbol_filter_t filter
@<map__find_symbol+112>
char* name
symbol_filter_t filter
@<map__find_symbol_by_name+136>
char* name
symbol_filter_t filter
@<map_groups__find_symbol_by_name+176>
char* name
struct map* map
symbol_filter_t filter
And lastly, we can now define probe(s) with all available
variables on the given line:
# ./perf probe -x perf --add 'map__load:8 $vars'
Added new events:
probe_perf:map__load (on map__load:8 with $vars)
probe_perf:map__load_1 (on map__load:8 with $vars)
probe_perf:map__load_2 (on map__load:8 with $vars)
probe_perf:map__load_3 (on map__load:8 with $vars)
You can now use it in all perf tools, such as:
perf record -e probe_perf:map__load_3 -aR sleep 1
Changes from previous version:
- Add examples in the patch description.
- Use .text section start address and dwarf symbol address
for calculating the offset of given symbol, instead of
searching the symbol in symtab again.
With this change, we can safely handle multiple local
function instances (e.g. scnprintf in perf).
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: David A. Long <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: systemtap@sourceware.org
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20131226054152.22364.47021.stgit@kbuild-fedora.novalocal
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2013-12-26 05:41:53 +00:00
|
|
|
static int convert_exec_to_group(const char *exec, char **result)
|
|
|
|
{
|
|
|
|
char *ptr1, *ptr2, *exec_copy;
|
|
|
|
char buf[64];
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
exec_copy = strdup(exec);
|
|
|
|
if (!exec_copy)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
ptr1 = basename(exec_copy);
|
|
|
|
if (!ptr1) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
ptr2 = strpbrk(ptr1, "-._");
|
|
|
|
if (ptr2)
|
|
|
|
*ptr2 = '\0';
|
|
|
|
ret = e_snprintf(buf, 64, "%s_%s", PERFPROBE_GROUP, ptr1);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
*result = strdup(buf);
|
|
|
|
ret = *result ? 0 : -ENOMEM;
|
|
|
|
|
|
|
|
out:
|
|
|
|
free(exec_copy);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
static void clear_perf_probe_point(struct perf_probe_point *pp)
|
|
|
|
{
|
|
|
|
free(pp->file);
|
|
|
|
free(pp->function);
|
|
|
|
free(pp->lazy_line);
|
|
|
|
}
|
|
|
|
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
static void clear_probe_trace_events(struct probe_trace_event *tevs, int ntevs)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ntevs; i++)
|
|
|
|
clear_probe_trace_event(tevs + i);
|
|
|
|
}
|
|
|
|
|
2015-06-16 11:50:55 +00:00
|
|
|
static bool kprobe_blacklist__listed(unsigned long address);
|
|
|
|
static bool kprobe_warn_out_range(const char *symbol, unsigned long address)
|
|
|
|
{
|
2015-06-18 02:49:10 +00:00
|
|
|
u64 etext_addr;
|
|
|
|
|
2015-06-16 11:50:55 +00:00
|
|
|
/* Get the address of _etext for checking non-probable text symbol */
|
2015-06-18 02:49:10 +00:00
|
|
|
etext_addr = kernel_get_symbol_address_by_name("_etext", false);
|
|
|
|
|
|
|
|
if (etext_addr != 0 && etext_addr < address)
|
2015-06-16 11:50:55 +00:00
|
|
|
pr_warning("%s is out of .text, skip it.\n", symbol);
|
|
|
|
else if (kprobe_blacklist__listed(address))
|
|
|
|
pr_warning("%s is blacklisted function, skip it.\n", symbol);
|
|
|
|
else
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2013-09-30 10:07:11 +00:00
|
|
|
#ifdef HAVE_DWARF_SUPPORT
|
2015-05-28 02:25:05 +00:00
|
|
|
|
|
|
|
static int kernel_get_module_dso(const char *module, struct dso **pdso)
|
|
|
|
{
|
|
|
|
struct dso *dso;
|
|
|
|
struct map *map;
|
|
|
|
const char *vmlinux_name;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (module) {
|
2015-05-28 16:06:42 +00:00
|
|
|
list_for_each_entry(dso, &host_machine->dsos.head, node) {
|
|
|
|
if (!dso->kernel)
|
|
|
|
continue;
|
2015-05-28 02:25:05 +00:00
|
|
|
if (strncmp(dso->short_name + 1, module,
|
|
|
|
dso->short_name_len - 2) == 0)
|
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
pr_debug("Failed to find module %s.\n", module);
|
|
|
|
return -ENOENT;
|
|
|
|
}
|
|
|
|
|
|
|
|
map = host_machine->vmlinux_maps[MAP__FUNCTION];
|
|
|
|
dso = map->dso;
|
|
|
|
|
|
|
|
vmlinux_name = symbol_conf.vmlinux_name;
|
|
|
|
dso->load_errno = 0;
|
|
|
|
if (vmlinux_name)
|
|
|
|
ret = dso__load_vmlinux(dso, map, vmlinux_name, false, NULL);
|
|
|
|
else
|
|
|
|
ret = dso__load_vmlinux_path(dso, map, NULL);
|
|
|
|
found:
|
|
|
|
*pdso = dso;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
/*
|
|
|
|
* Some binaries like glibc have special symbols which are on the symbol
|
|
|
|
* table, but not in the debuginfo. If we can find the address of the
|
|
|
|
* symbol from map, we can translate the address back to the probe point.
|
|
|
|
*/
|
|
|
|
static int find_alternative_probe_point(struct debuginfo *dinfo,
|
|
|
|
struct perf_probe_point *pp,
|
|
|
|
struct perf_probe_point *result,
|
|
|
|
const char *target, bool uprobes)
|
|
|
|
{
|
|
|
|
struct map *map = NULL;
|
|
|
|
struct symbol *sym;
|
|
|
|
u64 address = 0;
|
|
|
|
int ret = -ENOENT;
|
|
|
|
|
|
|
|
/* This can work only for function-name based one */
|
|
|
|
if (!pp->function || pp->file)
|
|
|
|
return -ENOTSUP;
|
|
|
|
|
|
|
|
map = get_target_map(target, uprobes);
|
|
|
|
if (!map)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
/* Find the address of given function */
|
|
|
|
map__for_each_symbol_by_name(map, pp->function, sym) {
|
2015-03-22 11:40:22 +00:00
|
|
|
if (uprobes)
|
|
|
|
address = sym->start;
|
|
|
|
else
|
|
|
|
address = map->unmap_ip(map, sym->start);
|
2015-03-06 07:31:29 +00:00
|
|
|
break;
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
}
|
|
|
|
if (!address) {
|
|
|
|
ret = -ENOENT;
|
|
|
|
goto out;
|
|
|
|
}
|
2015-04-08 02:14:34 +00:00
|
|
|
pr_debug("Symbol %s address found : %" PRIx64 "\n",
|
|
|
|
pp->function, address);
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
|
|
|
|
ret = debuginfo__find_probe_point(dinfo, (unsigned long)address,
|
|
|
|
result);
|
|
|
|
if (ret <= 0)
|
|
|
|
ret = (!ret) ? -ENOENT : ret;
|
|
|
|
else {
|
|
|
|
result->offset += pp->offset;
|
|
|
|
result->line += pp->line;
|
2015-04-13 11:41:28 +00:00
|
|
|
result->retprobe = pp->retprobe;
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
ret = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
put_target_map(map, uprobes);
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static int get_alternative_probe_event(struct debuginfo *dinfo,
|
|
|
|
struct perf_probe_event *pev,
|
2015-05-08 01:03:28 +00:00
|
|
|
struct perf_probe_point *tmp)
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
memcpy(tmp, &pev->point, sizeof(*tmp));
|
|
|
|
memset(&pev->point, 0, sizeof(pev->point));
|
|
|
|
ret = find_alternative_probe_point(dinfo, tmp, &pev->point,
|
2015-05-08 01:03:28 +00:00
|
|
|
pev->target, pev->uprobes);
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
if (ret < 0)
|
|
|
|
memcpy(&pev->point, tmp, sizeof(*tmp));
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2014-02-06 05:32:27 +00:00
|
|
|
|
2015-03-06 07:31:22 +00:00
|
|
|
static int get_alternative_line_range(struct debuginfo *dinfo,
|
|
|
|
struct line_range *lr,
|
|
|
|
const char *target, bool user)
|
|
|
|
{
|
2015-03-11 14:36:20 +00:00
|
|
|
struct perf_probe_point pp = { .function = lr->function,
|
|
|
|
.file = lr->file,
|
|
|
|
.line = lr->start };
|
|
|
|
struct perf_probe_point result;
|
2015-03-06 07:31:22 +00:00
|
|
|
int ret, len = 0;
|
|
|
|
|
2015-03-11 14:36:20 +00:00
|
|
|
memset(&result, 0, sizeof(result));
|
|
|
|
|
2015-03-06 07:31:22 +00:00
|
|
|
if (lr->end != INT_MAX)
|
|
|
|
len = lr->end - lr->start;
|
|
|
|
ret = find_alternative_probe_point(dinfo, &pp, &result,
|
|
|
|
target, user);
|
|
|
|
if (!ret) {
|
|
|
|
lr->function = result.function;
|
|
|
|
lr->file = result.file;
|
|
|
|
lr->start = result.line;
|
|
|
|
if (lr->end != INT_MAX)
|
|
|
|
lr->end = lr->start + len;
|
|
|
|
clear_perf_probe_point(&pp);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-06-27 07:27:39 +00:00
|
|
|
/* Open new debuginfo of given module */
|
2014-08-15 01:44:32 +00:00
|
|
|
static struct debuginfo *open_debuginfo(const char *module, bool silent)
|
2010-03-16 22:05:37 +00:00
|
|
|
{
|
2014-02-06 05:32:27 +00:00
|
|
|
const char *path = module;
|
2015-05-27 08:37:18 +00:00
|
|
|
char reason[STRERR_BUFSIZE];
|
|
|
|
struct debuginfo *ret = NULL;
|
|
|
|
struct dso *dso = NULL;
|
|
|
|
int err;
|
2011-06-27 07:27:39 +00:00
|
|
|
|
2014-02-06 05:32:27 +00:00
|
|
|
if (!module || !strchr(module, '/')) {
|
2015-05-27 08:37:18 +00:00
|
|
|
err = kernel_get_module_dso(module, &dso);
|
|
|
|
if (err < 0) {
|
|
|
|
if (!dso || dso->load_errno == 0) {
|
|
|
|
if (!strerror_r(-err, reason, STRERR_BUFSIZE))
|
|
|
|
strcpy(reason, "(unknown)");
|
|
|
|
} else
|
|
|
|
dso__strerror_load(dso, reason, STRERR_BUFSIZE);
|
2014-08-15 01:44:32 +00:00
|
|
|
if (!silent)
|
2015-05-27 08:37:18 +00:00
|
|
|
pr_err("Failed to find the path for %s: %s\n",
|
|
|
|
module ?: "kernel", reason);
|
2011-06-27 07:27:51 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2015-05-27 08:37:18 +00:00
|
|
|
path = dso->long_name;
|
2010-03-16 22:05:37 +00:00
|
|
|
}
|
2014-08-15 01:44:32 +00:00
|
|
|
ret = debuginfo__new(path);
|
|
|
|
if (!ret && !silent) {
|
|
|
|
pr_warning("The %s file has no debug information.\n", path);
|
|
|
|
if (!module || !strtailcmp(path, ".ko"))
|
|
|
|
pr_warning("Rebuild with CONFIG_DEBUG_INFO=y, ");
|
|
|
|
else
|
|
|
|
pr_warning("Rebuild with -g, ");
|
|
|
|
pr_warning("or install an appropriate debuginfo package.\n");
|
|
|
|
}
|
|
|
|
return ret;
|
2010-03-16 22:05:37 +00:00
|
|
|
}
|
2010-03-22 16:10:26 +00:00
|
|
|
|
2015-06-17 14:58:54 +00:00
|
|
|
/* For caching the last debuginfo */
|
|
|
|
static struct debuginfo *debuginfo_cache;
|
|
|
|
static char *debuginfo_cache_path;
|
|
|
|
|
|
|
|
static struct debuginfo *debuginfo_cache__open(const char *module, bool silent)
|
|
|
|
{
|
|
|
|
if ((debuginfo_cache_path && !strcmp(debuginfo_cache_path, module)) ||
|
|
|
|
(!debuginfo_cache_path && !module && debuginfo_cache))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* Copy module path */
|
|
|
|
free(debuginfo_cache_path);
|
|
|
|
if (module) {
|
|
|
|
debuginfo_cache_path = strdup(module);
|
|
|
|
if (!debuginfo_cache_path) {
|
|
|
|
debuginfo__delete(debuginfo_cache);
|
|
|
|
debuginfo_cache = NULL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
debuginfo_cache = open_debuginfo(module, silent);
|
|
|
|
if (!debuginfo_cache)
|
|
|
|
zfree(&debuginfo_cache_path);
|
|
|
|
out:
|
|
|
|
return debuginfo_cache;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void debuginfo_cache__exit(void)
|
|
|
|
{
|
|
|
|
debuginfo__delete(debuginfo_cache);
|
|
|
|
debuginfo_cache = NULL;
|
|
|
|
zfree(&debuginfo_cache_path);
|
|
|
|
}
|
|
|
|
|
2014-08-15 01:44:32 +00:00
|
|
|
|
2014-01-16 09:39:49 +00:00
|
|
|
static int get_text_start_address(const char *exec, unsigned long *address)
|
|
|
|
{
|
|
|
|
Elf *elf;
|
|
|
|
GElf_Ehdr ehdr;
|
|
|
|
GElf_Shdr shdr;
|
|
|
|
int fd, ret = -ENOENT;
|
|
|
|
|
|
|
|
fd = open(exec, O_RDONLY);
|
|
|
|
if (fd < 0)
|
|
|
|
return -errno;
|
|
|
|
|
|
|
|
elf = elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL);
|
|
|
|
if (elf == NULL)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (gelf_getehdr(elf, &ehdr) == NULL)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (!elf_section_by_name(elf, &ehdr, &shdr, ".text", NULL))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
*address = shdr.sh_addr - shdr.sh_offset;
|
|
|
|
ret = 0;
|
|
|
|
out:
|
|
|
|
elf_end(elf);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-02-06 05:32:23 +00:00
|
|
|
/*
|
|
|
|
* Convert trace point to probe point with debuginfo
|
|
|
|
*/
|
|
|
|
static int find_perf_probe_point_from_dwarf(struct probe_trace_point *tp,
|
|
|
|
struct perf_probe_point *pp,
|
|
|
|
bool is_kprobe)
|
|
|
|
{
|
|
|
|
struct debuginfo *dinfo = NULL;
|
|
|
|
unsigned long stext = 0;
|
|
|
|
u64 addr = tp->address;
|
|
|
|
int ret = -ENOENT;
|
|
|
|
|
|
|
|
/* convert the address to dwarf address */
|
|
|
|
if (!is_kprobe) {
|
|
|
|
if (!addr) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
ret = get_text_start_address(tp->module, &stext);
|
|
|
|
if (ret < 0)
|
|
|
|
goto error;
|
|
|
|
addr += stext;
|
|
|
|
} else {
|
|
|
|
addr = kernel_get_symbol_address_by_name(tp->symbol, false);
|
|
|
|
if (addr == 0)
|
|
|
|
goto error;
|
|
|
|
addr += tp->offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
pr_debug("try to find information at %" PRIx64 " in %s\n", addr,
|
|
|
|
tp->module ? : "kernel");
|
|
|
|
|
2015-06-17 14:58:54 +00:00
|
|
|
dinfo = debuginfo_cache__open(tp->module, verbose == 0);
|
|
|
|
if (dinfo)
|
2014-02-06 05:32:23 +00:00
|
|
|
ret = debuginfo__find_probe_point(dinfo,
|
|
|
|
(unsigned long)addr, pp);
|
2015-06-17 14:58:54 +00:00
|
|
|
else
|
2014-02-06 05:32:23 +00:00
|
|
|
ret = -ENOENT;
|
|
|
|
|
|
|
|
if (ret > 0) {
|
|
|
|
pp->retprobe = tp->retprobe;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
error:
|
|
|
|
pr_debug("Failed to find corresponding probes from debuginfo.\n");
|
|
|
|
return ret ? : -ENOENT;
|
|
|
|
}
|
|
|
|
|
perf probe: Support basic dwarf-based operations on uprobe events
Support basic dwarf(debuginfo) based operations for uprobe events. With
this change, perf probe can analyze debuginfo of user application binary
to set up new uprobe event.
This allows perf-probe --add(with local variables, line numbers) and
--line works with -x option. (Actually, --vars has already accepted -x
option)
For example, the following command shows the probe-able lines of a given
user space function. Something that so far was only available in the
'perf probe' tool for kernel space functions:
# ./perf probe -x perf --line map__load
<map__load@/home/fedora/ksrc/linux-2.6/tools/perf/util/map.c:0>
0 int map__load(struct map *map, symbol_filter_t filter)
1 {
2 const char *name = map->dso->long_name;
int nr;
5 if (dso__loaded(map->dso, map->type))
6 return 0;
8 nr = dso__load(map->dso, map, filter);
9 if (nr < 0) {
10 if (map->dso->has_build_id) {
And this shows the available variables at the given line of the
function.
# ./perf probe -x perf --vars map__load:8
Available variables at map__load:8
@<map__load+96>
char* name
struct map* map
symbol_filter_t filter
@<map__find_symbol+112>
char* name
symbol_filter_t filter
@<map__find_symbol_by_name+136>
char* name
symbol_filter_t filter
@<map_groups__find_symbol_by_name+176>
char* name
struct map* map
symbol_filter_t filter
And lastly, we can now define probe(s) with all available
variables on the given line:
# ./perf probe -x perf --add 'map__load:8 $vars'
Added new events:
probe_perf:map__load (on map__load:8 with $vars)
probe_perf:map__load_1 (on map__load:8 with $vars)
probe_perf:map__load_2 (on map__load:8 with $vars)
probe_perf:map__load_3 (on map__load:8 with $vars)
You can now use it in all perf tools, such as:
perf record -e probe_perf:map__load_3 -aR sleep 1
Changes from previous version:
- Add examples in the patch description.
- Use .text section start address and dwarf symbol address
for calculating the offset of given symbol, instead of
searching the symbol in symtab again.
With this change, we can safely handle multiple local
function instances (e.g. scnprintf in perf).
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: David A. Long <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: systemtap@sourceware.org
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20131226054152.22364.47021.stgit@kbuild-fedora.novalocal
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2013-12-26 05:41:53 +00:00
|
|
|
static int add_exec_to_probe_trace_events(struct probe_trace_event *tevs,
|
|
|
|
int ntevs, const char *exec)
|
|
|
|
{
|
|
|
|
int i, ret = 0;
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
unsigned long stext = 0;
|
perf probe: Support basic dwarf-based operations on uprobe events
Support basic dwarf(debuginfo) based operations for uprobe events. With
this change, perf probe can analyze debuginfo of user application binary
to set up new uprobe event.
This allows perf-probe --add(with local variables, line numbers) and
--line works with -x option. (Actually, --vars has already accepted -x
option)
For example, the following command shows the probe-able lines of a given
user space function. Something that so far was only available in the
'perf probe' tool for kernel space functions:
# ./perf probe -x perf --line map__load
<map__load@/home/fedora/ksrc/linux-2.6/tools/perf/util/map.c:0>
0 int map__load(struct map *map, symbol_filter_t filter)
1 {
2 const char *name = map->dso->long_name;
int nr;
5 if (dso__loaded(map->dso, map->type))
6 return 0;
8 nr = dso__load(map->dso, map, filter);
9 if (nr < 0) {
10 if (map->dso->has_build_id) {
And this shows the available variables at the given line of the
function.
# ./perf probe -x perf --vars map__load:8
Available variables at map__load:8
@<map__load+96>
char* name
struct map* map
symbol_filter_t filter
@<map__find_symbol+112>
char* name
symbol_filter_t filter
@<map__find_symbol_by_name+136>
char* name
symbol_filter_t filter
@<map_groups__find_symbol_by_name+176>
char* name
struct map* map
symbol_filter_t filter
And lastly, we can now define probe(s) with all available
variables on the given line:
# ./perf probe -x perf --add 'map__load:8 $vars'
Added new events:
probe_perf:map__load (on map__load:8 with $vars)
probe_perf:map__load_1 (on map__load:8 with $vars)
probe_perf:map__load_2 (on map__load:8 with $vars)
probe_perf:map__load_3 (on map__load:8 with $vars)
You can now use it in all perf tools, such as:
perf record -e probe_perf:map__load_3 -aR sleep 1
Changes from previous version:
- Add examples in the patch description.
- Use .text section start address and dwarf symbol address
for calculating the offset of given symbol, instead of
searching the symbol in symtab again.
With this change, we can safely handle multiple local
function instances (e.g. scnprintf in perf).
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: David A. Long <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: systemtap@sourceware.org
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20131226054152.22364.47021.stgit@kbuild-fedora.novalocal
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2013-12-26 05:41:53 +00:00
|
|
|
|
|
|
|
if (!exec)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ret = get_text_start_address(exec, &stext);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
for (i = 0; i < ntevs && ret >= 0; i++) {
|
2014-02-05 05:18:58 +00:00
|
|
|
/* point.address is the addres of point.symbol + point.offset */
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
tevs[i].point.address -= stext;
|
perf probe: Support basic dwarf-based operations on uprobe events
Support basic dwarf(debuginfo) based operations for uprobe events. With
this change, perf probe can analyze debuginfo of user application binary
to set up new uprobe event.
This allows perf-probe --add(with local variables, line numbers) and
--line works with -x option. (Actually, --vars has already accepted -x
option)
For example, the following command shows the probe-able lines of a given
user space function. Something that so far was only available in the
'perf probe' tool for kernel space functions:
# ./perf probe -x perf --line map__load
<map__load@/home/fedora/ksrc/linux-2.6/tools/perf/util/map.c:0>
0 int map__load(struct map *map, symbol_filter_t filter)
1 {
2 const char *name = map->dso->long_name;
int nr;
5 if (dso__loaded(map->dso, map->type))
6 return 0;
8 nr = dso__load(map->dso, map, filter);
9 if (nr < 0) {
10 if (map->dso->has_build_id) {
And this shows the available variables at the given line of the
function.
# ./perf probe -x perf --vars map__load:8
Available variables at map__load:8
@<map__load+96>
char* name
struct map* map
symbol_filter_t filter
@<map__find_symbol+112>
char* name
symbol_filter_t filter
@<map__find_symbol_by_name+136>
char* name
symbol_filter_t filter
@<map_groups__find_symbol_by_name+176>
char* name
struct map* map
symbol_filter_t filter
And lastly, we can now define probe(s) with all available
variables on the given line:
# ./perf probe -x perf --add 'map__load:8 $vars'
Added new events:
probe_perf:map__load (on map__load:8 with $vars)
probe_perf:map__load_1 (on map__load:8 with $vars)
probe_perf:map__load_2 (on map__load:8 with $vars)
probe_perf:map__load_3 (on map__load:8 with $vars)
You can now use it in all perf tools, such as:
perf record -e probe_perf:map__load_3 -aR sleep 1
Changes from previous version:
- Add examples in the patch description.
- Use .text section start address and dwarf symbol address
for calculating the offset of given symbol, instead of
searching the symbol in symtab again.
With this change, we can safely handle multiple local
function instances (e.g. scnprintf in perf).
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: David A. Long <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: systemtap@sourceware.org
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20131226054152.22364.47021.stgit@kbuild-fedora.novalocal
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2013-12-26 05:41:53 +00:00
|
|
|
tevs[i].point.module = strdup(exec);
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
if (!tevs[i].point.module) {
|
perf probe: Support basic dwarf-based operations on uprobe events
Support basic dwarf(debuginfo) based operations for uprobe events. With
this change, perf probe can analyze debuginfo of user application binary
to set up new uprobe event.
This allows perf-probe --add(with local variables, line numbers) and
--line works with -x option. (Actually, --vars has already accepted -x
option)
For example, the following command shows the probe-able lines of a given
user space function. Something that so far was only available in the
'perf probe' tool for kernel space functions:
# ./perf probe -x perf --line map__load
<map__load@/home/fedora/ksrc/linux-2.6/tools/perf/util/map.c:0>
0 int map__load(struct map *map, symbol_filter_t filter)
1 {
2 const char *name = map->dso->long_name;
int nr;
5 if (dso__loaded(map->dso, map->type))
6 return 0;
8 nr = dso__load(map->dso, map, filter);
9 if (nr < 0) {
10 if (map->dso->has_build_id) {
And this shows the available variables at the given line of the
function.
# ./perf probe -x perf --vars map__load:8
Available variables at map__load:8
@<map__load+96>
char* name
struct map* map
symbol_filter_t filter
@<map__find_symbol+112>
char* name
symbol_filter_t filter
@<map__find_symbol_by_name+136>
char* name
symbol_filter_t filter
@<map_groups__find_symbol_by_name+176>
char* name
struct map* map
symbol_filter_t filter
And lastly, we can now define probe(s) with all available
variables on the given line:
# ./perf probe -x perf --add 'map__load:8 $vars'
Added new events:
probe_perf:map__load (on map__load:8 with $vars)
probe_perf:map__load_1 (on map__load:8 with $vars)
probe_perf:map__load_2 (on map__load:8 with $vars)
probe_perf:map__load_3 (on map__load:8 with $vars)
You can now use it in all perf tools, such as:
perf record -e probe_perf:map__load_3 -aR sleep 1
Changes from previous version:
- Add examples in the patch description.
- Use .text section start address and dwarf symbol address
for calculating the offset of given symbol, instead of
searching the symbol in symtab again.
With this change, we can safely handle multiple local
function instances (e.g. scnprintf in perf).
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: David A. Long <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: systemtap@sourceware.org
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20131226054152.22364.47021.stgit@kbuild-fedora.novalocal
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2013-12-26 05:41:53 +00:00
|
|
|
ret = -ENOMEM;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
tevs[i].uprobes = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-06-27 07:27:45 +00:00
|
|
|
static int add_module_to_probe_trace_events(struct probe_trace_event *tevs,
|
|
|
|
int ntevs, const char *module)
|
|
|
|
{
|
2011-06-27 07:27:51 +00:00
|
|
|
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() */
|
|
|
|
}
|
|
|
|
|
2011-06-27 07:27:45 +00:00
|
|
|
for (i = 0; i < ntevs; i++) {
|
|
|
|
tevs[i].point.module = strdup(module);
|
2011-06-27 07:27:51 +00:00
|
|
|
if (!tevs[i].point.module) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
break;
|
|
|
|
}
|
2011-06-27 07:27:45 +00:00
|
|
|
}
|
2011-06-27 07:27:51 +00:00
|
|
|
|
2013-12-26 18:54:57 +00:00
|
|
|
free(tmp);
|
2011-06-27 07:27:51 +00:00
|
|
|
return ret;
|
2011-06-27 07:27:45 +00:00
|
|
|
}
|
|
|
|
|
perf probe: Use ref_reloc_sym based address instead of the symbol name
Since several local symbols can have same name (e.g. t_show), we need to
use the relative address from the symbol referred by kmap->ref_reloc_sym
instead of the target symbol name itself.
Because the kernel address space layout randomize (kASLR) changes the
absolute address of kernel symbols, we can't rely on the absolute
address.
Note that this works only with debuginfo.
E.g. without this change;
----
# ./perf probe -a "t_show \$vars"
Added new events:
probe:t_show (on t_show with $vars)
probe:t_show_1 (on t_show with $vars)
probe:t_show_2 (on t_show with $vars)
probe:t_show_3 (on t_show with $vars)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
----
OK, we have 4 different t_show()s. All functions have
different arguments as below;
----
# cat /sys/kernel/debug/tracing/kprobe_events
p:probe/t_show t_show m=%di:u64 v=%si:u64
p:probe/t_show_1 t_show m=%di:u64 v=%si:u64 t=%si:u64
p:probe/t_show_2 t_show m=%di:u64 v=%si:u64 fmt=%si:u64
p:probe/t_show_3 t_show m=%di:u64 v=%si:u64 file=%si:u64
----
However, all of them have been put on the *same* address.
----
# cat /sys/kernel/debug/kprobes/list
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
----
With this change;
----
# ./perf probe -a "t_show \$vars"
Added new events:
probe:t_show (on t_show with $vars)
probe:t_show_1 (on t_show with $vars)
probe:t_show_2 (on t_show with $vars)
probe:t_show_3 (on t_show with $vars)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# cat /sys/kernel/debug/tracing/kprobe_events
p:probe/t_show _stext+889880 m=%di:u64 v=%si:u64
p:probe/t_show_1 _stext+928568 m=%di:u64 v=%si:u64 t=%si:u64
p:probe/t_show_2 _stext+969512 m=%di:u64 v=%si:u64 fmt=%si:u64
p:probe/t_show_3 _stext+1001416 m=%di:u64 v=%si:u64 file=%si:u64
# cat /sys/kernel/debug/kprobes/list
ffffffffb50d95e0 k t_show+0x0 [DISABLED]
ffffffffb50e2d00 k t_show+0x0 [DISABLED]
ffffffffb50f4990 k t_show+0x0 [DISABLED]
ffffffffb50eccf0 k t_show+0x0 [DISABLED]
----
This time, each event is put in different address
correctly.
Note that currently this doesn't support address-based
probe on modules (thus the probes on modules are symbol
based), since it requires relative address probe syntax
for kprobe-tracer, and it isn't implemented yet.
One more note, this allows us to put events on correct
address, but --list option should be updated to show
correct corresponding source code.
Changes from v2:
- Refer kmap->ref_reloc_sym instead of "_stext".
- Refer map->reloc to catch up the kASLR perf fix.
Changes from v1:
- Use _stext relative address instead of actual
absolute address recorded in debuginfo.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053216.29635.22584.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:16 +00:00
|
|
|
/* Post processing the probe events */
|
|
|
|
static int post_process_probe_trace_events(struct probe_trace_event *tevs,
|
|
|
|
int ntevs, const char *module,
|
|
|
|
bool uprobe)
|
|
|
|
{
|
|
|
|
struct ref_reloc_sym *reloc_sym;
|
|
|
|
char *tmp;
|
2015-05-06 12:46:49 +00:00
|
|
|
int i, skipped = 0;
|
perf probe: Use ref_reloc_sym based address instead of the symbol name
Since several local symbols can have same name (e.g. t_show), we need to
use the relative address from the symbol referred by kmap->ref_reloc_sym
instead of the target symbol name itself.
Because the kernel address space layout randomize (kASLR) changes the
absolute address of kernel symbols, we can't rely on the absolute
address.
Note that this works only with debuginfo.
E.g. without this change;
----
# ./perf probe -a "t_show \$vars"
Added new events:
probe:t_show (on t_show with $vars)
probe:t_show_1 (on t_show with $vars)
probe:t_show_2 (on t_show with $vars)
probe:t_show_3 (on t_show with $vars)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
----
OK, we have 4 different t_show()s. All functions have
different arguments as below;
----
# cat /sys/kernel/debug/tracing/kprobe_events
p:probe/t_show t_show m=%di:u64 v=%si:u64
p:probe/t_show_1 t_show m=%di:u64 v=%si:u64 t=%si:u64
p:probe/t_show_2 t_show m=%di:u64 v=%si:u64 fmt=%si:u64
p:probe/t_show_3 t_show m=%di:u64 v=%si:u64 file=%si:u64
----
However, all of them have been put on the *same* address.
----
# cat /sys/kernel/debug/kprobes/list
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
----
With this change;
----
# ./perf probe -a "t_show \$vars"
Added new events:
probe:t_show (on t_show with $vars)
probe:t_show_1 (on t_show with $vars)
probe:t_show_2 (on t_show with $vars)
probe:t_show_3 (on t_show with $vars)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# cat /sys/kernel/debug/tracing/kprobe_events
p:probe/t_show _stext+889880 m=%di:u64 v=%si:u64
p:probe/t_show_1 _stext+928568 m=%di:u64 v=%si:u64 t=%si:u64
p:probe/t_show_2 _stext+969512 m=%di:u64 v=%si:u64 fmt=%si:u64
p:probe/t_show_3 _stext+1001416 m=%di:u64 v=%si:u64 file=%si:u64
# cat /sys/kernel/debug/kprobes/list
ffffffffb50d95e0 k t_show+0x0 [DISABLED]
ffffffffb50e2d00 k t_show+0x0 [DISABLED]
ffffffffb50f4990 k t_show+0x0 [DISABLED]
ffffffffb50eccf0 k t_show+0x0 [DISABLED]
----
This time, each event is put in different address
correctly.
Note that currently this doesn't support address-based
probe on modules (thus the probes on modules are symbol
based), since it requires relative address probe syntax
for kprobe-tracer, and it isn't implemented yet.
One more note, this allows us to put events on correct
address, but --list option should be updated to show
correct corresponding source code.
Changes from v2:
- Refer kmap->ref_reloc_sym instead of "_stext".
- Refer map->reloc to catch up the kASLR perf fix.
Changes from v1:
- Use _stext relative address instead of actual
absolute address recorded in debuginfo.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053216.29635.22584.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:16 +00:00
|
|
|
|
|
|
|
if (uprobe)
|
|
|
|
return add_exec_to_probe_trace_events(tevs, ntevs, module);
|
|
|
|
|
|
|
|
/* Note that currently ref_reloc_sym based probe is not for drivers */
|
|
|
|
if (module)
|
|
|
|
return add_module_to_probe_trace_events(tevs, ntevs, module);
|
|
|
|
|
2014-02-06 05:32:20 +00:00
|
|
|
reloc_sym = kernel_get_ref_reloc_sym();
|
perf probe: Use ref_reloc_sym based address instead of the symbol name
Since several local symbols can have same name (e.g. t_show), we need to
use the relative address from the symbol referred by kmap->ref_reloc_sym
instead of the target symbol name itself.
Because the kernel address space layout randomize (kASLR) changes the
absolute address of kernel symbols, we can't rely on the absolute
address.
Note that this works only with debuginfo.
E.g. without this change;
----
# ./perf probe -a "t_show \$vars"
Added new events:
probe:t_show (on t_show with $vars)
probe:t_show_1 (on t_show with $vars)
probe:t_show_2 (on t_show with $vars)
probe:t_show_3 (on t_show with $vars)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
----
OK, we have 4 different t_show()s. All functions have
different arguments as below;
----
# cat /sys/kernel/debug/tracing/kprobe_events
p:probe/t_show t_show m=%di:u64 v=%si:u64
p:probe/t_show_1 t_show m=%di:u64 v=%si:u64 t=%si:u64
p:probe/t_show_2 t_show m=%di:u64 v=%si:u64 fmt=%si:u64
p:probe/t_show_3 t_show m=%di:u64 v=%si:u64 file=%si:u64
----
However, all of them have been put on the *same* address.
----
# cat /sys/kernel/debug/kprobes/list
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
----
With this change;
----
# ./perf probe -a "t_show \$vars"
Added new events:
probe:t_show (on t_show with $vars)
probe:t_show_1 (on t_show with $vars)
probe:t_show_2 (on t_show with $vars)
probe:t_show_3 (on t_show with $vars)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# cat /sys/kernel/debug/tracing/kprobe_events
p:probe/t_show _stext+889880 m=%di:u64 v=%si:u64
p:probe/t_show_1 _stext+928568 m=%di:u64 v=%si:u64 t=%si:u64
p:probe/t_show_2 _stext+969512 m=%di:u64 v=%si:u64 fmt=%si:u64
p:probe/t_show_3 _stext+1001416 m=%di:u64 v=%si:u64 file=%si:u64
# cat /sys/kernel/debug/kprobes/list
ffffffffb50d95e0 k t_show+0x0 [DISABLED]
ffffffffb50e2d00 k t_show+0x0 [DISABLED]
ffffffffb50f4990 k t_show+0x0 [DISABLED]
ffffffffb50eccf0 k t_show+0x0 [DISABLED]
----
This time, each event is put in different address
correctly.
Note that currently this doesn't support address-based
probe on modules (thus the probes on modules are symbol
based), since it requires relative address probe syntax
for kprobe-tracer, and it isn't implemented yet.
One more note, this allows us to put events on correct
address, but --list option should be updated to show
correct corresponding source code.
Changes from v2:
- Refer kmap->ref_reloc_sym instead of "_stext".
- Refer map->reloc to catch up the kASLR perf fix.
Changes from v1:
- Use _stext relative address instead of actual
absolute address recorded in debuginfo.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053216.29635.22584.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:16 +00:00
|
|
|
if (!reloc_sym) {
|
|
|
|
pr_warning("Relocated base symbol is not found!\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < ntevs; i++) {
|
2015-06-16 11:50:55 +00:00
|
|
|
if (!tevs[i].point.address || tevs[i].point.retprobe)
|
|
|
|
continue;
|
|
|
|
/* If we found a wrong one, mark it by NULL symbol */
|
|
|
|
if (kprobe_warn_out_range(tevs[i].point.symbol,
|
|
|
|
tevs[i].point.address)) {
|
|
|
|
tmp = NULL;
|
|
|
|
skipped++;
|
|
|
|
} else {
|
|
|
|
tmp = strdup(reloc_sym->name);
|
|
|
|
if (!tmp)
|
|
|
|
return -ENOMEM;
|
perf probe: Use ref_reloc_sym based address instead of the symbol name
Since several local symbols can have same name (e.g. t_show), we need to
use the relative address from the symbol referred by kmap->ref_reloc_sym
instead of the target symbol name itself.
Because the kernel address space layout randomize (kASLR) changes the
absolute address of kernel symbols, we can't rely on the absolute
address.
Note that this works only with debuginfo.
E.g. without this change;
----
# ./perf probe -a "t_show \$vars"
Added new events:
probe:t_show (on t_show with $vars)
probe:t_show_1 (on t_show with $vars)
probe:t_show_2 (on t_show with $vars)
probe:t_show_3 (on t_show with $vars)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
----
OK, we have 4 different t_show()s. All functions have
different arguments as below;
----
# cat /sys/kernel/debug/tracing/kprobe_events
p:probe/t_show t_show m=%di:u64 v=%si:u64
p:probe/t_show_1 t_show m=%di:u64 v=%si:u64 t=%si:u64
p:probe/t_show_2 t_show m=%di:u64 v=%si:u64 fmt=%si:u64
p:probe/t_show_3 t_show m=%di:u64 v=%si:u64 file=%si:u64
----
However, all of them have been put on the *same* address.
----
# cat /sys/kernel/debug/kprobes/list
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
----
With this change;
----
# ./perf probe -a "t_show \$vars"
Added new events:
probe:t_show (on t_show with $vars)
probe:t_show_1 (on t_show with $vars)
probe:t_show_2 (on t_show with $vars)
probe:t_show_3 (on t_show with $vars)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# cat /sys/kernel/debug/tracing/kprobe_events
p:probe/t_show _stext+889880 m=%di:u64 v=%si:u64
p:probe/t_show_1 _stext+928568 m=%di:u64 v=%si:u64 t=%si:u64
p:probe/t_show_2 _stext+969512 m=%di:u64 v=%si:u64 fmt=%si:u64
p:probe/t_show_3 _stext+1001416 m=%di:u64 v=%si:u64 file=%si:u64
# cat /sys/kernel/debug/kprobes/list
ffffffffb50d95e0 k t_show+0x0 [DISABLED]
ffffffffb50e2d00 k t_show+0x0 [DISABLED]
ffffffffb50f4990 k t_show+0x0 [DISABLED]
ffffffffb50eccf0 k t_show+0x0 [DISABLED]
----
This time, each event is put in different address
correctly.
Note that currently this doesn't support address-based
probe on modules (thus the probes on modules are symbol
based), since it requires relative address probe syntax
for kprobe-tracer, and it isn't implemented yet.
One more note, this allows us to put events on correct
address, but --list option should be updated to show
correct corresponding source code.
Changes from v2:
- Refer kmap->ref_reloc_sym instead of "_stext".
- Refer map->reloc to catch up the kASLR perf fix.
Changes from v1:
- Use _stext relative address instead of actual
absolute address recorded in debuginfo.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053216.29635.22584.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:16 +00:00
|
|
|
}
|
2015-06-16 11:50:55 +00:00
|
|
|
/* If we have no realname, use symbol for it */
|
|
|
|
if (!tevs[i].point.realname)
|
|
|
|
tevs[i].point.realname = tevs[i].point.symbol;
|
|
|
|
else
|
|
|
|
free(tevs[i].point.symbol);
|
|
|
|
tevs[i].point.symbol = tmp;
|
|
|
|
tevs[i].point.offset = tevs[i].point.address -
|
|
|
|
reloc_sym->unrelocated_addr;
|
perf probe: Use ref_reloc_sym based address instead of the symbol name
Since several local symbols can have same name (e.g. t_show), we need to
use the relative address from the symbol referred by kmap->ref_reloc_sym
instead of the target symbol name itself.
Because the kernel address space layout randomize (kASLR) changes the
absolute address of kernel symbols, we can't rely on the absolute
address.
Note that this works only with debuginfo.
E.g. without this change;
----
# ./perf probe -a "t_show \$vars"
Added new events:
probe:t_show (on t_show with $vars)
probe:t_show_1 (on t_show with $vars)
probe:t_show_2 (on t_show with $vars)
probe:t_show_3 (on t_show with $vars)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
----
OK, we have 4 different t_show()s. All functions have
different arguments as below;
----
# cat /sys/kernel/debug/tracing/kprobe_events
p:probe/t_show t_show m=%di:u64 v=%si:u64
p:probe/t_show_1 t_show m=%di:u64 v=%si:u64 t=%si:u64
p:probe/t_show_2 t_show m=%di:u64 v=%si:u64 fmt=%si:u64
p:probe/t_show_3 t_show m=%di:u64 v=%si:u64 file=%si:u64
----
However, all of them have been put on the *same* address.
----
# cat /sys/kernel/debug/kprobes/list
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
----
With this change;
----
# ./perf probe -a "t_show \$vars"
Added new events:
probe:t_show (on t_show with $vars)
probe:t_show_1 (on t_show with $vars)
probe:t_show_2 (on t_show with $vars)
probe:t_show_3 (on t_show with $vars)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# cat /sys/kernel/debug/tracing/kprobe_events
p:probe/t_show _stext+889880 m=%di:u64 v=%si:u64
p:probe/t_show_1 _stext+928568 m=%di:u64 v=%si:u64 t=%si:u64
p:probe/t_show_2 _stext+969512 m=%di:u64 v=%si:u64 fmt=%si:u64
p:probe/t_show_3 _stext+1001416 m=%di:u64 v=%si:u64 file=%si:u64
# cat /sys/kernel/debug/kprobes/list
ffffffffb50d95e0 k t_show+0x0 [DISABLED]
ffffffffb50e2d00 k t_show+0x0 [DISABLED]
ffffffffb50f4990 k t_show+0x0 [DISABLED]
ffffffffb50eccf0 k t_show+0x0 [DISABLED]
----
This time, each event is put in different address
correctly.
Note that currently this doesn't support address-based
probe on modules (thus the probes on modules are symbol
based), since it requires relative address probe syntax
for kprobe-tracer, and it isn't implemented yet.
One more note, this allows us to put events on correct
address, but --list option should be updated to show
correct corresponding source code.
Changes from v2:
- Refer kmap->ref_reloc_sym instead of "_stext".
- Refer map->reloc to catch up the kASLR perf fix.
Changes from v1:
- Use _stext relative address instead of actual
absolute address recorded in debuginfo.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053216.29635.22584.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:16 +00:00
|
|
|
}
|
2015-05-06 12:46:49 +00:00
|
|
|
return skipped;
|
perf probe: Use ref_reloc_sym based address instead of the symbol name
Since several local symbols can have same name (e.g. t_show), we need to
use the relative address from the symbol referred by kmap->ref_reloc_sym
instead of the target symbol name itself.
Because the kernel address space layout randomize (kASLR) changes the
absolute address of kernel symbols, we can't rely on the absolute
address.
Note that this works only with debuginfo.
E.g. without this change;
----
# ./perf probe -a "t_show \$vars"
Added new events:
probe:t_show (on t_show with $vars)
probe:t_show_1 (on t_show with $vars)
probe:t_show_2 (on t_show with $vars)
probe:t_show_3 (on t_show with $vars)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
----
OK, we have 4 different t_show()s. All functions have
different arguments as below;
----
# cat /sys/kernel/debug/tracing/kprobe_events
p:probe/t_show t_show m=%di:u64 v=%si:u64
p:probe/t_show_1 t_show m=%di:u64 v=%si:u64 t=%si:u64
p:probe/t_show_2 t_show m=%di:u64 v=%si:u64 fmt=%si:u64
p:probe/t_show_3 t_show m=%di:u64 v=%si:u64 file=%si:u64
----
However, all of them have been put on the *same* address.
----
# cat /sys/kernel/debug/kprobes/list
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
----
With this change;
----
# ./perf probe -a "t_show \$vars"
Added new events:
probe:t_show (on t_show with $vars)
probe:t_show_1 (on t_show with $vars)
probe:t_show_2 (on t_show with $vars)
probe:t_show_3 (on t_show with $vars)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# cat /sys/kernel/debug/tracing/kprobe_events
p:probe/t_show _stext+889880 m=%di:u64 v=%si:u64
p:probe/t_show_1 _stext+928568 m=%di:u64 v=%si:u64 t=%si:u64
p:probe/t_show_2 _stext+969512 m=%di:u64 v=%si:u64 fmt=%si:u64
p:probe/t_show_3 _stext+1001416 m=%di:u64 v=%si:u64 file=%si:u64
# cat /sys/kernel/debug/kprobes/list
ffffffffb50d95e0 k t_show+0x0 [DISABLED]
ffffffffb50e2d00 k t_show+0x0 [DISABLED]
ffffffffb50f4990 k t_show+0x0 [DISABLED]
ffffffffb50eccf0 k t_show+0x0 [DISABLED]
----
This time, each event is put in different address
correctly.
Note that currently this doesn't support address-based
probe on modules (thus the probes on modules are symbol
based), since it requires relative address probe syntax
for kprobe-tracer, and it isn't implemented yet.
One more note, this allows us to put events on correct
address, but --list option should be updated to show
correct corresponding source code.
Changes from v2:
- Refer kmap->ref_reloc_sym instead of "_stext".
- Refer map->reloc to catch up the kASLR perf fix.
Changes from v1:
- Use _stext relative address instead of actual
absolute address recorded in debuginfo.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053216.29635.22584.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:16 +00:00
|
|
|
}
|
|
|
|
|
2010-03-22 16:10:26 +00:00
|
|
|
/* Try to find perf_probe_event with debuginfo */
|
2010-07-29 14:13:51 +00:00
|
|
|
static int try_to_find_probe_trace_events(struct perf_probe_event *pev,
|
2015-05-08 01:03:31 +00:00
|
|
|
struct probe_trace_event **tevs)
|
2010-03-22 16:10:26 +00:00
|
|
|
{
|
|
|
|
bool need_dwarf = perf_probe_event_need_dwarf(pev);
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
struct perf_probe_point tmp;
|
2012-04-16 12:09:09 +00:00
|
|
|
struct debuginfo *dinfo;
|
2011-06-27 07:27:45 +00:00
|
|
|
int ntevs, ret = 0;
|
2010-03-22 16:10:26 +00:00
|
|
|
|
2015-05-08 01:03:28 +00:00
|
|
|
dinfo = open_debuginfo(pev->target, !need_dwarf);
|
2011-06-27 07:27:39 +00:00
|
|
|
if (!dinfo) {
|
2014-08-15 01:44:32 +00:00
|
|
|
if (need_dwarf)
|
2011-06-27 07:27:39 +00:00
|
|
|
return -ENOENT;
|
|
|
|
pr_debug("Could not open debuginfo. Try to use symbols.\n");
|
2010-03-22 16:10:26 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
perf probe: Use ref_reloc_sym based address instead of the symbol name
Since several local symbols can have same name (e.g. t_show), we need to
use the relative address from the symbol referred by kmap->ref_reloc_sym
instead of the target symbol name itself.
Because the kernel address space layout randomize (kASLR) changes the
absolute address of kernel symbols, we can't rely on the absolute
address.
Note that this works only with debuginfo.
E.g. without this change;
----
# ./perf probe -a "t_show \$vars"
Added new events:
probe:t_show (on t_show with $vars)
probe:t_show_1 (on t_show with $vars)
probe:t_show_2 (on t_show with $vars)
probe:t_show_3 (on t_show with $vars)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
----
OK, we have 4 different t_show()s. All functions have
different arguments as below;
----
# cat /sys/kernel/debug/tracing/kprobe_events
p:probe/t_show t_show m=%di:u64 v=%si:u64
p:probe/t_show_1 t_show m=%di:u64 v=%si:u64 t=%si:u64
p:probe/t_show_2 t_show m=%di:u64 v=%si:u64 fmt=%si:u64
p:probe/t_show_3 t_show m=%di:u64 v=%si:u64 file=%si:u64
----
However, all of them have been put on the *same* address.
----
# cat /sys/kernel/debug/kprobes/list
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
----
With this change;
----
# ./perf probe -a "t_show \$vars"
Added new events:
probe:t_show (on t_show with $vars)
probe:t_show_1 (on t_show with $vars)
probe:t_show_2 (on t_show with $vars)
probe:t_show_3 (on t_show with $vars)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# cat /sys/kernel/debug/tracing/kprobe_events
p:probe/t_show _stext+889880 m=%di:u64 v=%si:u64
p:probe/t_show_1 _stext+928568 m=%di:u64 v=%si:u64 t=%si:u64
p:probe/t_show_2 _stext+969512 m=%di:u64 v=%si:u64 fmt=%si:u64
p:probe/t_show_3 _stext+1001416 m=%di:u64 v=%si:u64 file=%si:u64
# cat /sys/kernel/debug/kprobes/list
ffffffffb50d95e0 k t_show+0x0 [DISABLED]
ffffffffb50e2d00 k t_show+0x0 [DISABLED]
ffffffffb50f4990 k t_show+0x0 [DISABLED]
ffffffffb50eccf0 k t_show+0x0 [DISABLED]
----
This time, each event is put in different address
correctly.
Note that currently this doesn't support address-based
probe on modules (thus the probes on modules are symbol
based), since it requires relative address probe syntax
for kprobe-tracer, and it isn't implemented yet.
One more note, this allows us to put events on correct
address, but --list option should be updated to show
correct corresponding source code.
Changes from v2:
- Refer kmap->ref_reloc_sym instead of "_stext".
- Refer map->reloc to catch up the kASLR perf fix.
Changes from v1:
- Use _stext relative address instead of actual
absolute address recorded in debuginfo.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053216.29635.22584.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:16 +00:00
|
|
|
pr_debug("Try to find probe point from debuginfo.\n");
|
2011-06-27 07:27:39 +00:00
|
|
|
/* Searching trace events corresponding to a probe event */
|
2015-05-08 01:03:31 +00:00
|
|
|
ntevs = debuginfo__find_trace_events(dinfo, pev, tevs);
|
2011-06-27 07:27:39 +00:00
|
|
|
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
if (ntevs == 0) { /* Not found, retry with an alternative */
|
2015-05-08 01:03:28 +00:00
|
|
|
ret = get_alternative_probe_event(dinfo, pev, &tmp);
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
if (!ret) {
|
2015-05-08 01:03:31 +00:00
|
|
|
ntevs = debuginfo__find_trace_events(dinfo, pev, tevs);
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
/*
|
|
|
|
* Write back to the original probe_event for
|
|
|
|
* setting appropriate (user given) event name
|
|
|
|
*/
|
|
|
|
clear_perf_probe_point(&pev->point);
|
|
|
|
memcpy(&pev->point, &tmp, sizeof(tmp));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-06-27 07:27:39 +00:00
|
|
|
debuginfo__delete(dinfo);
|
2010-03-22 16:10:26 +00:00
|
|
|
|
2010-04-12 17:17:42 +00:00
|
|
|
if (ntevs > 0) { /* Succeeded to find trace events */
|
perf probe: Use ref_reloc_sym based address instead of the symbol name
Since several local symbols can have same name (e.g. t_show), we need to
use the relative address from the symbol referred by kmap->ref_reloc_sym
instead of the target symbol name itself.
Because the kernel address space layout randomize (kASLR) changes the
absolute address of kernel symbols, we can't rely on the absolute
address.
Note that this works only with debuginfo.
E.g. without this change;
----
# ./perf probe -a "t_show \$vars"
Added new events:
probe:t_show (on t_show with $vars)
probe:t_show_1 (on t_show with $vars)
probe:t_show_2 (on t_show with $vars)
probe:t_show_3 (on t_show with $vars)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
----
OK, we have 4 different t_show()s. All functions have
different arguments as below;
----
# cat /sys/kernel/debug/tracing/kprobe_events
p:probe/t_show t_show m=%di:u64 v=%si:u64
p:probe/t_show_1 t_show m=%di:u64 v=%si:u64 t=%si:u64
p:probe/t_show_2 t_show m=%di:u64 v=%si:u64 fmt=%si:u64
p:probe/t_show_3 t_show m=%di:u64 v=%si:u64 file=%si:u64
----
However, all of them have been put on the *same* address.
----
# cat /sys/kernel/debug/kprobes/list
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
ffffffff810d9720 k t_show+0x0 [DISABLED]
----
With this change;
----
# ./perf probe -a "t_show \$vars"
Added new events:
probe:t_show (on t_show with $vars)
probe:t_show_1 (on t_show with $vars)
probe:t_show_2 (on t_show with $vars)
probe:t_show_3 (on t_show with $vars)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# cat /sys/kernel/debug/tracing/kprobe_events
p:probe/t_show _stext+889880 m=%di:u64 v=%si:u64
p:probe/t_show_1 _stext+928568 m=%di:u64 v=%si:u64 t=%si:u64
p:probe/t_show_2 _stext+969512 m=%di:u64 v=%si:u64 fmt=%si:u64
p:probe/t_show_3 _stext+1001416 m=%di:u64 v=%si:u64 file=%si:u64
# cat /sys/kernel/debug/kprobes/list
ffffffffb50d95e0 k t_show+0x0 [DISABLED]
ffffffffb50e2d00 k t_show+0x0 [DISABLED]
ffffffffb50f4990 k t_show+0x0 [DISABLED]
ffffffffb50eccf0 k t_show+0x0 [DISABLED]
----
This time, each event is put in different address
correctly.
Note that currently this doesn't support address-based
probe on modules (thus the probes on modules are symbol
based), since it requires relative address probe syntax
for kprobe-tracer, and it isn't implemented yet.
One more note, this allows us to put events on correct
address, but --list option should be updated to show
correct corresponding source code.
Changes from v2:
- Refer kmap->ref_reloc_sym instead of "_stext".
- Refer map->reloc to catch up the kASLR perf fix.
Changes from v1:
- Use _stext relative address instead of actual
absolute address recorded in debuginfo.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053216.29635.22584.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:16 +00:00
|
|
|
pr_debug("Found %d probe_trace_events.\n", ntevs);
|
|
|
|
ret = post_process_probe_trace_events(*tevs, ntevs,
|
2015-05-08 01:03:28 +00:00
|
|
|
pev->target, pev->uprobes);
|
2015-05-06 12:46:49 +00:00
|
|
|
if (ret < 0 || ret == ntevs) {
|
2014-01-16 09:39:44 +00:00
|
|
|
clear_probe_trace_events(*tevs, ntevs);
|
|
|
|
zfree(tevs);
|
|
|
|
}
|
2015-05-06 12:46:49 +00:00
|
|
|
if (ret != ntevs)
|
|
|
|
return ret < 0 ? ret : ntevs;
|
|
|
|
ntevs = 0;
|
|
|
|
/* Fall through */
|
2010-04-12 17:17:42 +00:00
|
|
|
}
|
2010-03-22 16:10:26 +00:00
|
|
|
|
2010-04-12 17:17:42 +00:00
|
|
|
if (ntevs == 0) { /* No error but failed to find probe point. */
|
2015-03-06 07:31:25 +00:00
|
|
|
pr_warning("Probe point '%s' not found.\n",
|
2010-04-12 17:17:42 +00:00
|
|
|
synthesize_perf_probe_point(&pev->point));
|
2015-03-06 07:31:25 +00:00
|
|
|
return -ENOENT;
|
2010-04-12 17:17:42 +00:00
|
|
|
}
|
|
|
|
/* Error path : ntevs < 0 */
|
2010-04-21 19:56:24 +00:00
|
|
|
pr_debug("An error occurred in debuginfo analysis (%d).\n", ntevs);
|
2015-08-21 10:09:02 +00:00
|
|
|
if (ntevs < 0) {
|
|
|
|
if (ntevs == -EBADF)
|
|
|
|
pr_warning("Warning: No dwarf info found in the vmlinux - "
|
|
|
|
"please rebuild kernel with CONFIG_DEBUG_INFO=y.\n");
|
2010-04-21 19:56:24 +00:00
|
|
|
if (!need_dwarf) {
|
2010-12-17 13:12:11 +00:00
|
|
|
pr_debug("Trying to use symbols.\n");
|
2010-04-21 19:56:24 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2010-03-22 16:10:26 +00:00
|
|
|
}
|
2010-04-21 19:56:24 +00:00
|
|
|
return ntevs;
|
2010-03-22 16:10:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#define LINEBUF_SIZE 256
|
|
|
|
#define NR_ADDITIONAL_LINES 2
|
|
|
|
|
2010-12-20 14:18:04 +00:00
|
|
|
static int __show_one_line(FILE *fp, int l, bool skip, bool show_num)
|
2010-03-22 16:10:26 +00:00
|
|
|
{
|
2014-08-14 02:22:34 +00:00
|
|
|
char buf[LINEBUF_SIZE], sbuf[STRERR_BUFSIZE];
|
2010-12-20 14:18:01 +00:00
|
|
|
const char *color = show_num ? "" : PERF_COLOR_BLUE;
|
|
|
|
const char *prefix = NULL;
|
2010-03-22 16:10:26 +00:00
|
|
|
|
2010-12-20 14:18:01 +00:00
|
|
|
do {
|
2010-03-22 16:10:26 +00:00
|
|
|
if (fgets(buf, LINEBUF_SIZE, fp) == NULL)
|
|
|
|
goto error;
|
2010-12-20 14:18:01 +00:00
|
|
|
if (skip)
|
|
|
|
continue;
|
|
|
|
if (!prefix) {
|
|
|
|
prefix = show_num ? "%7d " : " ";
|
|
|
|
color_fprintf(stdout, color, prefix, l);
|
2010-03-22 16:10:26 +00:00
|
|
|
}
|
2010-12-20 14:18:01 +00:00
|
|
|
color_fprintf(stdout, color, "%s", buf);
|
|
|
|
|
|
|
|
} while (strchr(buf, '\n') == NULL);
|
2010-04-12 17:17:42 +00:00
|
|
|
|
2010-12-20 14:18:04 +00:00
|
|
|
return 1;
|
2010-03-22 16:10:26 +00:00
|
|
|
error:
|
2010-12-20 14:18:04 +00:00
|
|
|
if (ferror(fp)) {
|
2014-08-14 02:22:34 +00:00
|
|
|
pr_warning("File read error: %s\n",
|
|
|
|
strerror_r(errno, sbuf, sizeof(sbuf)));
|
2010-12-20 14:18:04 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2010-04-12 17:17:42 +00:00
|
|
|
|
2010-12-20 14:18:04 +00:00
|
|
|
static int _show_one_line(FILE *fp, int l, bool skip, bool show_num)
|
|
|
|
{
|
|
|
|
int rv = __show_one_line(fp, l, skip, show_num);
|
|
|
|
if (rv == 0) {
|
|
|
|
pr_warning("Source file is shorter than expected.\n");
|
|
|
|
rv = -1;
|
|
|
|
}
|
|
|
|
return rv;
|
2010-03-22 16:10:26 +00:00
|
|
|
}
|
|
|
|
|
2010-12-20 14:18:04 +00:00
|
|
|
#define show_one_line_with_num(f,l) _show_one_line(f,l,false,true)
|
|
|
|
#define show_one_line(f,l) _show_one_line(f,l,false,false)
|
|
|
|
#define skip_one_line(f,l) _show_one_line(f,l,true,false)
|
|
|
|
#define show_one_line_or_eof(f,l) __show_one_line(f,l,false,false)
|
|
|
|
|
2010-03-22 16:10:26 +00:00
|
|
|
/*
|
|
|
|
* Show line-range always requires debuginfo to find source file and
|
|
|
|
* line number.
|
|
|
|
*/
|
2015-03-06 07:31:22 +00:00
|
|
|
static int __show_line_range(struct line_range *lr, const char *module,
|
|
|
|
bool user)
|
2010-03-22 16:10:26 +00:00
|
|
|
{
|
2010-04-14 22:39:42 +00:00
|
|
|
int l = 1;
|
2014-02-06 05:32:09 +00:00
|
|
|
struct int_node *ln;
|
2011-06-27 07:27:39 +00:00
|
|
|
struct debuginfo *dinfo;
|
2010-03-22 16:10:26 +00:00
|
|
|
FILE *fp;
|
2011-06-27 07:27:39 +00:00
|
|
|
int ret;
|
2010-07-09 09:28:59 +00:00
|
|
|
char *tmp;
|
2014-08-14 02:22:34 +00:00
|
|
|
char sbuf[STRERR_BUFSIZE];
|
2010-03-22 16:10:26 +00:00
|
|
|
|
|
|
|
/* Search a line range */
|
2014-08-15 01:44:32 +00:00
|
|
|
dinfo = open_debuginfo(module, false);
|
|
|
|
if (!dinfo)
|
2011-06-27 07:27:39 +00:00
|
|
|
return -ENOENT;
|
2010-04-12 17:17:42 +00:00
|
|
|
|
2011-06-27 07:27:39 +00:00
|
|
|
ret = debuginfo__find_line_range(dinfo, lr);
|
2015-03-06 07:31:22 +00:00
|
|
|
if (!ret) { /* Not found, retry with an alternative */
|
|
|
|
ret = get_alternative_line_range(dinfo, lr, module, user);
|
|
|
|
if (!ret)
|
|
|
|
ret = debuginfo__find_line_range(dinfo, lr);
|
|
|
|
}
|
2011-06-27 07:27:39 +00:00
|
|
|
debuginfo__delete(dinfo);
|
2014-06-06 07:14:06 +00:00
|
|
|
if (ret == 0 || ret == -ENOENT) {
|
2010-04-12 17:17:42 +00:00
|
|
|
pr_warning("Specified source line is not found.\n");
|
|
|
|
return -ENOENT;
|
|
|
|
} else if (ret < 0) {
|
2014-06-06 07:14:06 +00:00
|
|
|
pr_warning("Debuginfo analysis failed.\n");
|
2010-04-12 17:17:42 +00:00
|
|
|
return ret;
|
|
|
|
}
|
2010-03-22 16:10:26 +00:00
|
|
|
|
2010-07-09 09:28:59 +00:00
|
|
|
/* Convert source file path */
|
|
|
|
tmp = lr->path;
|
2010-07-09 09:29:11 +00:00
|
|
|
ret = get_real_path(tmp, lr->comp_dir, &lr->path);
|
2015-03-04 10:01:42 +00:00
|
|
|
|
|
|
|
/* Free old path when new path is assigned */
|
|
|
|
if (tmp != lr->path)
|
|
|
|
free(tmp);
|
|
|
|
|
2010-07-09 09:28:59 +00:00
|
|
|
if (ret < 0) {
|
2014-06-06 07:14:06 +00:00
|
|
|
pr_warning("Failed to find source file path.\n");
|
2010-07-09 09:28:59 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2010-03-22 16:10:26 +00:00
|
|
|
setup_pager();
|
|
|
|
|
|
|
|
if (lr->function)
|
2011-02-10 09:08:16 +00:00
|
|
|
fprintf(stdout, "<%s@%s:%d>\n", lr->function, lr->path,
|
2010-03-22 16:10:26 +00:00
|
|
|
lr->start - lr->offset);
|
|
|
|
else
|
2010-12-20 14:18:00 +00:00
|
|
|
fprintf(stdout, "<%s:%d>\n", lr->path, lr->start);
|
2010-03-22 16:10:26 +00:00
|
|
|
|
|
|
|
fp = fopen(lr->path, "r");
|
2010-04-12 17:17:42 +00:00
|
|
|
if (fp == NULL) {
|
|
|
|
pr_warning("Failed to open %s: %s\n", lr->path,
|
2014-08-14 02:22:34 +00:00
|
|
|
strerror_r(errno, sbuf, sizeof(sbuf)));
|
2010-04-12 17:17:42 +00:00
|
|
|
return -errno;
|
|
|
|
}
|
2010-03-22 16:10:26 +00:00
|
|
|
/* Skip to starting line number */
|
2010-12-20 14:18:02 +00:00
|
|
|
while (l < lr->start) {
|
2010-12-20 14:18:04 +00:00
|
|
|
ret = skip_one_line(fp, l++);
|
2010-12-20 14:18:02 +00:00
|
|
|
if (ret < 0)
|
|
|
|
goto end;
|
|
|
|
}
|
2010-03-22 16:10:26 +00:00
|
|
|
|
2014-02-06 05:32:09 +00:00
|
|
|
intlist__for_each(ln, lr->line_list) {
|
|
|
|
for (; ln->i > l; l++) {
|
2010-12-20 14:18:04 +00:00
|
|
|
ret = show_one_line(fp, l - lr->offset);
|
2010-12-20 14:18:02 +00:00
|
|
|
if (ret < 0)
|
|
|
|
goto end;
|
|
|
|
}
|
2010-12-20 14:18:04 +00:00
|
|
|
ret = show_one_line_with_num(fp, l++ - lr->offset);
|
2010-04-12 17:17:42 +00:00
|
|
|
if (ret < 0)
|
|
|
|
goto end;
|
2010-03-22 16:10:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (lr->end == INT_MAX)
|
|
|
|
lr->end = l + NR_ADDITIONAL_LINES;
|
2010-12-20 14:18:04 +00:00
|
|
|
while (l <= lr->end) {
|
|
|
|
ret = show_one_line_or_eof(fp, l++ - lr->offset);
|
|
|
|
if (ret <= 0)
|
2010-12-20 14:18:02 +00:00
|
|
|
break;
|
|
|
|
}
|
2010-04-12 17:17:42 +00:00
|
|
|
end:
|
2010-03-22 16:10:26 +00:00
|
|
|
fclose(fp);
|
2010-04-12 17:17:42 +00:00
|
|
|
return ret;
|
2010-03-22 16:10:26 +00:00
|
|
|
}
|
|
|
|
|
2014-09-17 08:40:54 +00:00
|
|
|
int show_line_range(struct line_range *lr, const char *module, bool user)
|
2014-02-06 05:32:04 +00:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2014-09-17 08:40:54 +00:00
|
|
|
ret = init_symbol_maps(user);
|
2014-02-06 05:32:04 +00:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
2015-03-06 07:31:22 +00:00
|
|
|
ret = __show_line_range(lr, module, user);
|
2014-02-06 05:32:04 +00:00
|
|
|
exit_symbol_maps();
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-06-27 07:27:39 +00:00
|
|
|
static int show_available_vars_at(struct debuginfo *dinfo,
|
|
|
|
struct perf_probe_event *pev,
|
2015-05-08 01:03:31 +00:00
|
|
|
struct strfilter *_filter)
|
2010-10-21 10:13:23 +00:00
|
|
|
{
|
|
|
|
char *buf;
|
2011-01-20 14:15:39 +00:00
|
|
|
int ret, i, nvars;
|
2010-10-21 10:13:23 +00:00
|
|
|
struct str_node *node;
|
|
|
|
struct variable_list *vls = NULL, *vl;
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
struct perf_probe_point tmp;
|
2011-01-20 14:15:39 +00:00
|
|
|
const char *var;
|
2010-10-21 10:13:23 +00:00
|
|
|
|
|
|
|
buf = synthesize_perf_probe_point(&pev->point);
|
|
|
|
if (!buf)
|
|
|
|
return -EINVAL;
|
|
|
|
pr_debug("Searching variables at %s\n", buf);
|
|
|
|
|
2015-05-08 01:03:31 +00:00
|
|
|
ret = debuginfo__find_available_vars_at(dinfo, pev, &vls);
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
if (!ret) { /* Not found, retry with an alternative */
|
2015-05-08 01:03:28 +00:00
|
|
|
ret = get_alternative_probe_event(dinfo, pev, &tmp);
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
if (!ret) {
|
|
|
|
ret = debuginfo__find_available_vars_at(dinfo, pev,
|
2015-05-08 01:03:31 +00:00
|
|
|
&vls);
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
/* Release the old probe_point */
|
|
|
|
clear_perf_probe_point(&tmp);
|
|
|
|
}
|
|
|
|
}
|
2011-01-20 14:15:39 +00:00
|
|
|
if (ret <= 0) {
|
2014-06-06 07:13:59 +00:00
|
|
|
if (ret == 0 || ret == -ENOENT) {
|
|
|
|
pr_err("Failed to find the address of %s\n", buf);
|
|
|
|
ret = -ENOENT;
|
|
|
|
} else
|
|
|
|
pr_warning("Debuginfo analysis failed.\n");
|
2011-01-20 14:15:39 +00:00
|
|
|
goto end;
|
|
|
|
}
|
2014-06-06 07:13:59 +00:00
|
|
|
|
2011-01-20 14:15:39 +00:00
|
|
|
/* Some variables are found */
|
|
|
|
fprintf(stdout, "Available variables at %s\n", buf);
|
|
|
|
for (i = 0; i < ret; i++) {
|
|
|
|
vl = &vls[i];
|
|
|
|
/*
|
|
|
|
* A probe point might be converted to
|
|
|
|
* several trace points.
|
|
|
|
*/
|
|
|
|
fprintf(stdout, "\t@<%s+%lu>\n", vl->point.symbol,
|
|
|
|
vl->point.offset);
|
2013-12-27 19:55:14 +00:00
|
|
|
zfree(&vl->point.symbol);
|
2011-01-20 14:15:39 +00:00
|
|
|
nvars = 0;
|
|
|
|
if (vl->vars) {
|
|
|
|
strlist__for_each(node, vl->vars) {
|
|
|
|
var = strchr(node->s, '\t') + 1;
|
|
|
|
if (strfilter__compare(_filter, var)) {
|
2010-10-21 10:13:23 +00:00
|
|
|
fprintf(stdout, "\t\t%s\n", node->s);
|
2011-01-20 14:15:39 +00:00
|
|
|
nvars++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
strlist__delete(vl->vars);
|
2010-10-21 10:13:23 +00:00
|
|
|
}
|
2011-01-20 14:15:39 +00:00
|
|
|
if (nvars == 0)
|
|
|
|
fprintf(stdout, "\t\t(No matched variables)\n");
|
|
|
|
}
|
|
|
|
free(vls);
|
|
|
|
end:
|
2010-10-21 10:13:23 +00:00
|
|
|
free(buf);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Show available variables on given probe point */
|
|
|
|
int show_available_vars(struct perf_probe_event *pevs, int npevs,
|
2015-05-08 01:03:31 +00:00
|
|
|
struct strfilter *_filter)
|
2010-10-21 10:13:23 +00:00
|
|
|
{
|
2011-06-27 07:27:39 +00:00
|
|
|
int i, ret = 0;
|
|
|
|
struct debuginfo *dinfo;
|
2010-10-21 10:13:23 +00:00
|
|
|
|
2014-09-17 08:40:54 +00:00
|
|
|
ret = init_symbol_maps(pevs->uprobes);
|
2010-10-21 10:13:23 +00:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
2015-05-08 01:03:28 +00:00
|
|
|
dinfo = open_debuginfo(pevs->target, false);
|
2011-06-27 07:27:39 +00:00
|
|
|
if (!dinfo) {
|
2014-02-06 05:32:04 +00:00
|
|
|
ret = -ENOENT;
|
|
|
|
goto out;
|
2011-06-27 07:27:39 +00:00
|
|
|
}
|
|
|
|
|
2010-10-21 10:13:23 +00:00
|
|
|
setup_pager();
|
|
|
|
|
2011-06-27 07:27:39 +00:00
|
|
|
for (i = 0; i < npevs && ret >= 0; i++)
|
2015-05-08 01:03:31 +00:00
|
|
|
ret = show_available_vars_at(dinfo, &pevs[i], _filter);
|
2011-06-27 07:27:39 +00:00
|
|
|
|
|
|
|
debuginfo__delete(dinfo);
|
2014-02-06 05:32:04 +00:00
|
|
|
out:
|
|
|
|
exit_symbol_maps();
|
2010-10-21 10:13:23 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-09-30 10:07:11 +00:00
|
|
|
#else /* !HAVE_DWARF_SUPPORT */
|
2010-03-22 16:10:26 +00:00
|
|
|
|
2015-06-17 14:58:54 +00:00
|
|
|
static void debuginfo_cache__exit(void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2014-02-06 05:32:23 +00:00
|
|
|
static int
|
|
|
|
find_perf_probe_point_from_dwarf(struct probe_trace_point *tp __maybe_unused,
|
|
|
|
struct perf_probe_point *pp __maybe_unused,
|
|
|
|
bool is_kprobe __maybe_unused)
|
2010-03-22 16:10:26 +00:00
|
|
|
{
|
2014-02-06 05:32:23 +00:00
|
|
|
return -ENOSYS;
|
2010-03-22 16:10:26 +00:00
|
|
|
}
|
|
|
|
|
2010-07-29 14:13:51 +00:00
|
|
|
static int try_to_find_probe_trace_events(struct perf_probe_event *pev,
|
2015-05-08 01:03:31 +00:00
|
|
|
struct probe_trace_event **tevs __maybe_unused)
|
2010-03-22 16:10:26 +00:00
|
|
|
{
|
2010-04-12 17:17:42 +00:00
|
|
|
if (perf_probe_event_need_dwarf(pev)) {
|
|
|
|
pr_warning("Debuginfo-analysis is not supported.\n");
|
|
|
|
return -ENOSYS;
|
|
|
|
}
|
2012-04-16 12:09:09 +00:00
|
|
|
|
2010-03-22 16:10:26 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-09-10 22:15:03 +00:00
|
|
|
int show_line_range(struct line_range *lr __maybe_unused,
|
2014-09-17 08:40:54 +00:00
|
|
|
const char *module __maybe_unused,
|
|
|
|
bool user __maybe_unused)
|
2010-03-22 16:10:26 +00:00
|
|
|
{
|
2010-04-12 17:17:42 +00:00
|
|
|
pr_warning("Debuginfo-analysis is not supported.\n");
|
|
|
|
return -ENOSYS;
|
2010-03-22 16:10:26 +00:00
|
|
|
}
|
|
|
|
|
2012-09-10 22:15:03 +00:00
|
|
|
int show_available_vars(struct perf_probe_event *pevs __maybe_unused,
|
2015-05-08 01:03:31 +00:00
|
|
|
int npevs __maybe_unused,
|
|
|
|
struct strfilter *filter __maybe_unused)
|
2010-10-21 10:13:23 +00:00
|
|
|
{
|
|
|
|
pr_warning("Debuginfo-analysis is not supported.\n");
|
|
|
|
return -ENOSYS;
|
|
|
|
}
|
2010-03-16 22:05:37 +00:00
|
|
|
#endif
|
|
|
|
|
2014-01-16 09:39:47 +00:00
|
|
|
void line_range__clear(struct line_range *lr)
|
|
|
|
{
|
|
|
|
free(lr->function);
|
|
|
|
free(lr->file);
|
|
|
|
free(lr->path);
|
|
|
|
free(lr->comp_dir);
|
2014-02-06 05:32:09 +00:00
|
|
|
intlist__delete(lr->line_list);
|
2014-01-16 09:39:47 +00:00
|
|
|
memset(lr, 0, sizeof(*lr));
|
|
|
|
}
|
|
|
|
|
2014-02-06 05:32:09 +00:00
|
|
|
int line_range__init(struct line_range *lr)
|
2014-01-16 09:39:47 +00:00
|
|
|
{
|
|
|
|
memset(lr, 0, sizeof(*lr));
|
2014-02-06 05:32:09 +00:00
|
|
|
lr->line_list = intlist__new(NULL);
|
|
|
|
if (!lr->line_list)
|
|
|
|
return -ENOMEM;
|
|
|
|
else
|
|
|
|
return 0;
|
2014-01-16 09:39:47 +00:00
|
|
|
}
|
|
|
|
|
2010-12-20 14:18:05 +00:00
|
|
|
static int parse_line_num(char **ptr, int *val, const char *what)
|
|
|
|
{
|
|
|
|
const char *start = *ptr;
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
*val = strtol(*ptr, ptr, 0);
|
|
|
|
if (errno || *ptr == start) {
|
|
|
|
semantic_error("'%s' is not a valid number.\n", what);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-05-06 12:46:47 +00:00
|
|
|
/* Check the name is good for event, group or function */
|
|
|
|
static bool is_c_func_name(const char *name)
|
|
|
|
{
|
|
|
|
if (!isalpha(*name) && *name != '_')
|
|
|
|
return false;
|
|
|
|
while (*++name != '\0') {
|
|
|
|
if (!isalpha(*name) && !isdigit(*name) && *name != '_')
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2010-12-20 14:18:03 +00:00
|
|
|
/*
|
|
|
|
* Stuff 'lr' according to the line range described by 'arg'.
|
|
|
|
* The line range syntax is described by:
|
|
|
|
*
|
|
|
|
* SRC[:SLN[+NUM|-ELN]]
|
2011-02-10 09:08:10 +00:00
|
|
|
* FNC[@SRC][:SLN[+NUM|-ELN]]
|
2010-12-20 14:18:03 +00:00
|
|
|
*/
|
2010-04-12 17:17:42 +00:00
|
|
|
int parse_line_range_desc(const char *arg, struct line_range *lr)
|
2010-01-06 14:45:34 +00:00
|
|
|
{
|
2011-02-10 09:08:10 +00:00
|
|
|
char *range, *file, *name = strdup(arg);
|
2010-12-20 14:18:05 +00:00
|
|
|
int err;
|
|
|
|
|
|
|
|
if (!name)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
lr->start = 0;
|
|
|
|
lr->end = INT_MAX;
|
|
|
|
|
|
|
|
range = strchr(name, ':');
|
|
|
|
if (range) {
|
|
|
|
*range++ = '\0';
|
|
|
|
|
|
|
|
err = parse_line_num(&range, &lr->start, "start line");
|
|
|
|
if (err)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
if (*range == '+' || *range == '-') {
|
|
|
|
const char c = *range++;
|
|
|
|
|
|
|
|
err = parse_line_num(&range, &lr->end, "end line");
|
|
|
|
if (err)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
if (c == '+') {
|
|
|
|
lr->end += lr->start;
|
|
|
|
/*
|
|
|
|
* Adjust the number of lines here.
|
|
|
|
* If the number of lines == 1, the
|
|
|
|
* the end of line should be equal to
|
|
|
|
* the start of line.
|
|
|
|
*/
|
|
|
|
lr->end--;
|
|
|
|
}
|
|
|
|
}
|
2010-12-20 14:18:03 +00:00
|
|
|
|
2010-04-14 22:39:42 +00:00
|
|
|
pr_debug("Line range is %d to %d\n", lr->start, lr->end);
|
2010-12-20 14:18:05 +00:00
|
|
|
|
|
|
|
err = -EINVAL;
|
2010-04-14 22:39:42 +00:00
|
|
|
if (lr->start > lr->end) {
|
2010-01-06 14:45:34 +00:00
|
|
|
semantic_error("Start line must be smaller"
|
2010-04-12 17:17:42 +00:00
|
|
|
" than end line.\n");
|
2010-12-20 14:18:05 +00:00
|
|
|
goto err;
|
2010-04-12 17:17:42 +00:00
|
|
|
}
|
2010-12-20 14:18:05 +00:00
|
|
|
if (*range != '\0') {
|
|
|
|
semantic_error("Tailing with invalid str '%s'.\n", range);
|
|
|
|
goto err;
|
2010-04-12 17:17:42 +00:00
|
|
|
}
|
2010-04-14 22:39:42 +00:00
|
|
|
}
|
2010-04-12 17:17:56 +00:00
|
|
|
|
2011-02-10 09:08:10 +00:00
|
|
|
file = strchr(name, '@');
|
|
|
|
if (file) {
|
|
|
|
*file = '\0';
|
|
|
|
lr->file = strdup(++file);
|
|
|
|
if (lr->file == NULL) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
lr->function = name;
|
2015-05-06 12:46:47 +00:00
|
|
|
} else if (strchr(name, '/') || strchr(name, '.'))
|
2010-12-20 14:18:05 +00:00
|
|
|
lr->file = name;
|
2015-05-06 12:46:47 +00:00
|
|
|
else if (is_c_func_name(name))/* We reuse it for checking funcname */
|
2010-12-20 14:18:05 +00:00
|
|
|
lr->function = name;
|
2015-05-06 12:46:47 +00:00
|
|
|
else { /* Invalid name */
|
|
|
|
semantic_error("'%s' is not a valid function name.\n", name);
|
|
|
|
err = -EINVAL;
|
|
|
|
goto err;
|
|
|
|
}
|
2010-04-12 17:17:42 +00:00
|
|
|
|
|
|
|
return 0;
|
2010-12-20 14:18:05 +00:00
|
|
|
err:
|
|
|
|
free(name);
|
|
|
|
return err;
|
2010-01-06 14:45:34 +00:00
|
|
|
}
|
|
|
|
|
2009-12-01 00:19:58 +00:00
|
|
|
/* Parse probepoint definition. */
|
2010-04-12 17:17:42 +00:00
|
|
|
static int parse_perf_probe_point(char *arg, struct perf_probe_event *pev)
|
2009-12-01 00:19:58 +00:00
|
|
|
{
|
2010-03-16 22:06:12 +00:00
|
|
|
struct perf_probe_point *pp = &pev->point;
|
2009-12-01 00:19:58 +00:00
|
|
|
char *ptr, *tmp;
|
|
|
|
char c, nc = 0;
|
2015-04-28 12:05:34 +00:00
|
|
|
bool file_spec = false;
|
2009-12-01 00:19:58 +00:00
|
|
|
/*
|
|
|
|
* <Syntax>
|
2010-02-25 13:36:12 +00:00
|
|
|
* perf probe [EVENT=]SRC[:LN|;PTN]
|
|
|
|
* perf probe [EVENT=]FUNC[@SRC][+OFFS|%return|:LN|;PAT]
|
2009-12-15 15:32:18 +00:00
|
|
|
*
|
|
|
|
* TODO:Group name support
|
2009-12-01 00:19:58 +00:00
|
|
|
*/
|
2015-04-28 08:46:09 +00:00
|
|
|
if (!arg)
|
|
|
|
return -EINVAL;
|
2009-12-01 00:19:58 +00:00
|
|
|
|
2010-02-25 13:36:12 +00:00
|
|
|
ptr = strpbrk(arg, ";=@+%");
|
|
|
|
if (ptr && *ptr == '=') { /* Event name */
|
2009-12-15 15:32:18 +00:00
|
|
|
*ptr = '\0';
|
|
|
|
tmp = ptr + 1;
|
2010-04-12 17:17:42 +00:00
|
|
|
if (strchr(arg, ':')) {
|
|
|
|
semantic_error("Group name is not supported yet.\n");
|
|
|
|
return -ENOTSUP;
|
|
|
|
}
|
2015-05-06 12:46:47 +00:00
|
|
|
if (!is_c_func_name(arg)) {
|
2009-12-16 22:24:15 +00:00
|
|
|
semantic_error("%s is bad for event name -it must "
|
2010-04-12 17:17:42 +00:00
|
|
|
"follow C symbol-naming rule.\n", arg);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2010-04-12 17:17:56 +00:00
|
|
|
pev->event = strdup(arg);
|
|
|
|
if (pev->event == NULL)
|
|
|
|
return -ENOMEM;
|
2010-03-16 22:06:12 +00:00
|
|
|
pev->group = NULL;
|
2009-12-15 15:32:18 +00:00
|
|
|
arg = tmp;
|
|
|
|
}
|
|
|
|
|
2015-04-28 12:05:34 +00:00
|
|
|
/*
|
|
|
|
* Check arg is function or file name and copy it.
|
|
|
|
*
|
|
|
|
* We consider arg to be a file spec if and only if it satisfies
|
|
|
|
* all of the below criteria::
|
|
|
|
* - it does not include any of "+@%",
|
|
|
|
* - it includes one of ":;", and
|
|
|
|
* - it has a period '.' in the name.
|
|
|
|
*
|
|
|
|
* Otherwise, we consider arg to be a function specification.
|
|
|
|
*/
|
|
|
|
if (!strpbrk(arg, "+@%") && (ptr = strpbrk(arg, ";:")) != NULL) {
|
|
|
|
/* This is a file spec if it includes a '.' before ; or : */
|
|
|
|
if (memchr(arg, '.', ptr - arg))
|
|
|
|
file_spec = true;
|
|
|
|
}
|
|
|
|
|
2010-02-25 13:36:12 +00:00
|
|
|
ptr = strpbrk(arg, ";:+@%");
|
2009-12-01 00:19:58 +00:00
|
|
|
if (ptr) {
|
|
|
|
nc = *ptr;
|
|
|
|
*ptr++ = '\0';
|
|
|
|
}
|
|
|
|
|
2010-04-12 17:17:56 +00:00
|
|
|
tmp = strdup(arg);
|
|
|
|
if (tmp == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2015-04-28 12:05:34 +00:00
|
|
|
if (file_spec)
|
2010-04-12 17:17:56 +00:00
|
|
|
pp->file = tmp;
|
2015-04-28 12:05:34 +00:00
|
|
|
else
|
2010-04-12 17:17:56 +00:00
|
|
|
pp->function = tmp;
|
2009-12-01 00:19:58 +00:00
|
|
|
|
|
|
|
/* Parse other options */
|
|
|
|
while (ptr) {
|
|
|
|
arg = ptr;
|
|
|
|
c = nc;
|
2010-02-25 13:36:12 +00:00
|
|
|
if (c == ';') { /* Lazy pattern must be the last part */
|
2010-04-12 17:17:56 +00:00
|
|
|
pp->lazy_line = strdup(arg);
|
|
|
|
if (pp->lazy_line == NULL)
|
|
|
|
return -ENOMEM;
|
2010-02-25 13:36:12 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
ptr = strpbrk(arg, ";:+@%");
|
2009-12-01 00:19:58 +00:00
|
|
|
if (ptr) {
|
|
|
|
nc = *ptr;
|
|
|
|
*ptr++ = '\0';
|
|
|
|
}
|
|
|
|
switch (c) {
|
|
|
|
case ':': /* Line number */
|
|
|
|
pp->line = strtoul(arg, &tmp, 0);
|
2010-04-12 17:17:42 +00:00
|
|
|
if (*tmp != '\0') {
|
2010-02-25 13:36:12 +00:00
|
|
|
semantic_error("There is non-digit char"
|
2010-04-12 17:17:42 +00:00
|
|
|
" in line number.\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2009-12-01 00:19:58 +00:00
|
|
|
break;
|
|
|
|
case '+': /* Byte offset from a symbol */
|
|
|
|
pp->offset = strtoul(arg, &tmp, 0);
|
2010-04-12 17:17:42 +00:00
|
|
|
if (*tmp != '\0') {
|
2010-02-25 13:36:12 +00:00
|
|
|
semantic_error("There is non-digit character"
|
2010-04-12 17:17:42 +00:00
|
|
|
" in offset.\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2009-12-01 00:19:58 +00:00
|
|
|
break;
|
|
|
|
case '@': /* File name */
|
2010-04-12 17:17:42 +00:00
|
|
|
if (pp->file) {
|
|
|
|
semantic_error("SRC@SRC is not allowed.\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2010-04-12 17:17:56 +00:00
|
|
|
pp->file = strdup(arg);
|
|
|
|
if (pp->file == NULL)
|
|
|
|
return -ENOMEM;
|
2009-12-01 00:19:58 +00:00
|
|
|
break;
|
|
|
|
case '%': /* Probe places */
|
|
|
|
if (strcmp(arg, "return") == 0) {
|
|
|
|
pp->retprobe = 1;
|
2010-04-12 17:17:42 +00:00
|
|
|
} else { /* Others not supported yet */
|
|
|
|
semantic_error("%%%s is not supported.\n", arg);
|
|
|
|
return -ENOTSUP;
|
|
|
|
}
|
2009-12-01 00:19:58 +00:00
|
|
|
break;
|
2010-04-12 17:17:42 +00:00
|
|
|
default: /* Buggy case */
|
|
|
|
pr_err("This program has a bug at %s:%d.\n",
|
|
|
|
__FILE__, __LINE__);
|
|
|
|
return -ENOTSUP;
|
2009-12-01 00:19:58 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Exclusion check */
|
2010-04-12 17:17:42 +00:00
|
|
|
if (pp->lazy_line && pp->line) {
|
2010-12-17 13:12:11 +00:00
|
|
|
semantic_error("Lazy pattern can't be used with"
|
|
|
|
" line number.\n");
|
2010-04-12 17:17:42 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
2010-02-25 13:36:12 +00:00
|
|
|
|
2010-04-12 17:17:42 +00:00
|
|
|
if (pp->lazy_line && pp->offset) {
|
2010-12-17 13:12:11 +00:00
|
|
|
semantic_error("Lazy pattern can't be used with offset.\n");
|
2010-04-12 17:17:42 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
2010-02-25 13:36:12 +00:00
|
|
|
|
2010-04-12 17:17:42 +00:00
|
|
|
if (pp->line && pp->offset) {
|
2010-12-17 13:12:11 +00:00
|
|
|
semantic_error("Offset can't be used with line number.\n");
|
2010-04-12 17:17:42 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
2009-12-01 00:19:58 +00:00
|
|
|
|
2010-04-12 17:17:42 +00:00
|
|
|
if (!pp->line && !pp->lazy_line && pp->file && !pp->function) {
|
2010-02-25 13:36:12 +00:00
|
|
|
semantic_error("File always requires line number or "
|
2010-12-17 13:12:11 +00:00
|
|
|
"lazy pattern.\n");
|
2010-04-12 17:17:42 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
2009-12-01 00:19:58 +00:00
|
|
|
|
2010-04-12 17:17:42 +00:00
|
|
|
if (pp->offset && !pp->function) {
|
2010-12-17 13:12:11 +00:00
|
|
|
semantic_error("Offset requires an entry function.\n");
|
2010-04-12 17:17:42 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
2009-12-01 00:19:58 +00:00
|
|
|
|
2010-04-12 17:17:42 +00:00
|
|
|
if (pp->retprobe && !pp->function) {
|
2010-12-17 13:12:11 +00:00
|
|
|
semantic_error("Return probe requires an entry function.\n");
|
2010-04-12 17:17:42 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
2009-12-01 00:19:58 +00:00
|
|
|
|
2010-04-12 17:17:42 +00:00
|
|
|
if ((pp->offset || pp->line || pp->lazy_line) && pp->retprobe) {
|
2010-02-25 13:36:12 +00:00
|
|
|
semantic_error("Offset/Line/Lazy pattern can't be used with "
|
2010-12-17 13:12:11 +00:00
|
|
|
"return probe.\n");
|
2010-04-12 17:17:42 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
2009-12-01 00:19:58 +00:00
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
pr_debug("symbol:%s file:%s line:%d offset:%lu return:%d lazy:%s\n",
|
2010-02-25 13:36:12 +00:00
|
|
|
pp->function, pp->file, pp->line, pp->offset, pp->retprobe,
|
|
|
|
pp->lazy_line);
|
2010-04-12 17:17:42 +00:00
|
|
|
return 0;
|
2009-12-01 00:19:58 +00:00
|
|
|
}
|
|
|
|
|
2010-03-16 22:06:26 +00:00
|
|
|
/* Parse perf-probe event argument */
|
2010-04-12 17:17:42 +00:00
|
|
|
static int parse_perf_probe_arg(char *str, struct perf_probe_arg *arg)
|
2010-03-16 22:06:26 +00:00
|
|
|
{
|
2010-05-19 19:57:42 +00:00
|
|
|
char *tmp, *goodname;
|
2010-03-16 22:06:26 +00:00
|
|
|
struct perf_probe_arg_field **fieldp;
|
|
|
|
|
|
|
|
pr_debug("parsing arg: %s into ", str);
|
|
|
|
|
2010-04-12 17:16:53 +00:00
|
|
|
tmp = strchr(str, '=');
|
|
|
|
if (tmp) {
|
2010-04-12 17:17:56 +00:00
|
|
|
arg->name = strndup(str, tmp - str);
|
|
|
|
if (arg->name == NULL)
|
|
|
|
return -ENOMEM;
|
2010-04-12 17:17:22 +00:00
|
|
|
pr_debug("name:%s ", arg->name);
|
2010-04-12 17:16:53 +00:00
|
|
|
str = tmp + 1;
|
|
|
|
}
|
|
|
|
|
2010-04-12 17:17:22 +00:00
|
|
|
tmp = strchr(str, ':');
|
|
|
|
if (tmp) { /* Type setting */
|
|
|
|
*tmp = '\0';
|
2010-04-12 17:17:56 +00:00
|
|
|
arg->type = strdup(tmp + 1);
|
|
|
|
if (arg->type == NULL)
|
|
|
|
return -ENOMEM;
|
2010-04-12 17:17:22 +00:00
|
|
|
pr_debug("type:%s ", arg->type);
|
|
|
|
}
|
|
|
|
|
2010-05-19 19:57:42 +00:00
|
|
|
tmp = strpbrk(str, "-.[");
|
2010-03-16 22:06:26 +00:00
|
|
|
if (!is_c_varname(str) || !tmp) {
|
|
|
|
/* A variable, register, symbol or special value */
|
2010-04-12 17:17:56 +00:00
|
|
|
arg->var = strdup(str);
|
|
|
|
if (arg->var == NULL)
|
|
|
|
return -ENOMEM;
|
2010-04-12 17:16:53 +00:00
|
|
|
pr_debug("%s\n", arg->var);
|
2010-04-12 17:17:42 +00:00
|
|
|
return 0;
|
2010-03-16 22:06:26 +00:00
|
|
|
}
|
|
|
|
|
2010-05-19 19:57:42 +00:00
|
|
|
/* Structure fields or array element */
|
2010-04-12 17:17:56 +00:00
|
|
|
arg->var = strndup(str, tmp - str);
|
|
|
|
if (arg->var == NULL)
|
|
|
|
return -ENOMEM;
|
2010-05-19 19:57:42 +00:00
|
|
|
goodname = arg->var;
|
2010-04-12 17:16:53 +00:00
|
|
|
pr_debug("%s, ", arg->var);
|
2010-03-16 22:06:26 +00:00
|
|
|
fieldp = &arg->field;
|
|
|
|
|
|
|
|
do {
|
2010-04-12 17:17:49 +00:00
|
|
|
*fieldp = zalloc(sizeof(struct perf_probe_arg_field));
|
|
|
|
if (*fieldp == NULL)
|
|
|
|
return -ENOMEM;
|
2010-05-19 19:57:42 +00:00
|
|
|
if (*tmp == '[') { /* Array */
|
|
|
|
str = tmp;
|
|
|
|
(*fieldp)->index = strtol(str + 1, &tmp, 0);
|
2010-03-16 22:06:26 +00:00
|
|
|
(*fieldp)->ref = true;
|
2010-05-19 19:57:42 +00:00
|
|
|
if (*tmp != ']' || tmp == str + 1) {
|
|
|
|
semantic_error("Array index must be a"
|
|
|
|
" number.\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
tmp++;
|
|
|
|
if (*tmp == '\0')
|
|
|
|
tmp = NULL;
|
|
|
|
} else { /* Structure */
|
|
|
|
if (*tmp == '.') {
|
|
|
|
str = tmp + 1;
|
|
|
|
(*fieldp)->ref = false;
|
|
|
|
} else if (tmp[1] == '>') {
|
|
|
|
str = tmp + 2;
|
|
|
|
(*fieldp)->ref = true;
|
|
|
|
} else {
|
|
|
|
semantic_error("Argument parse error: %s\n",
|
|
|
|
str);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
tmp = strpbrk(str, "-.[");
|
2010-04-12 17:17:42 +00:00
|
|
|
}
|
2010-03-16 22:06:26 +00:00
|
|
|
if (tmp) {
|
2010-04-12 17:17:56 +00:00
|
|
|
(*fieldp)->name = strndup(str, tmp - str);
|
|
|
|
if ((*fieldp)->name == NULL)
|
|
|
|
return -ENOMEM;
|
2010-05-19 19:57:42 +00:00
|
|
|
if (*str != '[')
|
|
|
|
goodname = (*fieldp)->name;
|
2010-03-16 22:06:26 +00:00
|
|
|
pr_debug("%s(%d), ", (*fieldp)->name, (*fieldp)->ref);
|
|
|
|
fieldp = &(*fieldp)->next;
|
|
|
|
}
|
|
|
|
} while (tmp);
|
2010-04-12 17:17:56 +00:00
|
|
|
(*fieldp)->name = strdup(str);
|
|
|
|
if ((*fieldp)->name == NULL)
|
|
|
|
return -ENOMEM;
|
2010-05-19 19:57:42 +00:00
|
|
|
if (*str != '[')
|
|
|
|
goodname = (*fieldp)->name;
|
2010-03-16 22:06:26 +00:00
|
|
|
pr_debug("%s(%d)\n", (*fieldp)->name, (*fieldp)->ref);
|
2010-04-12 17:17:00 +00:00
|
|
|
|
2010-05-19 19:57:42 +00:00
|
|
|
/* If no name is specified, set the last field name (not array index)*/
|
2010-04-12 17:17:56 +00:00
|
|
|
if (!arg->name) {
|
2010-05-19 19:57:42 +00:00
|
|
|
arg->name = strdup(goodname);
|
2010-04-12 17:17:56 +00:00
|
|
|
if (arg->name == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
2010-04-12 17:17:42 +00:00
|
|
|
return 0;
|
2010-03-16 22:06:26 +00:00
|
|
|
}
|
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
/* Parse perf-probe event command */
|
2010-04-12 17:17:42 +00:00
|
|
|
int parse_perf_probe_command(const char *cmd, struct perf_probe_event *pev)
|
2009-12-01 00:19:58 +00:00
|
|
|
{
|
2009-12-01 00:20:05 +00:00
|
|
|
char **argv;
|
2010-04-12 17:17:42 +00:00
|
|
|
int argc, i, ret = 0;
|
2009-12-15 15:31:14 +00:00
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
argv = argv_split(cmd, &argc);
|
2010-04-12 17:17:42 +00:00
|
|
|
if (!argv) {
|
|
|
|
pr_debug("Failed to split arguments.\n");
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
if (argc - 1 > MAX_PROBE_ARGS) {
|
|
|
|
semantic_error("Too many probe arguments (%d).\n", argc - 1);
|
|
|
|
ret = -ERANGE;
|
|
|
|
goto out;
|
|
|
|
}
|
2009-12-01 00:19:58 +00:00
|
|
|
/* Parse probe point */
|
2010-04-12 17:17:42 +00:00
|
|
|
ret = parse_perf_probe_point(argv[0], pev);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out;
|
2009-12-01 00:19:58 +00:00
|
|
|
|
2009-12-01 00:20:05 +00:00
|
|
|
/* Copy arguments and ensure return probe has no C argument */
|
2010-03-16 22:06:12 +00:00
|
|
|
pev->nargs = argc - 1;
|
2010-04-12 17:17:49 +00:00
|
|
|
pev->args = zalloc(sizeof(struct perf_probe_arg) * pev->nargs);
|
|
|
|
if (pev->args == NULL) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
2010-04-12 17:17:42 +00:00
|
|
|
for (i = 0; i < pev->nargs && ret >= 0; i++) {
|
|
|
|
ret = parse_perf_probe_arg(argv[i + 1], &pev->args[i]);
|
|
|
|
if (ret >= 0 &&
|
|
|
|
is_c_varname(pev->args[i].var) && pev->point.retprobe) {
|
2010-03-16 22:06:12 +00:00
|
|
|
semantic_error("You can't specify local variable for"
|
2010-04-12 17:17:42 +00:00
|
|
|
" kretprobe.\n");
|
|
|
|
ret = -EINVAL;
|
|
|
|
}
|
2009-12-01 00:20:05 +00:00
|
|
|
}
|
2010-04-12 17:17:42 +00:00
|
|
|
out:
|
2009-12-01 00:20:05 +00:00
|
|
|
argv_free(argv);
|
2010-04-12 17:17:42 +00:00
|
|
|
|
|
|
|
return ret;
|
2009-12-01 00:19:58 +00:00
|
|
|
}
|
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
/* Return true if this perf_probe_event requires debuginfo */
|
|
|
|
bool perf_probe_event_need_dwarf(struct perf_probe_event *pev)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (pev->point.file || pev->point.line || pev->point.lazy_line)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
for (i = 0; i < pev->nargs; i++)
|
2010-04-12 17:16:53 +00:00
|
|
|
if (is_c_varname(pev->args[i].var))
|
2010-03-16 22:06:12 +00:00
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2010-07-29 14:13:51 +00:00
|
|
|
/* Parse probe_events event into struct probe_point */
|
2015-07-15 09:14:07 +00:00
|
|
|
int parse_probe_trace_command(const char *cmd, struct probe_trace_event *tev)
|
2009-12-01 00:20:17 +00:00
|
|
|
{
|
2010-07-29 14:13:51 +00:00
|
|
|
struct probe_trace_point *tp = &tev->point;
|
2009-12-01 00:20:17 +00:00
|
|
|
char pr;
|
|
|
|
char *p;
|
2012-09-20 20:37:50 +00:00
|
|
|
char *argv0_str = NULL, *fmt, *fmt1_str, *fmt2_str, *fmt3_str;
|
2009-12-01 00:20:17 +00:00
|
|
|
int ret, i, argc;
|
|
|
|
char **argv;
|
|
|
|
|
2010-07-29 14:13:51 +00:00
|
|
|
pr_debug("Parsing probe_events: %s\n", cmd);
|
2010-03-16 22:06:12 +00:00
|
|
|
argv = argv_split(cmd, &argc);
|
2010-04-12 17:17:42 +00:00
|
|
|
if (!argv) {
|
|
|
|
pr_debug("Failed to split arguments.\n");
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
if (argc < 2) {
|
|
|
|
semantic_error("Too few probe arguments.\n");
|
|
|
|
ret = -ERANGE;
|
|
|
|
goto out;
|
|
|
|
}
|
2009-12-01 00:20:17 +00:00
|
|
|
|
|
|
|
/* Scan event and group name. */
|
2012-09-20 20:37:50 +00:00
|
|
|
argv0_str = strdup(argv[0]);
|
|
|
|
if (argv0_str == NULL) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
fmt1_str = strtok_r(argv0_str, ":", &fmt);
|
|
|
|
fmt2_str = strtok_r(NULL, "/", &fmt);
|
|
|
|
fmt3_str = strtok_r(NULL, " \t", &fmt);
|
|
|
|
if (fmt1_str == NULL || strlen(fmt1_str) != 1 || fmt2_str == NULL
|
|
|
|
|| fmt3_str == NULL) {
|
2010-04-12 17:17:42 +00:00
|
|
|
semantic_error("Failed to parse event name: %s\n", argv[0]);
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
2012-09-20 20:37:50 +00:00
|
|
|
pr = fmt1_str[0];
|
|
|
|
tev->group = strdup(fmt2_str);
|
|
|
|
tev->event = strdup(fmt3_str);
|
|
|
|
if (tev->group == NULL || tev->event == NULL) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
2010-03-16 22:06:12 +00:00
|
|
|
pr_debug("Group:%s Event:%s probe:%c\n", tev->group, tev->event, pr);
|
2009-12-01 00:20:17 +00:00
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
tp->retprobe = (pr == 'r');
|
2009-12-01 00:20:17 +00:00
|
|
|
|
2011-06-27 07:27:45 +00:00
|
|
|
/* 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];
|
2012-09-20 20:37:50 +00:00
|
|
|
fmt1_str = strtok_r(p, "+", &fmt);
|
2014-02-06 05:32:23 +00:00
|
|
|
if (fmt1_str[0] == '0') /* only the address started with 0x */
|
|
|
|
tp->address = strtoul(fmt1_str, NULL, 0);
|
|
|
|
else {
|
|
|
|
/* Only the symbol-based probe has offset */
|
|
|
|
tp->symbol = strdup(fmt1_str);
|
|
|
|
if (tp->symbol == NULL) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
fmt2_str = strtok_r(NULL, "", &fmt);
|
|
|
|
if (fmt2_str == NULL)
|
|
|
|
tp->offset = 0;
|
|
|
|
else
|
|
|
|
tp->offset = strtoul(fmt2_str, NULL, 10);
|
2012-09-20 20:37:50 +00:00
|
|
|
}
|
2009-12-01 00:20:17 +00:00
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
tev->nargs = argc - 2;
|
2010-07-29 14:13:51 +00:00
|
|
|
tev->args = zalloc(sizeof(struct probe_trace_arg) * tev->nargs);
|
2010-04-12 17:17:49 +00:00
|
|
|
if (tev->args == NULL) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
2010-03-16 22:06:12 +00:00
|
|
|
for (i = 0; i < tev->nargs; i++) {
|
2009-12-01 00:20:17 +00:00
|
|
|
p = strchr(argv[i + 2], '=');
|
|
|
|
if (p) /* We don't need which register is assigned. */
|
2010-03-16 22:06:12 +00:00
|
|
|
*p++ = '\0';
|
|
|
|
else
|
|
|
|
p = argv[i + 2];
|
2010-04-12 17:17:56 +00:00
|
|
|
tev->args[i].name = strdup(argv[i + 2]);
|
2010-03-16 22:06:12 +00:00
|
|
|
/* TODO: parse regs and offset */
|
2010-04-12 17:17:56 +00:00
|
|
|
tev->args[i].value = strdup(p);
|
|
|
|
if (tev->args[i].name == NULL || tev->args[i].value == NULL) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
2009-12-01 00:20:17 +00:00
|
|
|
}
|
2010-04-12 17:17:42 +00:00
|
|
|
ret = 0;
|
|
|
|
out:
|
2012-09-20 20:37:50 +00:00
|
|
|
free(argv0_str);
|
2009-12-01 00:20:17 +00:00
|
|
|
argv_free(argv);
|
2010-04-12 17:17:42 +00:00
|
|
|
return ret;
|
2009-12-01 00:20:17 +00:00
|
|
|
}
|
|
|
|
|
2010-03-16 22:06:26 +00:00
|
|
|
/* Compose only probe arg */
|
|
|
|
int synthesize_perf_probe_arg(struct perf_probe_arg *pa, char *buf, size_t len)
|
|
|
|
{
|
|
|
|
struct perf_probe_arg_field *field = pa->field;
|
|
|
|
int ret;
|
|
|
|
char *tmp = buf;
|
|
|
|
|
2010-04-12 17:16:53 +00:00
|
|
|
if (pa->name && pa->var)
|
|
|
|
ret = e_snprintf(tmp, len, "%s=%s", pa->name, pa->var);
|
|
|
|
else
|
|
|
|
ret = e_snprintf(tmp, len, "%s", pa->name ? pa->name : pa->var);
|
2010-03-16 22:06:26 +00:00
|
|
|
if (ret <= 0)
|
|
|
|
goto error;
|
|
|
|
tmp += ret;
|
|
|
|
len -= ret;
|
|
|
|
|
|
|
|
while (field) {
|
2010-05-19 19:57:42 +00:00
|
|
|
if (field->name[0] == '[')
|
|
|
|
ret = e_snprintf(tmp, len, "%s", field->name);
|
|
|
|
else
|
|
|
|
ret = e_snprintf(tmp, len, "%s%s",
|
|
|
|
field->ref ? "->" : ".", field->name);
|
2010-03-16 22:06:26 +00:00
|
|
|
if (ret <= 0)
|
|
|
|
goto error;
|
|
|
|
tmp += ret;
|
|
|
|
len -= ret;
|
|
|
|
field = field->next;
|
|
|
|
}
|
2010-04-12 17:17:22 +00:00
|
|
|
|
|
|
|
if (pa->type) {
|
|
|
|
ret = e_snprintf(tmp, len, ":%s", pa->type);
|
|
|
|
if (ret <= 0)
|
|
|
|
goto error;
|
|
|
|
tmp += ret;
|
|
|
|
len -= ret;
|
|
|
|
}
|
|
|
|
|
2010-03-16 22:06:26 +00:00
|
|
|
return tmp - buf;
|
|
|
|
error:
|
2014-08-14 02:22:34 +00:00
|
|
|
pr_debug("Failed to synthesize perf probe argument: %d\n", ret);
|
2010-04-12 17:17:42 +00:00
|
|
|
return ret;
|
2010-03-16 22:06:26 +00:00
|
|
|
}
|
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
/* Compose only probe point (not argument) */
|
|
|
|
static char *synthesize_perf_probe_point(struct perf_probe_point *pp)
|
2009-12-01 00:20:17 +00:00
|
|
|
{
|
2010-03-16 22:06:19 +00:00
|
|
|
char *buf, *tmp;
|
|
|
|
char offs[32] = "", line[32] = "", file[32] = "";
|
|
|
|
int ret, len;
|
2009-12-01 00:20:17 +00:00
|
|
|
|
2010-04-12 17:17:49 +00:00
|
|
|
buf = zalloc(MAX_CMDLEN);
|
|
|
|
if (buf == NULL) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto error;
|
|
|
|
}
|
2009-12-01 00:20:17 +00:00
|
|
|
if (pp->offset) {
|
2010-03-16 22:06:19 +00:00
|
|
|
ret = e_snprintf(offs, 32, "+%lu", pp->offset);
|
2009-12-01 00:20:17 +00:00
|
|
|
if (ret <= 0)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (pp->line) {
|
2010-03-16 22:06:19 +00:00
|
|
|
ret = e_snprintf(line, 32, ":%d", pp->line);
|
|
|
|
if (ret <= 0)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (pp->file) {
|
2010-12-23 15:04:23 +00:00
|
|
|
tmp = pp->file;
|
|
|
|
len = strlen(tmp);
|
|
|
|
if (len > 30) {
|
|
|
|
tmp = strchr(pp->file + len - 30, '/');
|
|
|
|
tmp = tmp ? tmp + 1 : pp->file + len - 30;
|
|
|
|
}
|
|
|
|
ret = e_snprintf(file, 32, "@%s", tmp);
|
2009-12-01 00:20:17 +00:00
|
|
|
if (ret <= 0)
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pp->function)
|
2010-03-16 22:06:19 +00:00
|
|
|
ret = e_snprintf(buf, MAX_CMDLEN, "%s%s%s%s%s", pp->function,
|
|
|
|
offs, pp->retprobe ? "%return" : "", line,
|
|
|
|
file);
|
2009-12-01 00:20:17 +00:00
|
|
|
else
|
2010-03-16 22:06:19 +00:00
|
|
|
ret = e_snprintf(buf, MAX_CMDLEN, "%s%s", file, line);
|
2010-03-16 22:06:12 +00:00
|
|
|
if (ret <= 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
return buf;
|
2009-12-15 15:32:47 +00:00
|
|
|
error:
|
2014-08-14 02:22:34 +00:00
|
|
|
pr_debug("Failed to synthesize perf probe point: %d\n", ret);
|
2013-12-26 18:54:57 +00:00
|
|
|
free(buf);
|
2010-04-12 17:17:42 +00:00
|
|
|
return NULL;
|
2009-12-15 15:32:47 +00:00
|
|
|
}
|
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
#if 0
|
|
|
|
char *synthesize_perf_probe_command(struct perf_probe_event *pev)
|
2009-12-15 15:32:47 +00:00
|
|
|
{
|
|
|
|
char *buf;
|
|
|
|
int i, len, ret;
|
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
buf = synthesize_perf_probe_point(&pev->point);
|
|
|
|
if (!buf)
|
|
|
|
return NULL;
|
2009-12-01 00:20:17 +00:00
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
len = strlen(buf);
|
|
|
|
for (i = 0; i < pev->nargs; i++) {
|
2009-12-01 00:20:17 +00:00
|
|
|
ret = e_snprintf(&buf[len], MAX_CMDLEN - len, " %s",
|
2010-03-16 22:06:12 +00:00
|
|
|
pev->args[i].name);
|
|
|
|
if (ret <= 0) {
|
|
|
|
free(buf);
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-12-01 00:20:17 +00:00
|
|
|
len += ret;
|
|
|
|
}
|
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2010-07-29 14:13:51 +00:00
|
|
|
static int __synthesize_probe_trace_arg_ref(struct probe_trace_arg_ref *ref,
|
2010-03-16 22:06:12 +00:00
|
|
|
char **buf, size_t *buflen,
|
|
|
|
int depth)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
if (ref->next) {
|
2010-07-29 14:13:51 +00:00
|
|
|
depth = __synthesize_probe_trace_arg_ref(ref->next, buf,
|
2010-03-16 22:06:12 +00:00
|
|
|
buflen, depth + 1);
|
|
|
|
if (depth < 0)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = e_snprintf(*buf, *buflen, "%+ld(", ref->offset);
|
|
|
|
if (ret < 0)
|
|
|
|
depth = ret;
|
|
|
|
else {
|
|
|
|
*buf += ret;
|
|
|
|
*buflen -= ret;
|
|
|
|
}
|
|
|
|
out:
|
|
|
|
return depth;
|
2009-12-01 00:20:17 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2010-07-29 14:13:51 +00:00
|
|
|
static int synthesize_probe_trace_arg(struct probe_trace_arg *arg,
|
2010-03-16 22:06:12 +00:00
|
|
|
char *buf, size_t buflen)
|
2009-12-01 00:19:58 +00:00
|
|
|
{
|
2010-07-29 14:13:51 +00:00
|
|
|
struct probe_trace_arg_ref *ref = arg->ref;
|
2010-03-16 22:06:12 +00:00
|
|
|
int ret, depth = 0;
|
|
|
|
char *tmp = buf;
|
|
|
|
|
|
|
|
/* Argument name or separator */
|
|
|
|
if (arg->name)
|
|
|
|
ret = e_snprintf(buf, buflen, " %s=", arg->name);
|
|
|
|
else
|
|
|
|
ret = e_snprintf(buf, buflen, " ");
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
buf += ret;
|
|
|
|
buflen -= ret;
|
|
|
|
|
2010-05-19 19:57:49 +00:00
|
|
|
/* Special case: @XXX */
|
|
|
|
if (arg->value[0] == '@' && arg->ref)
|
|
|
|
ref = ref->next;
|
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
/* Dereferencing arguments */
|
2010-05-19 19:57:49 +00:00
|
|
|
if (ref) {
|
2010-07-29 14:13:51 +00:00
|
|
|
depth = __synthesize_probe_trace_arg_ref(ref, &buf,
|
2010-03-16 22:06:12 +00:00
|
|
|
&buflen, 1);
|
|
|
|
if (depth < 0)
|
|
|
|
return depth;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Print argument value */
|
2010-05-19 19:57:49 +00:00
|
|
|
if (arg->value[0] == '@' && arg->ref)
|
|
|
|
ret = e_snprintf(buf, buflen, "%s%+ld", arg->value,
|
|
|
|
arg->ref->offset);
|
|
|
|
else
|
|
|
|
ret = e_snprintf(buf, buflen, "%s", arg->value);
|
2010-03-16 22:06:12 +00:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
buf += ret;
|
|
|
|
buflen -= ret;
|
|
|
|
|
|
|
|
/* Closing */
|
|
|
|
while (depth--) {
|
|
|
|
ret = e_snprintf(buf, buflen, ")");
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
buf += ret;
|
|
|
|
buflen -= ret;
|
|
|
|
}
|
2010-04-12 17:17:15 +00:00
|
|
|
/* Print argument type */
|
|
|
|
if (arg->type) {
|
|
|
|
ret = e_snprintf(buf, buflen, ":%s", arg->type);
|
|
|
|
if (ret <= 0)
|
|
|
|
return ret;
|
|
|
|
buf += ret;
|
|
|
|
}
|
2010-03-16 22:06:12 +00:00
|
|
|
|
|
|
|
return buf - tmp;
|
|
|
|
}
|
|
|
|
|
2010-07-29 14:13:51 +00:00
|
|
|
char *synthesize_probe_trace_command(struct probe_trace_event *tev)
|
2010-03-16 22:06:12 +00:00
|
|
|
{
|
2010-07-29 14:13:51 +00:00
|
|
|
struct probe_trace_point *tp = &tev->point;
|
2009-12-01 00:19:58 +00:00
|
|
|
char *buf;
|
|
|
|
int i, len, ret;
|
|
|
|
|
2010-04-12 17:17:49 +00:00
|
|
|
buf = zalloc(MAX_CMDLEN);
|
|
|
|
if (buf == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
len = e_snprintf(buf, MAX_CMDLEN, "%c:%s/%s ", tp->retprobe ? 'r' : 'p',
|
|
|
|
tev->group, tev->event);
|
|
|
|
if (len <= 0)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* Uprobes must have tp->address and tp->module */
|
|
|
|
if (tev->uprobes && (!tp->address || !tp->module))
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* Use the tp->address for uprobes */
|
2012-04-16 12:09:09 +00:00
|
|
|
if (tev->uprobes)
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
ret = e_snprintf(buf + len, MAX_CMDLEN - len, "%s:0x%lx",
|
|
|
|
tp->module, tp->address);
|
2012-04-16 12:09:09 +00:00
|
|
|
else
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
ret = e_snprintf(buf + len, MAX_CMDLEN - len, "%s%s%s+%lu",
|
2012-04-16 12:09:09 +00:00
|
|
|
tp->module ?: "", tp->module ? ":" : "",
|
|
|
|
tp->symbol, tp->offset);
|
|
|
|
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
if (ret <= 0)
|
2009-12-01 00:19:58 +00:00
|
|
|
goto error;
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
len += ret;
|
2009-12-01 00:19:58 +00:00
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
for (i = 0; i < tev->nargs; i++) {
|
2010-07-29 14:13:51 +00:00
|
|
|
ret = synthesize_probe_trace_arg(&tev->args[i], buf + len,
|
2010-03-16 22:06:12 +00:00
|
|
|
MAX_CMDLEN - len);
|
2009-12-01 00:20:17 +00:00
|
|
|
if (ret <= 0)
|
2009-12-01 00:19:58 +00:00
|
|
|
goto error;
|
|
|
|
len += ret;
|
|
|
|
}
|
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
return buf;
|
2009-12-01 00:19:58 +00:00
|
|
|
error:
|
2010-03-16 22:06:12 +00:00
|
|
|
free(buf);
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-12-01 00:19:58 +00:00
|
|
|
|
2014-02-06 05:32:23 +00:00
|
|
|
static int find_perf_probe_point_from_map(struct probe_trace_point *tp,
|
|
|
|
struct perf_probe_point *pp,
|
|
|
|
bool is_kprobe)
|
|
|
|
{
|
|
|
|
struct symbol *sym = NULL;
|
|
|
|
struct map *map;
|
|
|
|
u64 addr;
|
|
|
|
int ret = -ENOENT;
|
|
|
|
|
|
|
|
if (!is_kprobe) {
|
|
|
|
map = dso__new_map(tp->module);
|
|
|
|
if (!map)
|
|
|
|
goto out;
|
|
|
|
addr = tp->address;
|
|
|
|
sym = map__find_symbol(map, addr, NULL);
|
|
|
|
} else {
|
|
|
|
addr = kernel_get_symbol_address_by_name(tp->symbol, true);
|
|
|
|
if (addr) {
|
|
|
|
addr += tp->offset;
|
|
|
|
sym = __find_kernel_function(addr, &map);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!sym)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
pp->retprobe = tp->retprobe;
|
|
|
|
pp->offset = addr - map->unmap_ip(map, sym->start);
|
|
|
|
pp->function = strdup(sym->name);
|
|
|
|
ret = pp->function ? 0 : -ENOMEM;
|
|
|
|
|
|
|
|
out:
|
|
|
|
if (map && !is_kprobe) {
|
2015-05-25 19:59:56 +00:00
|
|
|
map__put(map);
|
2014-02-06 05:32:23 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int convert_to_perf_probe_point(struct probe_trace_point *tp,
|
|
|
|
struct perf_probe_point *pp,
|
|
|
|
bool is_kprobe)
|
|
|
|
{
|
|
|
|
char buf[128];
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = find_perf_probe_point_from_dwarf(tp, pp, is_kprobe);
|
|
|
|
if (!ret)
|
|
|
|
return 0;
|
|
|
|
ret = find_perf_probe_point_from_map(tp, pp, is_kprobe);
|
|
|
|
if (!ret)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
pr_debug("Failed to find probe point from both of dwarf and map.\n");
|
|
|
|
|
|
|
|
if (tp->symbol) {
|
|
|
|
pp->function = strdup(tp->symbol);
|
|
|
|
pp->offset = tp->offset;
|
|
|
|
} else if (!tp->module && !is_kprobe) {
|
|
|
|
ret = e_snprintf(buf, 128, "0x%" PRIx64, (u64)tp->address);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
pp->function = strdup(buf);
|
|
|
|
pp->offset = 0;
|
|
|
|
}
|
|
|
|
if (pp->function == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
pp->retprobe = tp->retprobe;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-07-29 14:13:51 +00:00
|
|
|
static int convert_to_perf_probe_event(struct probe_trace_event *tev,
|
2012-04-16 12:09:09 +00:00
|
|
|
struct perf_probe_event *pev, bool is_kprobe)
|
2010-03-16 22:06:12 +00:00
|
|
|
{
|
2010-04-12 17:17:56 +00:00
|
|
|
char buf[64] = "";
|
2010-04-12 17:17:42 +00:00
|
|
|
int i, ret;
|
2010-03-16 22:06:12 +00:00
|
|
|
|
2010-03-22 16:10:26 +00:00
|
|
|
/* Convert event/group name */
|
2010-04-12 17:17:56 +00:00
|
|
|
pev->event = strdup(tev->event);
|
|
|
|
pev->group = strdup(tev->group);
|
|
|
|
if (pev->event == NULL || pev->group == NULL)
|
|
|
|
return -ENOMEM;
|
2010-03-16 22:06:19 +00:00
|
|
|
|
2010-03-22 16:10:26 +00:00
|
|
|
/* Convert trace_point to probe_point */
|
2014-02-06 05:32:23 +00:00
|
|
|
ret = convert_to_perf_probe_point(&tev->point, &pev->point, is_kprobe);
|
2010-04-12 17:17:42 +00:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
2010-03-22 16:10:26 +00:00
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
/* Convert trace_arg to probe_arg */
|
|
|
|
pev->nargs = tev->nargs;
|
2010-04-12 17:17:49 +00:00
|
|
|
pev->args = zalloc(sizeof(struct perf_probe_arg) * pev->nargs);
|
|
|
|
if (pev->args == NULL)
|
|
|
|
return -ENOMEM;
|
2010-04-12 17:17:56 +00:00
|
|
|
for (i = 0; i < tev->nargs && ret >= 0; i++) {
|
2010-03-16 22:06:12 +00:00
|
|
|
if (tev->args[i].name)
|
2010-04-12 17:17:56 +00:00
|
|
|
pev->args[i].name = strdup(tev->args[i].name);
|
2010-03-16 22:06:12 +00:00
|
|
|
else {
|
2010-07-29 14:13:51 +00:00
|
|
|
ret = synthesize_probe_trace_arg(&tev->args[i],
|
2010-04-12 17:17:42 +00:00
|
|
|
buf, 64);
|
2010-04-12 17:17:56 +00:00
|
|
|
pev->args[i].name = strdup(buf);
|
2010-03-16 22:06:12 +00:00
|
|
|
}
|
2010-04-12 17:17:56 +00:00
|
|
|
if (pev->args[i].name == NULL && ret >= 0)
|
|
|
|
ret = -ENOMEM;
|
|
|
|
}
|
2010-04-12 17:17:42 +00:00
|
|
|
|
|
|
|
if (ret < 0)
|
|
|
|
clear_perf_probe_event(pev);
|
|
|
|
|
|
|
|
return ret;
|
2010-03-16 22:06:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void clear_perf_probe_event(struct perf_probe_event *pev)
|
|
|
|
{
|
2010-03-16 22:06:26 +00:00
|
|
|
struct perf_probe_arg_field *field, *next;
|
2010-03-16 22:06:12 +00:00
|
|
|
int i;
|
|
|
|
|
2013-12-26 18:54:57 +00:00
|
|
|
free(pev->event);
|
|
|
|
free(pev->group);
|
2015-04-01 10:25:39 +00:00
|
|
|
free(pev->target);
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
clear_perf_probe_point(&pev->point);
|
2013-12-26 18:54:57 +00:00
|
|
|
|
2010-03-16 22:06:26 +00:00
|
|
|
for (i = 0; i < pev->nargs; i++) {
|
2013-12-26 18:54:57 +00:00
|
|
|
free(pev->args[i].name);
|
|
|
|
free(pev->args[i].var);
|
|
|
|
free(pev->args[i].type);
|
2010-03-16 22:06:26 +00:00
|
|
|
field = pev->args[i].field;
|
|
|
|
while (field) {
|
|
|
|
next = field->next;
|
2013-12-27 19:55:14 +00:00
|
|
|
zfree(&field->name);
|
2010-03-16 22:06:26 +00:00
|
|
|
free(field);
|
|
|
|
field = next;
|
|
|
|
}
|
|
|
|
}
|
2013-12-26 18:54:57 +00:00
|
|
|
free(pev->args);
|
2010-03-16 22:06:12 +00:00
|
|
|
memset(pev, 0, sizeof(*pev));
|
|
|
|
}
|
|
|
|
|
2015-07-15 09:14:07 +00:00
|
|
|
void clear_probe_trace_event(struct probe_trace_event *tev)
|
2010-03-16 22:06:12 +00:00
|
|
|
{
|
2010-07-29 14:13:51 +00:00
|
|
|
struct probe_trace_arg_ref *ref, *next;
|
2010-03-16 22:06:12 +00:00
|
|
|
int i;
|
|
|
|
|
2013-12-26 18:54:57 +00:00
|
|
|
free(tev->event);
|
|
|
|
free(tev->group);
|
|
|
|
free(tev->point.symbol);
|
2015-05-08 01:03:35 +00:00
|
|
|
free(tev->point.realname);
|
2013-12-26 18:54:57 +00:00
|
|
|
free(tev->point.module);
|
2010-03-16 22:06:12 +00:00
|
|
|
for (i = 0; i < tev->nargs; i++) {
|
2013-12-26 18:54:57 +00:00
|
|
|
free(tev->args[i].name);
|
|
|
|
free(tev->args[i].value);
|
|
|
|
free(tev->args[i].type);
|
2010-03-16 22:06:12 +00:00
|
|
|
ref = tev->args[i].ref;
|
|
|
|
while (ref) {
|
|
|
|
next = ref->next;
|
|
|
|
free(ref);
|
|
|
|
ref = next;
|
|
|
|
}
|
|
|
|
}
|
2013-12-26 18:54:57 +00:00
|
|
|
free(tev->args);
|
2010-03-16 22:06:12 +00:00
|
|
|
memset(tev, 0, sizeof(*tev));
|
2009-12-01 00:19:58 +00:00
|
|
|
}
|
|
|
|
|
2015-02-19 14:31:13 +00:00
|
|
|
struct kprobe_blacklist_node {
|
|
|
|
struct list_head list;
|
|
|
|
unsigned long start;
|
|
|
|
unsigned long end;
|
|
|
|
char *symbol;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void kprobe_blacklist__delete(struct list_head *blacklist)
|
|
|
|
{
|
|
|
|
struct kprobe_blacklist_node *node;
|
|
|
|
|
|
|
|
while (!list_empty(blacklist)) {
|
|
|
|
node = list_first_entry(blacklist,
|
|
|
|
struct kprobe_blacklist_node, list);
|
|
|
|
list_del(&node->list);
|
|
|
|
free(node->symbol);
|
|
|
|
free(node);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int kprobe_blacklist__load(struct list_head *blacklist)
|
|
|
|
{
|
|
|
|
struct kprobe_blacklist_node *node;
|
|
|
|
const char *__debugfs = debugfs_find_mountpoint();
|
|
|
|
char buf[PATH_MAX], *p;
|
|
|
|
FILE *fp;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (__debugfs == NULL)
|
|
|
|
return -ENOTSUP;
|
|
|
|
|
|
|
|
ret = e_snprintf(buf, PATH_MAX, "%s/kprobes/blacklist", __debugfs);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
fp = fopen(buf, "r");
|
|
|
|
if (!fp)
|
|
|
|
return -errno;
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
while (fgets(buf, PATH_MAX, fp)) {
|
|
|
|
node = zalloc(sizeof(*node));
|
|
|
|
if (!node) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
INIT_LIST_HEAD(&node->list);
|
|
|
|
list_add_tail(&node->list, blacklist);
|
|
|
|
if (sscanf(buf, "0x%lx-0x%lx", &node->start, &node->end) != 2) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
p = strchr(buf, '\t');
|
|
|
|
if (p) {
|
|
|
|
p++;
|
|
|
|
if (p[strlen(p) - 1] == '\n')
|
|
|
|
p[strlen(p) - 1] = '\0';
|
|
|
|
} else
|
|
|
|
p = (char *)"unknown";
|
|
|
|
node->symbol = strdup(p);
|
|
|
|
if (!node->symbol) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
pr_debug2("Blacklist: 0x%lx-0x%lx, %s\n",
|
|
|
|
node->start, node->end, node->symbol);
|
|
|
|
ret++;
|
|
|
|
}
|
|
|
|
if (ret < 0)
|
|
|
|
kprobe_blacklist__delete(blacklist);
|
|
|
|
fclose(fp);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct kprobe_blacklist_node *
|
|
|
|
kprobe_blacklist__find_by_address(struct list_head *blacklist,
|
|
|
|
unsigned long address)
|
|
|
|
{
|
|
|
|
struct kprobe_blacklist_node *node;
|
|
|
|
|
|
|
|
list_for_each_entry(node, blacklist, list) {
|
|
|
|
if (node->start <= address && address <= node->end)
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2015-06-16 11:50:55 +00:00
|
|
|
static LIST_HEAD(kprobe_blacklist);
|
|
|
|
|
|
|
|
static void kprobe_blacklist__init(void)
|
|
|
|
{
|
|
|
|
if (!list_empty(&kprobe_blacklist))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (kprobe_blacklist__load(&kprobe_blacklist) < 0)
|
|
|
|
pr_debug("No kprobe blacklist support, ignored\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
static void kprobe_blacklist__release(void)
|
|
|
|
{
|
|
|
|
kprobe_blacklist__delete(&kprobe_blacklist);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool kprobe_blacklist__listed(unsigned long address)
|
|
|
|
{
|
|
|
|
return !!kprobe_blacklist__find_by_address(&kprobe_blacklist, address);
|
|
|
|
}
|
|
|
|
|
2015-06-16 11:50:57 +00:00
|
|
|
static int perf_probe_event__sprintf(const char *group, const char *event,
|
|
|
|
struct perf_probe_event *pev,
|
2015-06-13 01:31:16 +00:00
|
|
|
const char *module,
|
|
|
|
struct strbuf *result)
|
2009-12-08 22:02:40 +00:00
|
|
|
{
|
2009-12-15 15:31:21 +00:00
|
|
|
int i, ret;
|
2009-12-08 22:02:40 +00:00
|
|
|
char buf[128];
|
2010-03-16 22:06:12 +00:00
|
|
|
char *place;
|
2009-12-08 22:02:40 +00:00
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
/* Synthesize only event probe point */
|
|
|
|
place = synthesize_perf_probe_point(&pev->point);
|
2010-04-12 17:17:42 +00:00
|
|
|
if (!place)
|
|
|
|
return -EINVAL;
|
2010-03-16 22:06:12 +00:00
|
|
|
|
2015-06-16 11:50:57 +00:00
|
|
|
ret = e_snprintf(buf, 128, "%s:%s", group, event);
|
2009-12-15 15:31:21 +00:00
|
|
|
if (ret < 0)
|
2015-06-13 01:31:16 +00:00
|
|
|
goto out;
|
2010-04-12 17:17:42 +00:00
|
|
|
|
2015-06-13 01:31:16 +00:00
|
|
|
strbuf_addf(result, " %-20s (on %s", buf, place);
|
2014-02-06 05:32:13 +00:00
|
|
|
if (module)
|
2015-06-13 01:31:16 +00:00
|
|
|
strbuf_addf(result, " in %s", module);
|
2009-12-08 22:02:40 +00:00
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
if (pev->nargs > 0) {
|
2015-06-13 01:31:16 +00:00
|
|
|
strbuf_addstr(result, " with");
|
2010-03-16 22:06:26 +00:00
|
|
|
for (i = 0; i < pev->nargs; i++) {
|
2010-04-12 17:17:42 +00:00
|
|
|
ret = synthesize_perf_probe_arg(&pev->args[i],
|
|
|
|
buf, 128);
|
|
|
|
if (ret < 0)
|
2015-06-13 01:31:16 +00:00
|
|
|
goto out;
|
|
|
|
strbuf_addf(result, " %s", buf);
|
2010-03-16 22:06:26 +00:00
|
|
|
}
|
2009-12-08 22:02:40 +00:00
|
|
|
}
|
2015-06-13 01:31:16 +00:00
|
|
|
strbuf_addch(result, ')');
|
|
|
|
out:
|
2010-03-16 22:06:12 +00:00
|
|
|
free(place);
|
2010-04-12 17:17:42 +00:00
|
|
|
return ret;
|
2009-12-08 22:02:40 +00:00
|
|
|
}
|
|
|
|
|
2015-06-13 01:31:16 +00:00
|
|
|
/* Show an event */
|
2015-06-16 11:50:57 +00:00
|
|
|
static int show_perf_probe_event(const char *group, const char *event,
|
|
|
|
struct perf_probe_event *pev,
|
2015-06-13 01:31:16 +00:00
|
|
|
const char *module, bool use_stdout)
|
|
|
|
{
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
int ret;
|
|
|
|
|
2015-06-16 11:50:57 +00:00
|
|
|
ret = perf_probe_event__sprintf(group, event, pev, module, &buf);
|
2015-06-13 01:31:16 +00:00
|
|
|
if (ret >= 0) {
|
|
|
|
if (use_stdout)
|
|
|
|
printf("%s\n", buf.buf);
|
|
|
|
else
|
|
|
|
pr_info("%s\n", buf.buf);
|
|
|
|
}
|
|
|
|
strbuf_release(&buf);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2015-04-24 09:47:50 +00:00
|
|
|
static bool filter_probe_trace_event(struct probe_trace_event *tev,
|
|
|
|
struct strfilter *filter)
|
|
|
|
{
|
|
|
|
char tmp[128];
|
|
|
|
|
|
|
|
/* At first, check the event name itself */
|
|
|
|
if (strfilter__compare(filter, tev->event))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
/* Next, check the combination of name and group */
|
|
|
|
if (e_snprintf(tmp, 128, "%s:%s", tev->group, tev->event) < 0)
|
|
|
|
return false;
|
|
|
|
return strfilter__compare(filter, tmp);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __show_perf_probe_events(int fd, bool is_kprobe,
|
|
|
|
struct strfilter *filter)
|
2009-12-01 00:20:17 +00:00
|
|
|
{
|
2012-04-16 12:09:09 +00:00
|
|
|
int ret = 0;
|
2010-07-29 14:13:51 +00:00
|
|
|
struct probe_trace_event tev;
|
2010-03-16 22:06:12 +00:00
|
|
|
struct perf_probe_event pev;
|
2009-12-01 00:20:17 +00:00
|
|
|
struct strlist *rawlist;
|
|
|
|
struct str_node *ent;
|
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
memset(&tev, 0, sizeof(tev));
|
|
|
|
memset(&pev, 0, sizeof(pev));
|
2010-01-05 22:47:10 +00:00
|
|
|
|
2015-07-15 09:14:07 +00:00
|
|
|
rawlist = probe_file__get_rawlist(fd);
|
2010-04-12 17:17:42 +00:00
|
|
|
if (!rawlist)
|
2014-08-14 02:22:30 +00:00
|
|
|
return -ENOMEM;
|
2009-12-01 00:20:17 +00:00
|
|
|
|
2009-12-15 15:32:03 +00:00
|
|
|
strlist__for_each(ent, rawlist) {
|
2010-07-29 14:13:51 +00:00
|
|
|
ret = parse_probe_trace_command(ent->s, &tev);
|
2010-04-12 17:17:42 +00:00
|
|
|
if (ret >= 0) {
|
2015-04-24 09:47:50 +00:00
|
|
|
if (!filter_probe_trace_event(&tev, filter))
|
|
|
|
goto next;
|
2012-04-16 12:09:09 +00:00
|
|
|
ret = convert_to_perf_probe_event(&tev, &pev,
|
|
|
|
is_kprobe);
|
2015-06-13 01:31:16 +00:00
|
|
|
if (ret < 0)
|
|
|
|
goto next;
|
2015-06-16 11:50:57 +00:00
|
|
|
ret = show_perf_probe_event(pev.group, pev.event,
|
|
|
|
&pev, tev.point.module,
|
2015-06-13 01:31:16 +00:00
|
|
|
true);
|
2010-04-12 17:17:42 +00:00
|
|
|
}
|
2015-04-24 09:47:50 +00:00
|
|
|
next:
|
2010-03-16 22:06:12 +00:00
|
|
|
clear_perf_probe_event(&pev);
|
2010-07-29 14:13:51 +00:00
|
|
|
clear_probe_trace_event(&tev);
|
2010-04-12 17:17:42 +00:00
|
|
|
if (ret < 0)
|
|
|
|
break;
|
2009-12-01 00:20:17 +00:00
|
|
|
}
|
|
|
|
strlist__delete(rawlist);
|
2015-06-17 14:58:54 +00:00
|
|
|
/* Cleanup cached debuginfo if needed */
|
|
|
|
debuginfo_cache__exit();
|
2010-04-12 17:17:42 +00:00
|
|
|
|
|
|
|
return ret;
|
2009-12-01 00:20:17 +00:00
|
|
|
}
|
|
|
|
|
2012-04-16 12:09:09 +00:00
|
|
|
/* List up current perf-probe events */
|
2015-04-24 09:47:50 +00:00
|
|
|
int show_perf_probe_events(struct strfilter *filter)
|
2012-04-16 12:09:09 +00:00
|
|
|
{
|
2014-08-13 16:12:48 +00:00
|
|
|
int kp_fd, up_fd, ret;
|
2012-04-16 12:09:09 +00:00
|
|
|
|
|
|
|
setup_pager();
|
|
|
|
|
2014-02-06 05:32:04 +00:00
|
|
|
ret = init_symbol_maps(false);
|
2012-04-16 12:09:09 +00:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
2015-07-15 09:14:07 +00:00
|
|
|
ret = probe_file__open_both(&kp_fd, &up_fd, 0);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
2012-04-16 12:09:09 +00:00
|
|
|
|
2015-07-15 09:14:07 +00:00
|
|
|
if (kp_fd >= 0)
|
|
|
|
ret = __show_perf_probe_events(kp_fd, true, filter);
|
|
|
|
if (up_fd >= 0 && ret >= 0)
|
2015-04-24 09:47:50 +00:00
|
|
|
ret = __show_perf_probe_events(up_fd, false, filter);
|
2015-07-15 09:14:07 +00:00
|
|
|
if (kp_fd > 0)
|
|
|
|
close(kp_fd);
|
|
|
|
if (up_fd > 0)
|
2014-08-13 16:12:48 +00:00
|
|
|
close(up_fd);
|
2014-02-06 05:32:04 +00:00
|
|
|
exit_symbol_maps();
|
2012-04-16 12:09:09 +00:00
|
|
|
|
2010-04-12 17:17:42 +00:00
|
|
|
return ret;
|
2009-12-01 00:19:58 +00:00
|
|
|
}
|
|
|
|
|
2010-04-12 17:17:42 +00:00
|
|
|
static int get_new_event_name(char *buf, size_t len, const char *base,
|
|
|
|
struct strlist *namelist, bool allow_suffix)
|
2009-12-01 00:20:25 +00:00
|
|
|
{
|
|
|
|
int i, ret;
|
2015-06-12 05:08:20 +00:00
|
|
|
char *p;
|
2009-12-08 22:03:02 +00:00
|
|
|
|
2015-04-28 12:05:34 +00:00
|
|
|
if (*base == '.')
|
|
|
|
base++;
|
|
|
|
|
2009-12-08 22:03:02 +00:00
|
|
|
/* Try no suffix */
|
|
|
|
ret = e_snprintf(buf, len, "%s", base);
|
2010-04-12 17:17:42 +00:00
|
|
|
if (ret < 0) {
|
2014-08-14 02:22:34 +00:00
|
|
|
pr_debug("snprintf() failed: %d\n", ret);
|
2010-04-12 17:17:42 +00:00
|
|
|
return ret;
|
|
|
|
}
|
2015-06-12 05:08:20 +00:00
|
|
|
/* Cut off the postfixes (e.g. .const, .isra)*/
|
|
|
|
p = strchr(buf, '.');
|
|
|
|
if (p && p != buf)
|
|
|
|
*p = '\0';
|
2009-12-08 22:03:02 +00:00
|
|
|
if (!strlist__has_entry(namelist, buf))
|
2010-04-12 17:17:42 +00:00
|
|
|
return 0;
|
2009-12-08 22:03:02 +00:00
|
|
|
|
2009-12-15 15:32:25 +00:00
|
|
|
if (!allow_suffix) {
|
|
|
|
pr_warning("Error: event \"%s\" already exists. "
|
|
|
|
"(Use -f to force duplicates.)\n", base);
|
2010-04-12 17:17:42 +00:00
|
|
|
return -EEXIST;
|
2009-12-15 15:32:25 +00:00
|
|
|
}
|
|
|
|
|
2009-12-08 22:03:02 +00:00
|
|
|
/* Try to add suffix */
|
|
|
|
for (i = 1; i < MAX_EVENT_INDEX; i++) {
|
2009-12-01 00:20:25 +00:00
|
|
|
ret = e_snprintf(buf, len, "%s_%d", base, i);
|
2010-04-12 17:17:42 +00:00
|
|
|
if (ret < 0) {
|
2014-08-14 02:22:34 +00:00
|
|
|
pr_debug("snprintf() failed: %d\n", ret);
|
2010-04-12 17:17:42 +00:00
|
|
|
return ret;
|
|
|
|
}
|
2009-12-01 00:20:25 +00:00
|
|
|
if (!strlist__has_entry(namelist, buf))
|
|
|
|
break;
|
|
|
|
}
|
2010-04-12 17:17:42 +00:00
|
|
|
if (i == MAX_EVENT_INDEX) {
|
|
|
|
pr_warning("Too many events are on the same function.\n");
|
|
|
|
ret = -ERANGE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
2009-12-01 00:20:25 +00:00
|
|
|
}
|
|
|
|
|
2015-02-28 02:53:29 +00:00
|
|
|
/* Warn if the current kernel's uprobe implementation is old */
|
|
|
|
static void warn_uprobe_event_compat(struct probe_trace_event *tev)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
char *buf = synthesize_probe_trace_command(tev);
|
|
|
|
|
|
|
|
/* Old uprobe event doesn't support memory dereference */
|
|
|
|
if (!tev->uprobes || tev->nargs == 0 || !buf)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
for (i = 0; i < tev->nargs; i++)
|
|
|
|
if (strglobmatch(tev->args[i].value, "[$@+-]*")) {
|
|
|
|
pr_warning("Please upgrade your kernel to at least "
|
|
|
|
"3.14 to have access to feature %s\n",
|
|
|
|
tev->args[i].value);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
out:
|
|
|
|
free(buf);
|
|
|
|
}
|
|
|
|
|
2015-07-15 09:14:00 +00:00
|
|
|
/* Set new name from original perf_probe_event and namelist */
|
|
|
|
static int probe_trace_event__set_name(struct probe_trace_event *tev,
|
|
|
|
struct perf_probe_event *pev,
|
|
|
|
struct strlist *namelist,
|
|
|
|
bool allow_suffix)
|
|
|
|
{
|
|
|
|
const char *event, *group;
|
|
|
|
char buf[64];
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (pev->event)
|
|
|
|
event = pev->event;
|
|
|
|
else
|
|
|
|
if (pev->point.function && !strisglob(pev->point.function))
|
|
|
|
event = pev->point.function;
|
|
|
|
else
|
|
|
|
event = tev->point.realname;
|
|
|
|
if (pev->group)
|
|
|
|
group = pev->group;
|
|
|
|
else
|
|
|
|
group = PERFPROBE_GROUP;
|
|
|
|
|
|
|
|
/* Get an unused new event name */
|
|
|
|
ret = get_new_event_name(buf, 64, event,
|
|
|
|
namelist, allow_suffix);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
event = buf;
|
|
|
|
|
|
|
|
tev->event = strdup(event);
|
|
|
|
tev->group = strdup(group);
|
|
|
|
if (tev->event == NULL || tev->group == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
/* Add added event name to namelist */
|
|
|
|
strlist__add(namelist, event);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-07-29 14:13:51 +00:00
|
|
|
static int __add_probe_trace_events(struct perf_probe_event *pev,
|
|
|
|
struct probe_trace_event *tevs,
|
2010-04-12 17:17:42 +00:00
|
|
|
int ntevs, bool allow_suffix)
|
2009-12-01 00:19:58 +00:00
|
|
|
{
|
2010-04-12 17:17:42 +00:00
|
|
|
int i, fd, ret;
|
2010-07-29 14:13:51 +00:00
|
|
|
struct probe_trace_event *tev = NULL;
|
2015-06-16 11:50:57 +00:00
|
|
|
const char *event = NULL, *group = NULL;
|
2009-12-01 00:20:25 +00:00
|
|
|
struct strlist *namelist;
|
2009-12-01 00:19:58 +00:00
|
|
|
|
2015-07-15 09:14:07 +00:00
|
|
|
fd = probe_file__open(PF_FL_RW | (pev->uprobes ? PF_FL_UPROBE : 0));
|
|
|
|
if (fd < 0)
|
2010-04-12 17:17:42 +00:00
|
|
|
return fd;
|
2014-08-13 16:12:48 +00:00
|
|
|
|
2009-12-01 00:20:25 +00:00
|
|
|
/* Get current event names */
|
2015-07-15 09:14:07 +00:00
|
|
|
namelist = probe_file__get_namelist(fd);
|
2010-04-12 17:17:42 +00:00
|
|
|
if (!namelist) {
|
|
|
|
pr_debug("Failed to get current event list.\n");
|
2015-05-06 12:46:40 +00:00
|
|
|
ret = -ENOMEM;
|
|
|
|
goto close_out;
|
2010-04-12 17:17:42 +00:00
|
|
|
}
|
2010-03-16 22:06:12 +00:00
|
|
|
|
2010-04-12 17:17:42 +00:00
|
|
|
ret = 0;
|
2014-10-27 20:31:31 +00:00
|
|
|
pr_info("Added new event%s\n", (ntevs > 1) ? "s:" : ":");
|
2010-04-12 17:17:56 +00:00
|
|
|
for (i = 0; i < ntevs; i++) {
|
2010-03-16 22:06:12 +00:00
|
|
|
tev = &tevs[i];
|
2015-06-16 11:50:55 +00:00
|
|
|
/* Skip if the symbol is out of .text or blacklisted */
|
2015-05-06 12:46:49 +00:00
|
|
|
if (!tev->point.symbol)
|
|
|
|
continue;
|
2015-02-19 14:31:13 +00:00
|
|
|
|
2015-07-15 09:14:00 +00:00
|
|
|
/* Set new name for tev (and update namelist) */
|
|
|
|
ret = probe_trace_event__set_name(tev, pev, namelist,
|
|
|
|
allow_suffix);
|
2010-04-12 17:17:42 +00:00
|
|
|
if (ret < 0)
|
|
|
|
break;
|
2010-03-16 22:06:12 +00:00
|
|
|
|
2015-07-15 09:14:07 +00:00
|
|
|
ret = probe_file__add_event(fd, tev);
|
2010-04-12 17:17:42 +00:00
|
|
|
if (ret < 0)
|
|
|
|
break;
|
2010-03-16 22:06:12 +00:00
|
|
|
|
2015-06-16 11:50:57 +00:00
|
|
|
/* We use tev's name for showing new events */
|
|
|
|
show_perf_probe_event(tev->group, tev->event, pev,
|
|
|
|
tev->point.module, false);
|
|
|
|
/* Save the last valid name */
|
|
|
|
event = tev->event;
|
|
|
|
group = tev->group;
|
2010-03-16 22:06:12 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Probes after the first probe which comes from same
|
|
|
|
* user input are always allowed to add suffix, because
|
|
|
|
* there might be several addresses corresponding to
|
|
|
|
* one code line.
|
|
|
|
*/
|
|
|
|
allow_suffix = true;
|
2009-12-01 00:19:58 +00:00
|
|
|
}
|
2015-02-28 02:53:29 +00:00
|
|
|
if (ret == -EINVAL && pev->uprobes)
|
|
|
|
warn_uprobe_event_compat(tev);
|
2010-04-12 17:17:42 +00:00
|
|
|
|
2015-02-19 14:31:13 +00:00
|
|
|
/* Note that it is possible to skip all events because of blacklist */
|
2015-06-16 11:50:57 +00:00
|
|
|
if (ret >= 0 && event) {
|
2010-04-12 17:17:42 +00:00
|
|
|
/* Show how to use the event. */
|
2014-10-27 20:31:31 +00:00
|
|
|
pr_info("\nYou can now use it in all perf tools, such as:\n\n");
|
2015-06-16 11:50:57 +00:00
|
|
|
pr_info("\tperf record -e %s:%s -aR sleep 1\n\n", group, event);
|
2010-04-12 17:17:42 +00:00
|
|
|
}
|
2009-12-08 22:02:47 +00:00
|
|
|
|
2009-12-07 17:00:46 +00:00
|
|
|
strlist__delete(namelist);
|
2015-05-06 12:46:40 +00:00
|
|
|
close_out:
|
2009-12-01 00:19:58 +00:00
|
|
|
close(fd);
|
2010-04-12 17:17:42 +00:00
|
|
|
return ret;
|
2009-12-01 00:19:58 +00:00
|
|
|
}
|
2009-12-08 22:03:23 +00:00
|
|
|
|
2015-05-29 09:45:47 +00:00
|
|
|
static int find_probe_functions(struct map *map, char *name,
|
|
|
|
struct symbol **syms)
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
{
|
2015-01-14 11:18:07 +00:00
|
|
|
int found = 0;
|
2015-01-16 19:40:25 +00:00
|
|
|
struct symbol *sym;
|
2015-05-08 01:03:35 +00:00
|
|
|
struct rb_node *tmp;
|
2015-01-14 11:18:07 +00:00
|
|
|
|
2015-05-15 12:14:44 +00:00
|
|
|
if (map__load(map, NULL) < 0)
|
|
|
|
return 0;
|
|
|
|
|
2015-05-08 01:03:35 +00:00
|
|
|
map__for_each_symbol(map, sym, tmp) {
|
2015-05-29 09:45:47 +00:00
|
|
|
if (strglobmatch(sym->name, name)) {
|
2015-05-08 01:03:35 +00:00
|
|
|
found++;
|
2015-05-29 09:45:47 +00:00
|
|
|
if (syms && found < probe_conf.max_probes)
|
|
|
|
syms[found - 1] = sym;
|
|
|
|
}
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
}
|
2015-01-14 11:18:07 +00:00
|
|
|
|
|
|
|
return found;
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#define strdup_or_goto(str, label) \
|
|
|
|
({ char *__p = strdup(str); if (!__p) goto label; __p; })
|
|
|
|
|
2015-04-28 12:05:40 +00:00
|
|
|
void __weak arch__fix_tev_from_maps(struct perf_probe_event *pev __maybe_unused,
|
|
|
|
struct probe_trace_event *tev __maybe_unused,
|
|
|
|
struct map *map __maybe_unused) { }
|
|
|
|
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
/*
|
|
|
|
* Find probe function addresses from map.
|
|
|
|
* Return an error or the number of found probe_trace_event
|
|
|
|
*/
|
|
|
|
static int find_probe_trace_events_from_map(struct perf_probe_event *pev,
|
2015-05-08 01:03:31 +00:00
|
|
|
struct probe_trace_event **tevs)
|
2010-03-16 22:05:37 +00:00
|
|
|
{
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
struct map *map = NULL;
|
|
|
|
struct ref_reloc_sym *reloc_sym = NULL;
|
2010-03-16 22:05:37 +00:00
|
|
|
struct symbol *sym;
|
2015-05-29 09:45:47 +00:00
|
|
|
struct symbol **syms = NULL;
|
2010-07-29 14:13:51 +00:00
|
|
|
struct probe_trace_event *tev;
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
struct perf_probe_point *pp = &pev->point;
|
|
|
|
struct probe_trace_point *tp;
|
2015-01-14 11:18:07 +00:00
|
|
|
int num_matched_functions;
|
2015-06-16 11:50:55 +00:00
|
|
|
int ret, i, j, skipped = 0;
|
2010-03-16 22:06:12 +00:00
|
|
|
|
2015-05-08 01:03:28 +00:00
|
|
|
map = get_target_map(pev->target, pev->uprobes);
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
if (!map) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
perf probe: Support basic dwarf-based operations on uprobe events
Support basic dwarf(debuginfo) based operations for uprobe events. With
this change, perf probe can analyze debuginfo of user application binary
to set up new uprobe event.
This allows perf-probe --add(with local variables, line numbers) and
--line works with -x option. (Actually, --vars has already accepted -x
option)
For example, the following command shows the probe-able lines of a given
user space function. Something that so far was only available in the
'perf probe' tool for kernel space functions:
# ./perf probe -x perf --line map__load
<map__load@/home/fedora/ksrc/linux-2.6/tools/perf/util/map.c:0>
0 int map__load(struct map *map, symbol_filter_t filter)
1 {
2 const char *name = map->dso->long_name;
int nr;
5 if (dso__loaded(map->dso, map->type))
6 return 0;
8 nr = dso__load(map->dso, map, filter);
9 if (nr < 0) {
10 if (map->dso->has_build_id) {
And this shows the available variables at the given line of the
function.
# ./perf probe -x perf --vars map__load:8
Available variables at map__load:8
@<map__load+96>
char* name
struct map* map
symbol_filter_t filter
@<map__find_symbol+112>
char* name
symbol_filter_t filter
@<map__find_symbol_by_name+136>
char* name
symbol_filter_t filter
@<map_groups__find_symbol_by_name+176>
char* name
struct map* map
symbol_filter_t filter
And lastly, we can now define probe(s) with all available
variables on the given line:
# ./perf probe -x perf --add 'map__load:8 $vars'
Added new events:
probe_perf:map__load (on map__load:8 with $vars)
probe_perf:map__load_1 (on map__load:8 with $vars)
probe_perf:map__load_2 (on map__load:8 with $vars)
probe_perf:map__load_3 (on map__load:8 with $vars)
You can now use it in all perf tools, such as:
perf record -e probe_perf:map__load_3 -aR sleep 1
Changes from previous version:
- Add examples in the patch description.
- Use .text section start address and dwarf symbol address
for calculating the offset of given symbol, instead of
searching the symbol in symtab again.
With this change, we can safely handle multiple local
function instances (e.g. scnprintf in perf).
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: David A. Long <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: systemtap@sourceware.org
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20131226054152.22364.47021.stgit@kbuild-fedora.novalocal
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2013-12-26 05:41:53 +00:00
|
|
|
}
|
|
|
|
|
2015-05-29 09:45:47 +00:00
|
|
|
syms = malloc(sizeof(struct symbol *) * probe_conf.max_probes);
|
|
|
|
if (!syms) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
/*
|
|
|
|
* Load matched symbols: Since the different local symbols may have
|
|
|
|
* same name but different addresses, this lists all the symbols.
|
|
|
|
*/
|
2015-05-29 09:45:47 +00:00
|
|
|
num_matched_functions = find_probe_functions(map, pp->function, syms);
|
2015-01-14 11:18:07 +00:00
|
|
|
if (num_matched_functions == 0) {
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
pr_err("Failed to find symbol %s in %s\n", pp->function,
|
2015-05-08 01:03:28 +00:00
|
|
|
pev->target ? : "kernel");
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
ret = -ENOENT;
|
|
|
|
goto out;
|
2015-05-08 01:03:31 +00:00
|
|
|
} else if (num_matched_functions > probe_conf.max_probes) {
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
pr_err("Too many functions matched in %s\n",
|
2015-05-08 01:03:28 +00:00
|
|
|
pev->target ? : "kernel");
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
ret = -E2BIG;
|
|
|
|
goto out;
|
perf probe: Support basic dwarf-based operations on uprobe events
Support basic dwarf(debuginfo) based operations for uprobe events. With
this change, perf probe can analyze debuginfo of user application binary
to set up new uprobe event.
This allows perf-probe --add(with local variables, line numbers) and
--line works with -x option. (Actually, --vars has already accepted -x
option)
For example, the following command shows the probe-able lines of a given
user space function. Something that so far was only available in the
'perf probe' tool for kernel space functions:
# ./perf probe -x perf --line map__load
<map__load@/home/fedora/ksrc/linux-2.6/tools/perf/util/map.c:0>
0 int map__load(struct map *map, symbol_filter_t filter)
1 {
2 const char *name = map->dso->long_name;
int nr;
5 if (dso__loaded(map->dso, map->type))
6 return 0;
8 nr = dso__load(map->dso, map, filter);
9 if (nr < 0) {
10 if (map->dso->has_build_id) {
And this shows the available variables at the given line of the
function.
# ./perf probe -x perf --vars map__load:8
Available variables at map__load:8
@<map__load+96>
char* name
struct map* map
symbol_filter_t filter
@<map__find_symbol+112>
char* name
symbol_filter_t filter
@<map__find_symbol_by_name+136>
char* name
symbol_filter_t filter
@<map_groups__find_symbol_by_name+176>
char* name
struct map* map
symbol_filter_t filter
And lastly, we can now define probe(s) with all available
variables on the given line:
# ./perf probe -x perf --add 'map__load:8 $vars'
Added new events:
probe_perf:map__load (on map__load:8 with $vars)
probe_perf:map__load_1 (on map__load:8 with $vars)
probe_perf:map__load_2 (on map__load:8 with $vars)
probe_perf:map__load_3 (on map__load:8 with $vars)
You can now use it in all perf tools, such as:
perf record -e probe_perf:map__load_3 -aR sleep 1
Changes from previous version:
- Add examples in the patch description.
- Use .text section start address and dwarf symbol address
for calculating the offset of given symbol, instead of
searching the symbol in symtab again.
With this change, we can safely handle multiple local
function instances (e.g. scnprintf in perf).
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: David A. Long <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: systemtap@sourceware.org
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20131226054152.22364.47021.stgit@kbuild-fedora.novalocal
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2013-12-26 05:41:53 +00:00
|
|
|
}
|
|
|
|
|
2015-01-14 11:18:08 +00:00
|
|
|
if (!pev->uprobes && !pp->retprobe) {
|
2015-03-20 01:56:56 +00:00
|
|
|
reloc_sym = kernel_get_ref_reloc_sym();
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
if (!reloc_sym) {
|
|
|
|
pr_warning("Relocated base symbol is not found!\n");
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
2010-03-16 22:06:12 +00:00
|
|
|
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
/* Setup result trace-probe-events */
|
|
|
|
*tevs = zalloc(sizeof(*tev) * num_matched_functions);
|
|
|
|
if (!*tevs) {
|
2010-04-12 17:17:56 +00:00
|
|
|
ret = -ENOMEM;
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
goto out;
|
2010-04-12 17:17:56 +00:00
|
|
|
}
|
2011-07-25 14:08:08 +00:00
|
|
|
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
ret = 0;
|
2015-01-14 11:18:07 +00:00
|
|
|
|
2015-05-29 09:45:47 +00:00
|
|
|
for (j = 0; j < num_matched_functions; j++) {
|
|
|
|
sym = syms[j];
|
|
|
|
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
tev = (*tevs) + ret;
|
|
|
|
tp = &tev->point;
|
|
|
|
if (ret == num_matched_functions) {
|
|
|
|
pr_warning("Too many symbols are listed. Skip it.\n");
|
|
|
|
break;
|
2011-07-25 14:08:08 +00:00
|
|
|
}
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
ret++;
|
2011-07-25 14:08:08 +00:00
|
|
|
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
if (pp->offset > sym->end - sym->start) {
|
|
|
|
pr_warning("Offset %ld is bigger than the size of %s\n",
|
|
|
|
pp->offset, sym->name);
|
|
|
|
ret = -ENOENT;
|
|
|
|
goto err_out;
|
|
|
|
}
|
|
|
|
/* Add one probe point */
|
|
|
|
tp->address = map->unmap_ip(map, sym->start) + pp->offset;
|
2015-06-16 11:50:55 +00:00
|
|
|
/* If we found a wrong one, mark it by NULL symbol */
|
|
|
|
if (!pev->uprobes &&
|
|
|
|
kprobe_warn_out_range(sym->name, tp->address)) {
|
|
|
|
tp->symbol = NULL; /* Skip it */
|
|
|
|
skipped++;
|
|
|
|
} else if (reloc_sym) {
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
tp->symbol = strdup_or_goto(reloc_sym->name, nomem_out);
|
|
|
|
tp->offset = tp->address - reloc_sym->addr;
|
|
|
|
} else {
|
|
|
|
tp->symbol = strdup_or_goto(sym->name, nomem_out);
|
|
|
|
tp->offset = pp->offset;
|
|
|
|
}
|
2015-05-29 09:45:47 +00:00
|
|
|
tp->realname = strdup_or_goto(sym->name, nomem_out);
|
|
|
|
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
tp->retprobe = pp->retprobe;
|
2015-05-08 01:03:28 +00:00
|
|
|
if (pev->target)
|
|
|
|
tev->point.module = strdup_or_goto(pev->target,
|
|
|
|
nomem_out);
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
tev->uprobes = pev->uprobes;
|
|
|
|
tev->nargs = pev->nargs;
|
|
|
|
if (tev->nargs) {
|
|
|
|
tev->args = zalloc(sizeof(struct probe_trace_arg) *
|
|
|
|
tev->nargs);
|
|
|
|
if (tev->args == NULL)
|
|
|
|
goto nomem_out;
|
2010-04-12 17:17:49 +00:00
|
|
|
}
|
2010-04-12 17:16:53 +00:00
|
|
|
for (i = 0; i < tev->nargs; i++) {
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
if (pev->args[i].name)
|
|
|
|
tev->args[i].name =
|
|
|
|
strdup_or_goto(pev->args[i].name,
|
|
|
|
nomem_out);
|
|
|
|
|
|
|
|
tev->args[i].value = strdup_or_goto(pev->args[i].var,
|
|
|
|
nomem_out);
|
|
|
|
if (pev->args[i].type)
|
|
|
|
tev->args[i].type =
|
|
|
|
strdup_or_goto(pev->args[i].type,
|
|
|
|
nomem_out);
|
2010-04-12 17:16:53 +00:00
|
|
|
}
|
2015-04-28 12:05:40 +00:00
|
|
|
arch__fix_tev_from_maps(pev, tev, map);
|
2010-03-16 22:06:12 +00:00
|
|
|
}
|
2015-06-16 11:50:55 +00:00
|
|
|
if (ret == skipped) {
|
|
|
|
ret = -ENOENT;
|
|
|
|
goto err_out;
|
|
|
|
}
|
2010-03-16 22:06:12 +00:00
|
|
|
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
out:
|
perf probe: Fix to handle aliased symbols in glibc
Fix perf probe to handle aliased symbols correctly in glibc. In the
glibc, several symbols are defined as an alias of __libc_XXX, e.g.
malloc is an alias of __libc_malloc.
In such cases, dwarf has no subroutine instances of the alias functions
(e.g. no "malloc" instance), but the map has that symbol and its
address.
Thus, if we search the alieased symbol in debuginfo, we always fail to
find it, but it is in the map.
To solve this problem, this fails back to address-based alternative
search, which searches the symbol in the map, translates its address to
alternative (correct) function name by using debuginfo, and retry to
find the alternative function point from debuginfo.
This adds fail-back process to --vars, --lines and --add options. So,
now you can use those on malloc@libc :)
Without this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Failed to find the address of malloc
Error: Failed to show vars.
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Probe point 'malloc' not found in debuginfo.
Error: Failed to add events.
-----
With this patch;
-----
# ./perf probe -x /usr/lib64/libc-2.17.so -V malloc
Available variables at malloc
@<__libc_malloc+0>
size_t bytes
# ./perf probe -x /usr/lib64/libc-2.17.so -a "malloc bytes"
Added new event:
probe_libc:malloc (on malloc in /usr/lib64/libc-2.17.so with bytes)
You can now use it in all perf tools, such as:
perf record -e probe_libc:malloc -aR sleep 1
-----
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150306073120.6904.13779.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-03-06 07:31:20 +00:00
|
|
|
put_target_map(map, pev->uprobes);
|
2015-05-29 09:45:47 +00:00
|
|
|
free(syms);
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
return ret;
|
2012-04-16 12:09:09 +00:00
|
|
|
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
nomem_out:
|
|
|
|
ret = -ENOMEM;
|
|
|
|
err_out:
|
|
|
|
clear_probe_trace_events(*tevs, num_matched_functions);
|
|
|
|
zfree(tevs);
|
|
|
|
goto out;
|
|
|
|
}
|
2012-02-28 04:13:01 +00:00
|
|
|
|
2015-04-28 12:05:39 +00:00
|
|
|
bool __weak arch__prefers_symtab(void) { return false; }
|
|
|
|
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
static int convert_to_probe_trace_events(struct perf_probe_event *pev,
|
2015-05-08 01:03:31 +00:00
|
|
|
struct probe_trace_event **tevs)
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (pev->uprobes && !pev->group) {
|
|
|
|
/* Replace group name if not given */
|
2015-05-08 01:03:28 +00:00
|
|
|
ret = convert_exec_to_group(pev->target, &pev->group);
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
if (ret != 0) {
|
|
|
|
pr_warning("Failed to make a group name.\n");
|
|
|
|
return ret;
|
|
|
|
}
|
2010-04-12 17:17:56 +00:00
|
|
|
}
|
2010-04-12 17:17:49 +00:00
|
|
|
|
2015-04-28 12:05:39 +00:00
|
|
|
if (arch__prefers_symtab() && !perf_probe_event_need_dwarf(pev)) {
|
2015-05-08 01:03:31 +00:00
|
|
|
ret = find_probe_trace_events_from_map(pev, tevs);
|
2015-04-28 12:05:39 +00:00
|
|
|
if (ret > 0)
|
|
|
|
return ret; /* Found in symbol table */
|
|
|
|
}
|
|
|
|
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
/* Convert perf_probe_event with debuginfo */
|
2015-05-08 01:03:31 +00:00
|
|
|
ret = try_to_find_probe_trace_events(pev, tevs);
|
perf probe: Allow to add events on the local functions
Allow to add events on the local functions without debuginfo.
(With the debuginfo, we can add events even on inlined functions)
Currently, probing on local functions requires debuginfo to
locate actual address. It is also possible without debuginfo since
we have symbol maps.
Without this change;
----
# ./perf probe -a t_show
Added new event:
probe:t_show (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
no symbols found in /kbuild/ksrc/linux-3/tools/perf/perf, maybe install a debug package?
Failed to load map.
Error: Failed to add events. (-22)
----
As the above results, perf probe just put one event
on the first found symbol for kprobe event. Moreover,
for uprobe event, perf probe failed to find local
functions.
With this change;
----
# ./perf probe -a t_show
Added new events:
probe:t_show (on t_show)
probe:t_show_1 (on t_show)
probe:t_show_2 (on t_show)
probe:t_show_3 (on t_show)
You can now use it in all perf tools, such as:
perf record -e probe:t_show_3 -aR sleep 1
# ./perf probe -x perf -a identity__map_ip
Added new events:
probe_perf:identity__map_ip (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_1 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_2 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
probe_perf:identity__map_ip_3 (on identity__map_ip in /kbuild/ksrc/linux-3/tools/perf/perf)
You can now use it in all perf tools, such as:
perf record -e probe_perf:identity__map_ip_3 -aR sleep 1
----
Now we succeed to put events on every given local functions
for both kprobes and uprobes. :)
Note that this also introduces some symbol rbtree
iteration macros; symbols__for_each, dso__for_each_symbol,
and map__for_each_symbol. These are for walking through
the symbol list in a map.
Changes from v2:
- Fix add_exec_to_probe_trace_events() not to convert address
to tp->symbol any more.
- Fix to set kernel probes based on ref_reloc_sym.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053225.29635.15026.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-02-06 05:32:25 +00:00
|
|
|
if (ret != 0)
|
|
|
|
return ret; /* Found in debuginfo or got an error */
|
|
|
|
|
2015-05-08 01:03:31 +00:00
|
|
|
return find_probe_trace_events_from_map(pev, tevs);
|
2010-03-16 22:06:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
struct __event_package {
|
|
|
|
struct perf_probe_event *pev;
|
2010-07-29 14:13:51 +00:00
|
|
|
struct probe_trace_event *tevs;
|
2010-03-16 22:06:12 +00:00
|
|
|
int ntevs;
|
|
|
|
};
|
|
|
|
|
2015-05-08 01:03:31 +00:00
|
|
|
int add_perf_probe_events(struct perf_probe_event *pevs, int npevs)
|
2010-03-16 22:06:12 +00:00
|
|
|
{
|
2010-04-12 17:17:42 +00:00
|
|
|
int i, j, ret;
|
2010-03-16 22:06:12 +00:00
|
|
|
struct __event_package *pkgs;
|
|
|
|
|
2012-04-16 12:09:09 +00:00
|
|
|
ret = 0;
|
2010-04-12 17:17:49 +00:00
|
|
|
pkgs = zalloc(sizeof(struct __event_package) * npevs);
|
2012-04-16 12:09:09 +00:00
|
|
|
|
2010-04-12 17:17:49 +00:00
|
|
|
if (pkgs == NULL)
|
|
|
|
return -ENOMEM;
|
2010-03-16 22:06:12 +00:00
|
|
|
|
2014-02-06 05:32:04 +00:00
|
|
|
ret = init_symbol_maps(pevs->uprobes);
|
2010-08-03 02:11:40 +00:00
|
|
|
if (ret < 0) {
|
|
|
|
free(pkgs);
|
2010-04-12 17:17:42 +00:00
|
|
|
return ret;
|
2010-08-03 02:11:40 +00:00
|
|
|
}
|
2010-03-16 22:06:12 +00:00
|
|
|
|
|
|
|
/* Loop 1: convert all events */
|
|
|
|
for (i = 0; i < npevs; i++) {
|
|
|
|
pkgs[i].pev = &pevs[i];
|
2015-06-16 11:50:55 +00:00
|
|
|
/* Init kprobe blacklist if needed */
|
|
|
|
if (!pkgs[i].pev->uprobes)
|
|
|
|
kprobe_blacklist__init();
|
2010-03-16 22:06:12 +00:00
|
|
|
/* Convert with or without debuginfo */
|
2010-07-29 14:13:51 +00:00
|
|
|
ret = convert_to_probe_trace_events(pkgs[i].pev,
|
2015-05-08 01:03:31 +00:00
|
|
|
&pkgs[i].tevs);
|
2010-04-12 17:17:42 +00:00
|
|
|
if (ret < 0)
|
|
|
|
goto end;
|
|
|
|
pkgs[i].ntevs = ret;
|
2010-03-16 22:05:37 +00:00
|
|
|
}
|
2015-06-16 11:50:55 +00:00
|
|
|
/* This just release blacklist only if allocated */
|
|
|
|
kprobe_blacklist__release();
|
2010-03-16 22:05:37 +00:00
|
|
|
|
2010-03-16 22:06:12 +00:00
|
|
|
/* Loop 2: add all events */
|
2011-02-22 09:56:18 +00:00
|
|
|
for (i = 0; i < npevs; i++) {
|
2010-07-29 14:13:51 +00:00
|
|
|
ret = __add_probe_trace_events(pkgs[i].pev, pkgs[i].tevs,
|
2015-05-08 01:03:31 +00:00
|
|
|
pkgs[i].ntevs,
|
|
|
|
probe_conf.force_add);
|
2011-02-21 16:23:57 +00:00
|
|
|
if (ret < 0)
|
|
|
|
break;
|
|
|
|
}
|
2010-04-12 17:17:42 +00:00
|
|
|
end:
|
2010-08-03 02:11:40 +00:00
|
|
|
/* Loop 3: cleanup and free trace events */
|
|
|
|
for (i = 0; i < npevs; i++) {
|
2010-04-12 17:17:42 +00:00
|
|
|
for (j = 0; j < pkgs[i].ntevs; j++)
|
2010-07-29 14:13:51 +00:00
|
|
|
clear_probe_trace_event(&pkgs[i].tevs[j]);
|
2013-12-27 19:55:14 +00:00
|
|
|
zfree(&pkgs[i].tevs);
|
2010-08-03 02:11:40 +00:00
|
|
|
}
|
|
|
|
free(pkgs);
|
2014-02-06 05:32:04 +00:00
|
|
|
exit_symbol_maps();
|
2010-04-12 17:17:42 +00:00
|
|
|
|
|
|
|
return ret;
|
2010-03-16 22:05:37 +00:00
|
|
|
}
|
|
|
|
|
2015-05-05 02:29:48 +00:00
|
|
|
int del_perf_probe_events(struct strfilter *filter)
|
2009-12-08 22:03:23 +00:00
|
|
|
{
|
2015-05-05 02:29:48 +00:00
|
|
|
int ret, ret2, ufd = -1, kfd = -1;
|
|
|
|
char *str = strfilter__string(filter);
|
|
|
|
|
|
|
|
if (!str)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
pr_debug("Delete filter: \'%s\'\n", str);
|
2010-04-12 17:17:42 +00:00
|
|
|
|
2009-12-08 22:03:23 +00:00
|
|
|
/* Get current event names */
|
2015-07-15 09:14:07 +00:00
|
|
|
ret = probe_file__open_both(&kfd, &ufd, PF_FL_RW);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out;
|
2014-08-13 16:12:50 +00:00
|
|
|
|
2015-07-15 09:14:07 +00:00
|
|
|
ret = probe_file__del_events(kfd, filter);
|
2015-05-05 02:29:48 +00:00
|
|
|
if (ret < 0 && ret != -ENOENT)
|
2012-04-16 12:09:09 +00:00
|
|
|
goto error;
|
|
|
|
|
2015-07-15 09:14:07 +00:00
|
|
|
ret2 = probe_file__del_events(ufd, filter);
|
2015-05-27 08:37:25 +00:00
|
|
|
if (ret2 < 0 && ret2 != -ENOENT) {
|
2015-05-05 02:29:48 +00:00
|
|
|
ret = ret2;
|
2015-05-27 08:37:25 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (ret == -ENOENT && ret2 == -ENOENT)
|
2015-05-05 02:29:48 +00:00
|
|
|
pr_debug("\"%s\" does not hit any event.\n", str);
|
|
|
|
/* Note that this is silently ignored */
|
2015-05-27 08:37:25 +00:00
|
|
|
ret = 0;
|
2012-04-16 12:09:09 +00:00
|
|
|
|
|
|
|
error:
|
2015-07-15 09:14:07 +00:00
|
|
|
if (kfd >= 0)
|
2012-04-16 12:09:09 +00:00
|
|
|
close(kfd);
|
2015-07-15 09:14:07 +00:00
|
|
|
if (ufd >= 0)
|
2012-04-16 12:09:09 +00:00
|
|
|
close(ufd);
|
2015-07-15 09:14:07 +00:00
|
|
|
out:
|
2015-05-05 02:29:48 +00:00
|
|
|
free(str);
|
2010-04-12 17:17:42 +00:00
|
|
|
|
|
|
|
return ret;
|
2009-12-08 22:03:23 +00:00
|
|
|
}
|
2012-04-16 12:09:09 +00:00
|
|
|
|
2011-01-20 14:15:45 +00:00
|
|
|
/* TODO: don't use a global variable for filter ... */
|
|
|
|
static struct strfilter *available_func_filter;
|
2009-12-08 22:03:23 +00:00
|
|
|
|
2011-01-13 12:46:11 +00:00
|
|
|
/*
|
2011-01-20 14:15:45 +00:00
|
|
|
* If a symbol corresponds to a function with global binding and
|
|
|
|
* matches filter return 0. For all others return 1.
|
2011-01-13 12:46:11 +00:00
|
|
|
*/
|
2012-09-10 22:15:03 +00:00
|
|
|
static int filter_available_functions(struct map *map __maybe_unused,
|
2011-01-20 14:15:45 +00:00
|
|
|
struct symbol *sym)
|
2011-01-13 12:46:11 +00:00
|
|
|
{
|
2015-03-06 07:31:29 +00:00
|
|
|
if (strfilter__compare(available_func_filter, sym->name))
|
2011-01-20 14:15:45 +00:00
|
|
|
return 0;
|
|
|
|
return 1;
|
2011-01-13 12:46:11 +00:00
|
|
|
}
|
|
|
|
|
2014-02-06 05:32:11 +00:00
|
|
|
int show_available_funcs(const char *target, struct strfilter *_filter,
|
|
|
|
bool user)
|
2011-01-13 12:46:11 +00:00
|
|
|
{
|
|
|
|
struct map *map;
|
|
|
|
int ret;
|
|
|
|
|
2014-02-06 05:32:11 +00:00
|
|
|
ret = init_symbol_maps(user);
|
2011-01-13 12:46:11 +00:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
2014-02-06 05:32:11 +00:00
|
|
|
/* Get a symbol map */
|
|
|
|
if (user)
|
|
|
|
map = dso__new_map(target);
|
|
|
|
else
|
|
|
|
map = kernel_get_module_map(target);
|
2011-01-13 12:46:11 +00:00
|
|
|
if (!map) {
|
2014-02-06 05:32:11 +00:00
|
|
|
pr_err("Failed to get a map for %s\n", (target) ? : "kernel");
|
2011-01-13 12:46:11 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
2012-04-16 12:09:09 +00:00
|
|
|
|
2014-02-06 05:32:11 +00:00
|
|
|
/* Load symbols with given filter */
|
2011-01-20 14:15:45 +00:00
|
|
|
available_func_filter = _filter;
|
2014-02-06 05:32:11 +00:00
|
|
|
if (map__load(map, filter_available_functions)) {
|
|
|
|
pr_err("Failed to load symbols in %s\n", (target) ? : "kernel");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (!dso__sorted_by_name(map->dso, map->type))
|
|
|
|
dso__sort_by_name(map->dso, map->type);
|
2012-04-16 12:09:09 +00:00
|
|
|
|
2014-02-06 05:32:11 +00:00
|
|
|
/* Show all (filtered) symbols */
|
|
|
|
setup_pager();
|
|
|
|
dso__fprintf_symbols_by_name(map->dso, map->type, stdout);
|
|
|
|
end:
|
|
|
|
if (user) {
|
2015-05-25 19:59:56 +00:00
|
|
|
map__put(map);
|
2014-02-06 05:32:11 +00:00
|
|
|
}
|
|
|
|
exit_symbol_maps();
|
2012-04-16 12:09:09 +00:00
|
|
|
|
2014-02-06 05:32:11 +00:00
|
|
|
return ret;
|
2012-04-16 12:09:09 +00:00
|
|
|
}
|
|
|
|
|