lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core

Browse Source
This commit is contained in:
Ingo Molnar
2010-04-15 09:16:51 +02:00
parent 84b13fd596 f6c903f585
commit b5a80b7e91
12 changed files with 1634 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/trace/kprobetrace.txt
View File

@@ -40,7 +40,9 @@ Synopsis of kprobe_events
$stack : Fetch stack address. $stack : Fetch stack address.
$retval : Fetch return value.(*) $retval : Fetch return value.(*)
+|-offs(FETCHARG) : Fetch memory at FETCHARG +|- offs address.(**) +|-offs(FETCHARG) : Fetch memory at FETCHARG +|- offs address.(**)
NAME=FETCHARG: Set NAME as the argument name of FETCHARG. NAME=FETCHARG : Set NAME as the argument name of FETCHARG.
FETCHARG:TYPE : Set TYPE as the type of FETCHARG. Currently, basic types
(u8/u16/u32/u64/s8/s16/s32/s64) are supported.
(*) only for return probe. (*) only for return probe.
(**) this is useful for fetching a field of data structures. (**) this is useful for fetching a field of data structures.

16
kernel/trace/trace.h
View File

@@ -102,29 +102,17 @@ struct syscall_trace_exit {
long ret; long ret;
}; };
struct kprobe_trace_entry { struct kprobe_trace_entry_head {
struct trace_entry ent; struct trace_entry ent;
unsigned long ip; unsigned long ip;
int nargs;
unsigned long args[];
}; };
#define SIZEOF_KPROBE_TRACE_ENTRY(n) \ struct kretprobe_trace_entry_head {
(offsetof(struct kprobe_trace_entry, args) + \
(sizeof(unsigned long) * (n)))
struct kretprobe_trace_entry {
struct trace_entry ent; struct trace_entry ent;
unsigned long func; unsigned long func;
unsigned long ret_ip; unsigned long ret_ip;
int nargs;
unsigned long args[];
}; };
#define SIZEOF_KRETPROBE_TRACE_ENTRY(n) \
(offsetof(struct kretprobe_trace_entry, args) + \
(sizeof(unsigned long) * (n)))
/* /*
* trace_flag_type is an enumeration that holds different * trace_flag_type is an enumeration that holds different
* states when a trace occurs. These are: * states when a trace occurs. These are:

531
kernel/trace/trace_kprobe.c
View File

@@ -29,6 +29,8 @@
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/perf_event.h> #include <linux/perf_event.h>
#include <linux/stringify.h>
#include <asm/bitsperlong.h>
#include "trace.h" #include "trace.h"
#include "trace_output.h" #include "trace_output.h"
@@ -40,7 +42,6 @@
/* Reserved field names */ /* Reserved field names */
#define FIELD_STRING_IP "__probe_ip" #define FIELD_STRING_IP "__probe_ip"
#define FIELD_STRING_NARGS "__probe_nargs"
#define FIELD_STRING_RETIP "__probe_ret_ip" #define FIELD_STRING_RETIP "__probe_ret_ip"
#define FIELD_STRING_FUNC "__probe_func" #define FIELD_STRING_FUNC "__probe_func"
@@ -52,56 +53,102 @@ const char *reserved_field_names[] = {
"common_tgid", "common_tgid",
"common_lock_depth", "common_lock_depth",
FIELD_STRING_IP, FIELD_STRING_IP,
FIELD_STRING_NARGS,
FIELD_STRING_RETIP, FIELD_STRING_RETIP,
FIELD_STRING_FUNC, FIELD_STRING_FUNC,
}; };
struct fetch_func { /* Printing function type */
unsigned long (*func)(struct pt_regs *, void *); typedef int (*print_type_func_t)(struct trace_seq *, const char *, void *);
#define PRINT_TYPE_FUNC_NAME(type) print_type_##type
#define PRINT_TYPE_FMT_NAME(type) print_type_format_##type
/* Printing in basic type function template */
#define DEFINE_BASIC_PRINT_TYPE_FUNC(type, fmt, cast) \
static __kprobes int PRINT_TYPE_FUNC_NAME(type)(struct trace_seq *s, \
const char *name, void *data)\
{ \
return trace_seq_printf(s, " %s=" fmt, name, (cast)*(type *)data);\
} \
static const char PRINT_TYPE_FMT_NAME(type)[] = fmt;
DEFINE_BASIC_PRINT_TYPE_FUNC(u8, "%x", unsigned int)
DEFINE_BASIC_PRINT_TYPE_FUNC(u16, "%x", unsigned int)
DEFINE_BASIC_PRINT_TYPE_FUNC(u32, "%lx", unsigned long)
DEFINE_BASIC_PRINT_TYPE_FUNC(u64, "%llx", unsigned long long)
DEFINE_BASIC_PRINT_TYPE_FUNC(s8, "%d", int)
DEFINE_BASIC_PRINT_TYPE_FUNC(s16, "%d", int)
DEFINE_BASIC_PRINT_TYPE_FUNC(s32, "%ld", long)
DEFINE_BASIC_PRINT_TYPE_FUNC(s64, "%lld", long long)
/* Data fetch function type */
typedef void (*fetch_func_t)(struct pt_regs *, void *, void *);
struct fetch_param {
fetch_func_t fn;
void *data; void *data;
}; };
static __kprobes unsigned long call_fetch(struct fetch_func *f, static __kprobes void call_fetch(struct fetch_param *fprm,
struct pt_regs *regs) struct pt_regs *regs, void *dest)
{ {
return f->func(regs, f->data); return fprm->fn(regs, fprm->data, dest);
} }
/* fetch handlers */ #define FETCH_FUNC_NAME(kind, type) fetch_##kind##_##type
static __kprobes unsigned long fetch_register(struct pt_regs *regs, /*
void *offset) * Define macro for basic types - we don't need to define s* types, because
{ * we have to care only about bitwidth at recording time.
return regs_get_register(regs, (unsigned int)((unsigned long)offset)); */
} #define DEFINE_BASIC_FETCH_FUNCS(kind) \
DEFINE_FETCH_##kind(u8) \
DEFINE_FETCH_##kind(u16) \
DEFINE_FETCH_##kind(u32) \
DEFINE_FETCH_##kind(u64)
static __kprobes unsigned long fetch_stack(struct pt_regs *regs, #define CHECK_BASIC_FETCH_FUNCS(kind, fn) \
void *num) ((FETCH_FUNC_NAME(kind, u8) == fn) || \
{ (FETCH_FUNC_NAME(kind, u16) == fn) || \
return regs_get_kernel_stack_nth(regs, (FETCH_FUNC_NAME(kind, u32) == fn) || \
(unsigned int)((unsigned long)num)); (FETCH_FUNC_NAME(kind, u64) == fn))
}
static __kprobes unsigned long fetch_memory(struct pt_regs *regs, void *addr) /* Data fetch function templates */
{ #define DEFINE_FETCH_reg(type) \
unsigned long retval; static __kprobes void FETCH_FUNC_NAME(reg, type)(struct pt_regs *regs, \
void *offset, void *dest) \
if (probe_kernel_address(addr, retval)) { \
return 0; *(type *)dest = (type)regs_get_register(regs, \
return retval; (unsigned int)((unsigned long)offset)); \
} }
DEFINE_BASIC_FETCH_FUNCS(reg)
static __kprobes unsigned long fetch_retvalue(struct pt_regs *regs, #define DEFINE_FETCH_stack(type) \
void *dummy) static __kprobes void FETCH_FUNC_NAME(stack, type)(struct pt_regs *regs,\
{ void *offset, void *dest) \
return regs_return_value(regs); { \
*(type *)dest = (type)regs_get_kernel_stack_nth(regs, \
(unsigned int)((unsigned long)offset)); \
} }
DEFINE_BASIC_FETCH_FUNCS(stack)
static __kprobes unsigned long fetch_stack_address(struct pt_regs *regs, #define DEFINE_FETCH_retval(type) \
void *dummy) static __kprobes void FETCH_FUNC_NAME(retval, type)(struct pt_regs *regs,\
{ void *dummy, void *dest) \
return kernel_stack_pointer(regs); { \
*(type *)dest = (type)regs_return_value(regs); \
} }
DEFINE_BASIC_FETCH_FUNCS(retval)
#define DEFINE_FETCH_memory(type) \
static __kprobes void FETCH_FUNC_NAME(memory, type)(struct pt_regs *regs,\
void *addr, void *dest) \
{ \
type retval; \
if (probe_kernel_address(addr, retval)) \
*(type *)dest = 0; \
else \
*(type *)dest = retval; \
}
DEFINE_BASIC_FETCH_FUNCS(memory)
/* Memory fetching by symbol */ /* Memory fetching by symbol */
struct symbol_cache { struct symbol_cache {
@@ -145,51 +192,126 @@ static struct symbol_cache *alloc_symbol_cache(const char *sym, long offset)
return sc; return sc;
} }
static __kprobes unsigned long fetch_symbol(struct pt_regs *regs, void *data) #define DEFINE_FETCH_symbol(type) \
{ static __kprobes void FETCH_FUNC_NAME(symbol, type)(struct pt_regs *regs,\
struct symbol_cache *sc = data; void *data, void *dest) \
{ \
if (sc->addr) struct symbol_cache *sc = data; \
return fetch_memory(regs, (void *)sc->addr); if (sc->addr) \
else fetch_memory_##type(regs, (void *)sc->addr, dest); \
return 0; else \
*(type *)dest = 0; \
} }
DEFINE_BASIC_FETCH_FUNCS(symbol)
/* Special indirect memory access interface */ /* Dereference memory access function */
struct indirect_fetch_data { struct deref_fetch_param {
struct fetch_func orig; struct fetch_param orig;
long offset; long offset;
}; };
static __kprobes unsigned long fetch_indirect(struct pt_regs *regs, void *data) #define DEFINE_FETCH_deref(type) \
{ static __kprobes void FETCH_FUNC_NAME(deref, type)(struct pt_regs *regs,\
struct indirect_fetch_data *ind = data; void *data, void *dest) \
unsigned long addr; { \
struct deref_fetch_param *dprm = data; \
addr = call_fetch(&ind->orig, regs); unsigned long addr; \
if (addr) { call_fetch(&dprm->orig, regs, &addr); \
addr += ind->offset; if (addr) { \
return fetch_memory(regs, (void *)addr); addr += dprm->offset; \
} else fetch_memory_##type(regs, (void *)addr, dest); \
return 0; } else \
*(type *)dest = 0; \
} }
DEFINE_BASIC_FETCH_FUNCS(deref)
static __kprobes void free_indirect_fetch_data(struct indirect_fetch_data *data) static __kprobes void free_deref_fetch_param(struct deref_fetch_param *data)
{ {
if (data->orig.func == fetch_indirect) if (CHECK_BASIC_FETCH_FUNCS(deref, data->orig.fn))
free_indirect_fetch_data(data->orig.data); free_deref_fetch_param(data->orig.data);
else if (data->orig.func == fetch_symbol) else if (CHECK_BASIC_FETCH_FUNCS(symbol, data->orig.fn))
free_symbol_cache(data->orig.data); free_symbol_cache(data->orig.data);
kfree(data); kfree(data);
} }
/* Default (unsigned long) fetch type */
#define __DEFAULT_FETCH_TYPE(t) u##t
#define _DEFAULT_FETCH_TYPE(t) __DEFAULT_FETCH_TYPE(t)
#define DEFAULT_FETCH_TYPE _DEFAULT_FETCH_TYPE(BITS_PER_LONG)
#define DEFAULT_FETCH_TYPE_STR __stringify(DEFAULT_FETCH_TYPE)
#define ASSIGN_FETCH_FUNC(kind, type) \
.kind = FETCH_FUNC_NAME(kind, type)
#define ASSIGN_FETCH_TYPE(ptype, ftype, sign) \
{.name = #ptype, \
.size = sizeof(ftype), \
.is_signed = sign, \
.print = PRINT_TYPE_FUNC_NAME(ptype), \
.fmt = PRINT_TYPE_FMT_NAME(ptype), \
ASSIGN_FETCH_FUNC(reg, ftype), \
ASSIGN_FETCH_FUNC(stack, ftype), \
ASSIGN_FETCH_FUNC(retval, ftype), \
ASSIGN_FETCH_FUNC(memory, ftype), \
ASSIGN_FETCH_FUNC(symbol, ftype), \
ASSIGN_FETCH_FUNC(deref, ftype), \
}
/* Fetch type information table */
static const struct fetch_type {
const char *name; /* Name of type */
size_t size; /* Byte size of type */
int is_signed; /* Signed flag */
print_type_func_t print; /* Print functions */
const char *fmt; /* Fromat string */
/* Fetch functions */
fetch_func_t reg;
fetch_func_t stack;
fetch_func_t retval;
fetch_func_t memory;
fetch_func_t symbol;
fetch_func_t deref;
} fetch_type_table[] = {
ASSIGN_FETCH_TYPE(u8, u8, 0),
ASSIGN_FETCH_TYPE(u16, u16, 0),
ASSIGN_FETCH_TYPE(u32, u32, 0),
ASSIGN_FETCH_TYPE(u64, u64, 0),
ASSIGN_FETCH_TYPE(s8, u8, 1),
ASSIGN_FETCH_TYPE(s16, u16, 1),
ASSIGN_FETCH_TYPE(s32, u32, 1),
ASSIGN_FETCH_TYPE(s64, u64, 1),
};
static const struct fetch_type *find_fetch_type(const char *type)
{
int i;
if (!type)
type = DEFAULT_FETCH_TYPE_STR;
for (i = 0; i < ARRAY_SIZE(fetch_type_table); i++)
if (strcmp(type, fetch_type_table[i].name) == 0)
return &fetch_type_table[i];
return NULL;
}
/* Special function : only accept unsigned long */
static __kprobes void fetch_stack_address(struct pt_regs *regs,
void *dummy, void *dest)
{
*(unsigned long *)dest = kernel_stack_pointer(regs);
}
/** /**
* Kprobe event core functions * Kprobe event core functions
*/ */
struct probe_arg { struct probe_arg {
struct fetch_func fetch; struct fetch_param fetch;
const char *name; unsigned int offset; /* Offset from argument entry */
const char *name; /* Name of this argument */
const char *comm; /* Command of this argument */
const struct fetch_type *type; /* Type of this argument */
}; };
/* Flags for trace_probe */ /* Flags for trace_probe */
@@ -204,6 +326,7 @@ struct trace_probe {
const char *symbol; /* symbol name */ const char *symbol; /* symbol name */
struct ftrace_event_call call; struct ftrace_event_call call;
struct trace_event event; struct trace_event event;
ssize_t size; /* trace entry size */
unsigned int nr_args; unsigned int nr_args;
struct probe_arg args[]; struct probe_arg args[];
}; };
@@ -212,6 +335,7 @@ struct trace_probe {
(offsetof(struct trace_probe, args) + \ (offsetof(struct trace_probe, args) + \
(sizeof(struct probe_arg) * (n))) (sizeof(struct probe_arg) * (n)))
static __kprobes int probe_is_return(struct trace_probe *tp) static __kprobes int probe_is_return(struct trace_probe *tp)
{ {
return tp->rp.handler != NULL; return tp->rp.handler != NULL;
@@ -222,49 +346,6 @@ static __kprobes const char *probe_symbol(struct trace_probe *tp)
return tp->symbol ? tp->symbol : "unknown"; return tp->symbol ? tp->symbol : "unknown";
} }
static int probe_arg_string(char *buf, size_t n, struct fetch_func *ff)
{
int ret = -EINVAL;
if (ff->func == fetch_register) {
const char *name;
name = regs_query_register_name((unsigned int)((long)ff->data));
ret = snprintf(buf, n, "%%%s", name);
} else if (ff->func == fetch_stack)
ret = snprintf(buf, n, "$stack%lu", (unsigned long)ff->data);
else if (ff->func == fetch_memory)
ret = snprintf(buf, n, "@0x%p", ff->data);
else if (ff->func == fetch_symbol) {
struct symbol_cache *sc = ff->data;
if (sc->offset)
ret = snprintf(buf, n, "@%s%+ld", sc->symbol,
sc->offset);
else
ret = snprintf(buf, n, "@%s", sc->symbol);
} else if (ff->func == fetch_retvalue)
ret = snprintf(buf, n, "$retval");
else if (ff->func == fetch_stack_address)
ret = snprintf(buf, n, "$stack");
else if (ff->func == fetch_indirect) {
struct indirect_fetch_data *id = ff->data;
size_t l = 0;
ret = snprintf(buf, n, "%+ld(", id->offset);
if (ret >= n)
goto end;
l += ret;
ret = probe_arg_string(buf + l, n - l, &id->orig);
if (ret < 0)
goto end;
l += ret;
ret = snprintf(buf + l, n - l, ")");
ret += l;
}
end:
if (ret >= n)
return -ENOSPC;
return ret;
}
static int register_probe_event(struct trace_probe *tp); static int register_probe_event(struct trace_probe *tp);
static void unregister_probe_event(struct trace_probe *tp); static void unregister_probe_event(struct trace_probe *tp);
@@ -347,11 +428,12 @@ error:
static void free_probe_arg(struct probe_arg *arg) static void free_probe_arg(struct probe_arg *arg)
{ {
if (arg->fetch.func == fetch_symbol) if (CHECK_BASIC_FETCH_FUNCS(deref, arg->fetch.fn))
free_deref_fetch_param(arg->fetch.data);
else if (CHECK_BASIC_FETCH_FUNCS(symbol, arg->fetch.fn))
free_symbol_cache(arg->fetch.data); free_symbol_cache(arg->fetch.data);
else if (arg->fetch.func == fetch_indirect)
free_indirect_fetch_data(arg->fetch.data);
kfree(arg->name); kfree(arg->name);
kfree(arg->comm);
} }
static void free_trace_probe(struct trace_probe *tp) static void free_trace_probe(struct trace_probe *tp)
@@ -457,28 +539,30 @@ static int split_symbol_offset(char *symbol, unsigned long *offset)
#define PARAM_MAX_ARGS 16 #define PARAM_MAX_ARGS 16
#define PARAM_MAX_STACK (THREAD_SIZE / sizeof(unsigned long)) #define PARAM_MAX_STACK (THREAD_SIZE / sizeof(unsigned long))
static int parse_probe_vars(char *arg, struct fetch_func *ff, int is_return) static int parse_probe_vars(char *arg, const struct fetch_type *t,
struct fetch_param *f, int is_return)
{ {
int ret = 0; int ret = 0;
unsigned long param; unsigned long param;
if (strcmp(arg, "retval") == 0) { if (strcmp(arg, "retval") == 0) {
if (is_return) { if (is_return)
ff->func = fetch_retvalue; f->fn = t->retval;
ff->data = NULL; else
} else
ret = -EINVAL; ret = -EINVAL;
} else if (strncmp(arg, "stack", 5) == 0) { } else if (strncmp(arg, "stack", 5) == 0) {
if (arg[5] == '\0') { if (arg[5] == '\0') {
ff->func = fetch_stack_address; if (strcmp(t->name, DEFAULT_FETCH_TYPE_STR) == 0)
ff->data = NULL; f->fn = fetch_stack_address;
else
ret = -EINVAL;
} else if (isdigit(arg[5])) { } else if (isdigit(arg[5])) {
ret = strict_strtoul(arg + 5, 10, &param); ret = strict_strtoul(arg + 5, 10, &param);
if (ret || param > PARAM_MAX_STACK) if (ret || param > PARAM_MAX_STACK)
ret = -EINVAL; ret = -EINVAL;
else { else {
ff->func = fetch_stack; f->fn = t->stack;
ff->data = (void *)param; f->data = (void *)param;
} }
} else } else
ret = -EINVAL; ret = -EINVAL;
@@ -488,7 +572,8 @@ static int parse_probe_vars(char *arg, struct fetch_func *ff, int is_return)
} }
/* Recursive argument parser */ /* Recursive argument parser */
static int __parse_probe_arg(char *arg, struct fetch_func *ff, int is_return) static int __parse_probe_arg(char *arg, const struct fetch_type *t,
struct fetch_param *f, int is_return)
{ {
int ret = 0; int ret = 0;
unsigned long param; unsigned long param;
@@ -497,13 +582,13 @@ static int __parse_probe_arg(char *arg, struct fetch_func *ff, int is_return)
switch (arg[0]) { switch (arg[0]) {
case '$': case '$':
ret = parse_probe_vars(arg + 1, ff, is_return); ret = parse_probe_vars(arg + 1, t, f, is_return);
break; break;
case '%': /* named register */ case '%': /* named register */
ret = regs_query_register_offset(arg + 1); ret = regs_query_register_offset(arg + 1);
if (ret >= 0) { if (ret >= 0) {
ff->func = fetch_register; f->fn = t->reg;
ff->data = (void *)(unsigned long)ret; f->data = (void *)(unsigned long)ret;
ret = 0; ret = 0;
} }
break; break;
@@ -512,26 +597,22 @@ static int __parse_probe_arg(char *arg, struct fetch_func *ff, int is_return)
ret = strict_strtoul(arg + 1, 0, &param); ret = strict_strtoul(arg + 1, 0, &param);
if (ret) if (ret)
break; break;
ff->func = fetch_memory; f->fn = t->memory;
ff->data = (void *)param; f->data = (void *)param;
} else { } else {
ret = split_symbol_offset(arg + 1, &offset); ret = split_symbol_offset(arg + 1, &offset);
if (ret) if (ret)
break; break;
ff->data = alloc_symbol_cache(arg + 1, offset); f->data = alloc_symbol_cache(arg + 1, offset);
if (ff->data) if (f->data)
ff->func = fetch_symbol; f->fn = t->symbol;
else
ret = -EINVAL;
} }
break; break;
case '+': /* indirect memory */ case '+': /* deref memory */
case '-': case '-':
tmp = strchr(arg, '('); tmp = strchr(arg, '(');
if (!tmp) { if (!tmp)
ret = -EINVAL;
break; break;
}
*tmp = '\0'; *tmp = '\0';
ret = strict_strtol(arg + 1, 0, &offset); ret = strict_strtol(arg + 1, 0, &offset);
if (ret) if (ret)
@@ -541,38 +622,58 @@ static int __parse_probe_arg(char *arg, struct fetch_func *ff, int is_return)
arg = tmp + 1; arg = tmp + 1;
tmp = strrchr(arg, ')'); tmp = strrchr(arg, ')');
if (tmp) { if (tmp) {
struct indirect_fetch_data *id; struct deref_fetch_param *dprm;
const struct fetch_type *t2 = find_fetch_type(NULL);
*tmp = '\0'; *tmp = '\0';
id = kzalloc(sizeof(struct indirect_fetch_data), dprm = kzalloc(sizeof(struct deref_fetch_param),
GFP_KERNEL); GFP_KERNEL);
if (!id) if (!dprm)
return -ENOMEM; return -ENOMEM;
id->offset = offset; dprm->offset = offset;
ret = __parse_probe_arg(arg, &id->orig, is_return); ret = __parse_probe_arg(arg, t2, &dprm->orig,
is_return);
if (ret) if (ret)
kfree(id); kfree(dprm);
else { else {
ff->func = fetch_indirect; f->fn = t->deref;
ff->data = (void *)id; f->data = (void *)dprm;
} }
} else }
ret = -EINVAL;
break; break;
default:
/* TODO: support custom handler */
ret = -EINVAL;
} }
if (!ret && !f->fn)
ret = -EINVAL;
return ret; return ret;
} }
/* String length checking wrapper */ /* String length checking wrapper */
static int parse_probe_arg(char *arg, struct fetch_func *ff, int is_return) static int parse_probe_arg(char *arg, struct trace_probe *tp,
struct probe_arg *parg, int is_return)
{ {
const char *t;
if (strlen(arg) > MAX_ARGSTR_LEN) { if (strlen(arg) > MAX_ARGSTR_LEN) {
pr_info("Argument is too long.: %s\n", arg); pr_info("Argument is too long.: %s\n", arg);
return -ENOSPC; return -ENOSPC;
} }
return __parse_probe_arg(arg, ff, is_return); parg->comm = kstrdup(arg, GFP_KERNEL);
if (!parg->comm) {
pr_info("Failed to allocate memory for command '%s'.\n", arg);
return -ENOMEM;
}
t = strchr(parg->comm, ':');
if (t) {
arg[t - parg->comm] = '\0';
t++;
}
parg->type = find_fetch_type(t);
if (!parg->type) {
pr_info("Unsupported type: %s\n", t);
return -EINVAL;
}
parg->offset = tp->size;
tp->size += parg->type->size;
return __parse_probe_arg(arg, parg->type, &parg->fetch, is_return);
} }
/* Return 1 if name is reserved or already used by another argument */ /* Return 1 if name is reserved or already used by another argument */
@@ -602,15 +703,18 @@ static int create_trace_probe(int argc, char **argv)
* @ADDR : fetch memory at ADDR (ADDR should be in kernel) * @ADDR : fetch memory at ADDR (ADDR should be in kernel)
* @SYM[+|-offs] : fetch memory at SYM +|- offs (SYM is a data symbol) * @SYM[+|-offs] : fetch memory at SYM +|- offs (SYM is a data symbol)
* %REG : fetch register REG * %REG : fetch register REG
* Indirect memory fetch: * Dereferencing memory fetch:
* +|-offs(ARG) : fetch memory at ARG +|- offs address. * +|-offs(ARG) : fetch memory at ARG +|- offs address.
* Alias name of args: * Alias name of args:
* NAME=FETCHARG : set NAME as alias of FETCHARG. * NAME=FETCHARG : set NAME as alias of FETCHARG.
* Type of args:
* FETCHARG:TYPE : use TYPE instead of unsigned long.
*/ */
struct trace_probe *tp; struct trace_probe *tp;
int i, ret = 0; int i, ret = 0;
int is_return = 0, is_delete = 0; int is_return = 0, is_delete = 0;
char *symbol = NULL, *event = NULL, *arg = NULL, *group = NULL; char *symbol = NULL, *event = NULL, *group = NULL;
char *arg, *tmp;
unsigned long offset = 0; unsigned long offset = 0;
void *addr = NULL; void *addr = NULL;
char buf[MAX_EVENT_NAME_LEN]; char buf[MAX_EVENT_NAME_LEN];
@@ -723,13 +827,6 @@ static int create_trace_probe(int argc, char **argv)
else else
arg = argv[i]; arg = argv[i];
if (conflict_field_name(argv[i], tp->args, i)) {
pr_info("Argument%d name '%s' conflicts with "
"another field.\n", i, argv[i]);
ret = -EINVAL;
goto error;
}
tp->args[i].name = kstrdup(argv[i], GFP_KERNEL); tp->args[i].name = kstrdup(argv[i], GFP_KERNEL);
if (!tp->args[i].name) { if (!tp->args[i].name) {
pr_info("Failed to allocate argument%d name '%s'.\n", pr_info("Failed to allocate argument%d name '%s'.\n",
@@ -737,9 +834,19 @@ static int create_trace_probe(int argc, char **argv)
ret = -ENOMEM; ret = -ENOMEM;
goto error; goto error;
} }
tmp = strchr(tp->args[i].name, ':');
if (tmp)
*tmp = '_'; /* convert : to _ */
if (conflict_field_name(tp->args[i].name, tp->args, i)) {
pr_info("Argument%d name '%s' conflicts with "
"another field.\n", i, argv[i]);
ret = -EINVAL;
goto error;
}
/* Parse fetch argument */ /* Parse fetch argument */
ret = parse_probe_arg(arg, &tp->args[i].fetch, is_return); ret = parse_probe_arg(arg, tp, &tp->args[i], is_return);
if (ret) { if (ret) {
pr_info("Parse error at argument%d. (%d)\n", i, ret); pr_info("Parse error at argument%d. (%d)\n", i, ret);
kfree(tp->args[i].name); kfree(tp->args[i].name);
@@ -794,8 +901,7 @@ static void probes_seq_stop(struct seq_file *m, void *v)
static int probes_seq_show(struct seq_file *m, void *v) static int probes_seq_show(struct seq_file *m, void *v)
{ {
struct trace_probe *tp = v; struct trace_probe *tp = v;
int i, ret; int i;
char buf[MAX_ARGSTR_LEN + 1];
seq_printf(m, "%c", probe_is_return(tp) ? 'r' : 'p'); seq_printf(m, "%c", probe_is_return(tp) ? 'r' : 'p');
seq_printf(m, ":%s/%s", tp->call.system, tp->call.name); seq_printf(m, ":%s/%s", tp->call.system, tp->call.name);
@@ -807,15 +913,10 @@ static int probes_seq_show(struct seq_file *m, void *v)
else else
seq_printf(m, " %s", probe_symbol(tp)); seq_printf(m, " %s", probe_symbol(tp));
for (i = 0; i < tp->nr_args; i++) { for (i = 0; i < tp->nr_args; i++)
ret = probe_arg_string(buf, MAX_ARGSTR_LEN, &tp->args[i].fetch); seq_printf(m, " %s=%s", tp->args[i].name, tp->args[i].comm);
if (ret < 0) {
pr_warning("Argument%d decoding error(%d).\n", i, ret);
return ret;
}
seq_printf(m, " %s=%s", tp->args[i].name, buf);
}
seq_printf(m, "\n"); seq_printf(m, "\n");
return 0; return 0;
} }
@@ -945,9 +1046,10 @@ static const struct file_operations kprobe_profile_ops = {
static __kprobes void kprobe_trace_func(struct kprobe *kp, struct pt_regs *regs) static __kprobes void kprobe_trace_func(struct kprobe *kp, struct pt_regs *regs)
{ {
struct trace_probe *tp = container_of(kp, struct trace_probe, rp.kp); struct trace_probe *tp = container_of(kp, struct trace_probe, rp.kp);
struct kprobe_trace_entry *entry; struct kprobe_trace_entry_head *entry;
struct ring_buffer_event *event; struct ring_buffer_event *event;
struct ring_buffer *buffer; struct ring_buffer *buffer;
u8 *data;
int size, i, pc; int size, i, pc;
unsigned long irq_flags; unsigned long irq_flags;
struct ftrace_event_call *call = &tp->call; struct ftrace_event_call *call = &tp->call;
@@ -957,7 +1059,7 @@ static __kprobes void kprobe_trace_func(struct kprobe *kp, struct pt_regs *regs)
local_save_flags(irq_flags); local_save_flags(irq_flags);
pc = preempt_count(); pc = preempt_count();
size = SIZEOF_KPROBE_TRACE_ENTRY(tp->nr_args); size = sizeof(*entry) + tp->size;
event = trace_current_buffer_lock_reserve(&buffer, call->id, size, event = trace_current_buffer_lock_reserve(&buffer, call->id, size,
irq_flags, pc); irq_flags, pc);
@@ -965,10 +1067,10 @@ static __kprobes void kprobe_trace_func(struct kprobe *kp, struct pt_regs *regs)
return; return;
entry = ring_buffer_event_data(event); entry = ring_buffer_event_data(event);
entry->nargs = tp->nr_args;
entry->ip = (unsigned long)kp->addr; entry->ip = (unsigned long)kp->addr;
data = (u8 *)&entry[1];
for (i = 0; i < tp->nr_args; i++) for (i = 0; i < tp->nr_args; i++)
entry->args[i] = call_fetch(&tp->args[i].fetch, regs); call_fetch(&tp->args[i].fetch, regs, data + tp->args[i].offset);
if (!filter_current_check_discard(buffer, call, entry, event)) if (!filter_current_check_discard(buffer, call, entry, event))
trace_nowake_buffer_unlock_commit(buffer, event, irq_flags, pc); trace_nowake_buffer_unlock_commit(buffer, event, irq_flags, pc);
@@ -979,9 +1081,10 @@ static __kprobes void kretprobe_trace_func(struct kretprobe_instance *ri,
struct pt_regs *regs) struct pt_regs *regs)
{ {
struct trace_probe *tp = container_of(ri->rp, struct trace_probe, rp); struct trace_probe *tp = container_of(ri->rp, struct trace_probe, rp);
struct kretprobe_trace_entry *entry; struct kretprobe_trace_entry_head *entry;
struct ring_buffer_event *event; struct ring_buffer_event *event;
struct ring_buffer *buffer; struct ring_buffer *buffer;
u8 *data;
int size, i, pc; int size, i, pc;
unsigned long irq_flags; unsigned long irq_flags;
struct ftrace_event_call *call = &tp->call; struct ftrace_event_call *call = &tp->call;
@@ -989,7 +1092,7 @@ static __kprobes void kretprobe_trace_func(struct kretprobe_instance *ri,
local_save_flags(irq_flags); local_save_flags(irq_flags);
pc = preempt_count(); pc = preempt_count();
size = SIZEOF_KRETPROBE_TRACE_ENTRY(tp->nr_args); size = sizeof(*entry) + tp->size;
event = trace_current_buffer_lock_reserve(&buffer, call->id, size, event = trace_current_buffer_lock_reserve(&buffer, call->id, size,
irq_flags, pc); irq_flags, pc);
@@ -997,11 +1100,11 @@ static __kprobes void kretprobe_trace_func(struct kretprobe_instance *ri,
return; return;
entry = ring_buffer_event_data(event); entry = ring_buffer_event_data(event);
entry->nargs = tp->nr_args;
entry->func = (unsigned long)tp->rp.kp.addr; entry->func = (unsigned long)tp->rp.kp.addr;
entry->ret_ip = (unsigned long)ri->ret_addr; entry->ret_ip = (unsigned long)ri->ret_addr;
data = (u8 *)&entry[1];
for (i = 0; i < tp->nr_args; i++) for (i = 0; i < tp->nr_args; i++)
entry->args[i] = call_fetch(&tp->args[i].fetch, regs); call_fetch(&tp->args[i].fetch, regs, data + tp->args[i].offset);
if (!filter_current_check_discard(buffer, call, entry, event)) if (!filter_current_check_discard(buffer, call, entry, event))
trace_nowake_buffer_unlock_commit(buffer, event, irq_flags, pc); trace_nowake_buffer_unlock_commit(buffer, event, irq_flags, pc);
@@ -1011,13 +1114,14 @@ static __kprobes void kretprobe_trace_func(struct kretprobe_instance *ri,
enum print_line_t enum print_line_t
print_kprobe_event(struct trace_iterator *iter, int flags) print_kprobe_event(struct trace_iterator *iter, int flags)
{ {
struct kprobe_trace_entry *field; struct kprobe_trace_entry_head *field;
struct trace_seq *s = &iter->seq; struct trace_seq *s = &iter->seq;
struct trace_event *event; struct trace_event *event;
struct trace_probe *tp; struct trace_probe *tp;
u8 *data;
int i; int i;
field = (struct kprobe_trace_entry *)iter->ent; field = (struct kprobe_trace_entry_head *)iter->ent;
event = ftrace_find_event(field->ent.type); event = ftrace_find_event(field->ent.type);
tp = container_of(event, struct trace_probe, event); tp = container_of(event, struct trace_probe, event);
@@ -1030,9 +1134,10 @@ print_kprobe_event(struct trace_iterator *iter, int flags)
if (!trace_seq_puts(s, ")")) if (!trace_seq_puts(s, ")"))
goto partial; goto partial;
for (i = 0; i < field->nargs; i++) data = (u8 *)&field[1];
if (!trace_seq_printf(s, " %s=%lx", for (i = 0; i < tp->nr_args; i++)
tp->args[i].name, field->args[i])) if (!tp->args[i].type->print(s, tp->args[i].name,
data + tp->args[i].offset))
goto partial; goto partial;
if (!trace_seq_puts(s, "\n")) if (!trace_seq_puts(s, "\n"))
@@ -1046,13 +1151,14 @@ partial:
enum print_line_t enum print_line_t
print_kretprobe_event(struct trace_iterator *iter, int flags) print_kretprobe_event(struct trace_iterator *iter, int flags)
{ {
struct kretprobe_trace_entry *field; struct kretprobe_trace_entry_head *field;
struct trace_seq *s = &iter->seq; struct trace_seq *s = &iter->seq;
struct trace_event *event; struct trace_event *event;
struct trace_probe *tp; struct trace_probe *tp;
u8 *data;
int i; int i;
field = (struct kretprobe_trace_entry *)iter->ent; field = (struct kretprobe_trace_entry_head *)iter->ent;
event = ftrace_find_event(field->ent.type); event = ftrace_find_event(field->ent.type);
tp = container_of(event, struct trace_probe, event); tp = container_of(event, struct trace_probe, event);
@@ -1071,9 +1177,10 @@ print_kretprobe_event(struct trace_iterator *iter, int flags)
if (!trace_seq_puts(s, ")")) if (!trace_seq_puts(s, ")"))
goto partial; goto partial;
for (i = 0; i < field->nargs; i++) data = (u8 *)&field[1];
if (!trace_seq_printf(s, " %s=%lx", for (i = 0; i < tp->nr_args; i++)
tp->args[i].name, field->args[i])) if (!tp->args[i].type->print(s, tp->args[i].name,
data + tp->args[i].offset))
goto partial; goto partial;
if (!trace_seq_puts(s, "\n")) if (!trace_seq_puts(s, "\n"))
@@ -1129,29 +1236,43 @@ static int probe_event_raw_init(struct ftrace_event_call *event_call)
static int kprobe_event_define_fields(struct ftrace_event_call *event_call) static int kprobe_event_define_fields(struct ftrace_event_call *event_call)
{ {
int ret, i; int ret, i;
struct kprobe_trace_entry field; struct kprobe_trace_entry_head field;
struct trace_probe *tp = (struct trace_probe *)event_call->data; struct trace_probe *tp = (struct trace_probe *)event_call->data;
DEFINE_FIELD(unsigned long, ip, FIELD_STRING_IP, 0); DEFINE_FIELD(unsigned long, ip, FIELD_STRING_IP, 0);
DEFINE_FIELD(int, nargs, FIELD_STRING_NARGS, 1);
/* Set argument names as fields */ /* Set argument names as fields */
for (i = 0; i < tp->nr_args; i++) for (i = 0; i < tp->nr_args; i++) {
DEFINE_FIELD(unsigned long, args[i], tp->args[i].name, 0); ret = trace_define_field(event_call, tp->args[i].type->name,
tp->args[i].name,
sizeof(field) + tp->args[i].offset,
tp->args[i].type->size,
tp->args[i].type->is_signed,
FILTER_OTHER);
if (ret)
return ret;
}
return 0; return 0;
} }
static int kretprobe_event_define_fields(struct ftrace_event_call *event_call) static int kretprobe_event_define_fields(struct ftrace_event_call *event_call)
{ {
int ret, i; int ret, i;
struct kretprobe_trace_entry field; struct kretprobe_trace_entry_head field;
struct trace_probe *tp = (struct trace_probe *)event_call->data; struct trace_probe *tp = (struct trace_probe *)event_call->data;
DEFINE_FIELD(unsigned long, func, FIELD_STRING_FUNC, 0); DEFINE_FIELD(unsigned long, func, FIELD_STRING_FUNC, 0);
DEFINE_FIELD(unsigned long, ret_ip, FIELD_STRING_RETIP, 0); DEFINE_FIELD(unsigned long, ret_ip, FIELD_STRING_RETIP, 0);
DEFINE_FIELD(int, nargs, FIELD_STRING_NARGS, 1);
/* Set argument names as fields */ /* Set argument names as fields */
for (i = 0; i < tp->nr_args; i++) for (i = 0; i < tp->nr_args; i++) {
DEFINE_FIELD(unsigned long, args[i], tp->args[i].name, 0); ret = trace_define_field(event_call, tp->args[i].type->name,
tp->args[i].name,
sizeof(field) + tp->args[i].offset,
tp->args[i].type->size,
tp->args[i].type->is_signed,
FILTER_OTHER);
if (ret)
return ret;
}
return 0; return 0;
} }
@@ -1176,8 +1297,8 @@ static int __set_print_fmt(struct trace_probe *tp, char *buf, int len)
pos += snprintf(buf + pos, LEN_OR_ZERO, "\"%s", fmt); pos += snprintf(buf + pos, LEN_OR_ZERO, "\"%s", fmt);
for (i = 0; i < tp->nr_args; i++) { for (i = 0; i < tp->nr_args; i++) {
pos += snprintf(buf + pos, LEN_OR_ZERO, " %s=%%lx", pos += snprintf(buf + pos, LEN_OR_ZERO, " %s=%s",
tp->args[i].name); tp->args[i].name, tp->args[i].type->fmt);
} }
pos += snprintf(buf + pos, LEN_OR_ZERO, "\", %s", arg); pos += snprintf(buf + pos, LEN_OR_ZERO, "\", %s", arg);
@@ -1219,12 +1340,13 @@ static __kprobes void kprobe_perf_func(struct kprobe *kp,
{ {
struct trace_probe *tp = container_of(kp, struct trace_probe, rp.kp); struct trace_probe *tp = container_of(kp, struct trace_probe, rp.kp);
struct ftrace_event_call *call = &tp->call; struct ftrace_event_call *call = &tp->call;
struct kprobe_trace_entry *entry; struct kprobe_trace_entry_head *entry;
u8 *data;
int size, __size, i; int size, __size, i;
unsigned long irq_flags; unsigned long irq_flags;
int rctx; int rctx;
__size = SIZEOF_KPROBE_TRACE_ENTRY(tp->nr_args); __size = sizeof(*entry) + tp->size;
size = ALIGN(__size + sizeof(u32), sizeof(u64)); size = ALIGN(__size + sizeof(u32), sizeof(u64));
size -= sizeof(u32); size -= sizeof(u32);
if (WARN_ONCE(size > PERF_MAX_TRACE_SIZE, if (WARN_ONCE(size > PERF_MAX_TRACE_SIZE,
@@ -1235,10 +1357,10 @@ static __kprobes void kprobe_perf_func(struct kprobe *kp,
if (!entry) if (!entry)
return; return;
entry->nargs = tp->nr_args;
entry->ip = (unsigned long)kp->addr; entry->ip = (unsigned long)kp->addr;
data = (u8 *)&entry[1];
for (i = 0; i < tp->nr_args; i++) for (i = 0; i < tp->nr_args; i++)
entry->args[i] = call_fetch(&tp->args[i].fetch, regs); call_fetch(&tp->args[i].fetch, regs, data + tp->args[i].offset);
perf_trace_buf_submit(entry, size, rctx, entry->ip, 1, irq_flags, regs); perf_trace_buf_submit(entry, size, rctx, entry->ip, 1, irq_flags, regs);
} }
@@ -1249,12 +1371,13 @@ static __kprobes void kretprobe_perf_func(struct kretprobe_instance *ri,
{ {
struct trace_probe *tp = container_of(ri->rp, struct trace_probe, rp); struct trace_probe *tp = container_of(ri->rp, struct trace_probe, rp);
struct ftrace_event_call *call = &tp->call; struct ftrace_event_call *call = &tp->call;
struct kretprobe_trace_entry *entry; struct kretprobe_trace_entry_head *entry;
u8 *data;
int size, __size, i; int size, __size, i;
unsigned long irq_flags; unsigned long irq_flags;
int rctx; int rctx;
__size = SIZEOF_KRETPROBE_TRACE_ENTRY(tp->nr_args); __size = sizeof(*entry) + tp->size;
size = ALIGN(__size + sizeof(u32), sizeof(u64)); size = ALIGN(__size + sizeof(u32), sizeof(u64));
size -= sizeof(u32); size -= sizeof(u32);
if (WARN_ONCE(size > PERF_MAX_TRACE_SIZE, if (WARN_ONCE(size > PERF_MAX_TRACE_SIZE,
@@ -1265,11 +1388,11 @@ static __kprobes void kretprobe_perf_func(struct kretprobe_instance *ri,
if (!entry) if (!entry)
return; return;
entry->nargs = tp->nr_args;
entry->func = (unsigned long)tp->rp.kp.addr; entry->func = (unsigned long)tp->rp.kp.addr;
entry->ret_ip = (unsigned long)ri->ret_addr; entry->ret_ip = (unsigned long)ri->ret_addr;
data = (u8 *)&entry[1];
for (i = 0; i < tp->nr_args; i++) for (i = 0; i < tp->nr_args; i++)
entry->args[i] = call_fetch(&tp->args[i].fetch, regs); call_fetch(&tp->args[i].fetch, regs, data + tp->args[i].offset);
perf_trace_buf_submit(entry, size, rctx, entry->ret_ip, 1, perf_trace_buf_submit(entry, size, rctx, entry->ret_ip, 1,
irq_flags, regs); irq_flags, regs);

11
tools/perf/Documentation/perf-probe.txt
View File

@@ -79,7 +79,16 @@ Probe points are defined by following syntax.
'EVENT' specifies the name of new event, if omitted, it will be set the name of the probed function. Currently, event group name is set as 'probe'. 'EVENT' specifies the name of new event, if omitted, it will be set the name of the probed function. Currently, event group name is set as 'probe'.
'FUNC' specifies a probed function name, and it may have one of the following options; '+OFFS' is the offset from function entry address in bytes, ':RLN' is the relative-line number from function entry line, and '%return' means that it probes function return. And ';PTN' means lazy matching pattern (see LAZY MATCHING). Note that ';PTN' must be the end of the probe point definition. In addition, '@SRC' specifies a source file which has that function. 'FUNC' specifies a probed function name, and it may have one of the following options; '+OFFS' is the offset from function entry address in bytes, ':RLN' is the relative-line number from function entry line, and '%return' means that it probes function return. And ';PTN' means lazy matching pattern (see LAZY MATCHING). Note that ';PTN' must be the end of the probe point definition. In addition, '@SRC' specifies a source file which has that function.
It is also possible to specify a probe point by the source line number or lazy matching by using 'SRC:ALN' or 'SRC;PTN' syntax, where 'SRC' is the source file path, ':ALN' is the line number and ';PTN' is the lazy matching pattern. It is also possible to specify a probe point by the source line number or lazy matching by using 'SRC:ALN' or 'SRC;PTN' syntax, where 'SRC' is the source file path, ':ALN' is the line number and ';PTN' is the lazy matching pattern.
'ARG' specifies the arguments of this probe point. You can use the name of local variable, or kprobe-tracer argument format (e.g. $retval, %ax, etc). 'ARG' specifies the arguments of this probe point, (see PROBE ARGUMENT).
PROBE ARGUMENT
--------------
Each probe argument follows below syntax.
[NAME=]LOCALVAR|$retval|%REG|@SYMBOL[:TYPE]
'NAME' specifies the name of this argument (optional). You can use the name of local variable, local data structure member (e.g. var->field, var.field2), or kprobe-tracer argument format (e.g. $retval, %ax, etc). Note that the name of this argument will be set as the last member name if you specify a local data structure member (e.g. field2 for 'var->field1.field2'.)
'TYPE' casts the type of this argument (optional). If omitted, perf probe automatically set the type based on debuginfo.
LINE SYNTAX LINE SYNTAX
----------- -----------

78
tools/perf/builtin-probe.c
View File

@@ -40,7 +40,6 @@
#include "util/debug.h" #include "util/debug.h"
#include "util/debugfs.h" #include "util/debugfs.h"
#include "util/parse-options.h" #include "util/parse-options.h"
#include "util/parse-events.h" /* For debugfs_path */
#include "util/probe-finder.h" #include "util/probe-finder.h"
#include "util/probe-event.h" #include "util/probe-event.h"
@@ -59,23 +58,25 @@ static struct {
/* Parse an event definition. Note that any error must die. */ /* Parse an event definition. Note that any error must die. */
static void parse_probe_event(const char *str) static int parse_probe_event(const char *str)
{ {
struct perf_probe_event *pev = &params.events[params.nevents]; struct perf_probe_event *pev = &params.events[params.nevents];
int ret;
pr_debug("probe-definition(%d): %s\n", params.nevents, str); pr_debug("probe-definition(%d): %s\n", params.nevents, str);
if (++params.nevents == MAX_PROBES) if (++params.nevents == MAX_PROBES)
die("Too many probes (> %d) are specified.", MAX_PROBES); die("Too many probes (> %d) are specified.", MAX_PROBES);
/* Parse a perf-probe command into event */ /* Parse a perf-probe command into event */
parse_perf_probe_command(str, pev); ret = parse_perf_probe_command(str, pev);
pr_debug("%d arguments\n", pev->nargs); pr_debug("%d arguments\n", pev->nargs);
return ret;
} }
static void parse_probe_event_argv(int argc, const char **argv) static int parse_probe_event_argv(int argc, const char **argv)
{ {
int i, len; int i, len, ret;
char *buf; char *buf;
/* Bind up rest arguments */ /* Bind up rest arguments */
@@ -86,16 +87,18 @@ static void parse_probe_event_argv(int argc, const char **argv)
len = 0; len = 0;
for (i = 0; i < argc; i++) for (i = 0; i < argc; i++)
len += sprintf(&buf[len], "%s ", argv[i]); len += sprintf(&buf[len], "%s ", argv[i]);
parse_probe_event(buf); ret = parse_probe_event(buf);
free(buf); free(buf);
return ret;
} }
static int opt_add_probe_event(const struct option *opt __used, static int opt_add_probe_event(const struct option *opt __used,
const char *str, int unset __used) const char *str, int unset __used)
{ {
if (str) if (str)
parse_probe_event(str); return parse_probe_event(str);
return 0; else
return 0;
} }
static int opt_del_probe_event(const struct option *opt __used, static int opt_del_probe_event(const struct option *opt __used,
@@ -113,11 +116,14 @@ static int opt_del_probe_event(const struct option *opt __used,
static int opt_show_lines(const struct option *opt __used, static int opt_show_lines(const struct option *opt __used,
const char *str, int unset __used) const char *str, int unset __used)
{ {
int ret = 0;
if (str) if (str)
parse_line_range_desc(str, &params.line_range); ret = parse_line_range_desc(str, &params.line_range);
INIT_LIST_HEAD(&params.line_range.line_list); INIT_LIST_HEAD(&params.line_range.line_list);
params.show_lines = true; params.show_lines = true;
return 0;
return ret;
} }
#endif #endif
@@ -142,9 +148,9 @@ static const struct option options[] = {
OPT_CALLBACK('a', "add", NULL, OPT_CALLBACK('a', "add", NULL,
#ifdef DWARF_SUPPORT #ifdef DWARF_SUPPORT
"[EVENT=]FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT" "[EVENT=]FUNC[@SRC][+OFF|%return|:RL|;PT]|SRC:AL|SRC;PT"
" [ARG ...]", " [[NAME=]ARG ...]",
#else #else
"[EVENT=]FUNC[+OFF|%return] [ARG ...]", "[EVENT=]FUNC[+OFF|%return] [[NAME=]ARG ...]",
#endif #endif
"probe point definition, where\n" "probe point definition, where\n"
"\t\tGROUP:\tGroup name (optional)\n" "\t\tGROUP:\tGroup name (optional)\n"
@@ -178,6 +184,8 @@ static const struct option options[] = {
int cmd_probe(int argc, const char **argv, const char *prefix __used) int cmd_probe(int argc, const char **argv, const char *prefix __used)
{ {
int ret;
argc = parse_options(argc, argv, options, probe_usage, argc = parse_options(argc, argv, options, probe_usage,
PARSE_OPT_STOP_AT_NON_OPTION); PARSE_OPT_STOP_AT_NON_OPTION);
if (argc > 0) { if (argc > 0) {
@@ -185,28 +193,31 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
pr_warning(" Error: '-' is not supported.\n"); pr_warning(" Error: '-' is not supported.\n");
usage_with_options(probe_usage, options); usage_with_options(probe_usage, options);
} }
parse_probe_event_argv(argc, argv); ret = parse_probe_event_argv(argc, argv);
if (ret < 0) {
pr_err(" Error: Parse Error. (%d)\n", ret);
return ret;
}
} }
if ((!params.nevents && !params.dellist && !params.list_events && if ((!params.nevents && !params.dellist && !params.list_events &&
!params.show_lines)) !params.show_lines))
usage_with_options(probe_usage, options); usage_with_options(probe_usage, options);
if (debugfs_valid_mountpoint(debugfs_path) < 0)
die("Failed to find debugfs path.");
if (params.list_events) { if (params.list_events) {
if (params.nevents != 0 || params.dellist) { if (params.nevents != 0 || params.dellist) {
pr_warning(" Error: Don't use --list with" pr_err(" Error: Don't use --list with --add/--del.\n");
" --add/--del.\n");
usage_with_options(probe_usage, options); usage_with_options(probe_usage, options);
} }
if (params.show_lines) { if (params.show_lines) {
pr_warning(" Error: Don't use --list with --line.\n"); pr_err(" Error: Don't use --list with --line.\n");
usage_with_options(probe_usage, options); usage_with_options(probe_usage, options);
} }
show_perf_probe_events(); ret = show_perf_probe_events();
return 0; if (ret < 0)
pr_err(" Error: Failed to show event list. (%d)\n",
ret);
return ret;
} }
#ifdef DWARF_SUPPORT #ifdef DWARF_SUPPORT
@@ -217,19 +228,30 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
usage_with_options(probe_usage, options); usage_with_options(probe_usage, options);
} }
show_line_range(&params.line_range); ret = show_line_range(&params.line_range);
return 0; if (ret < 0)
pr_err(" Error: Failed to show lines. (%d)\n", ret);
return ret;
} }
#endif #endif
if (params.dellist) { if (params.dellist) {
del_perf_probe_events(params.dellist); ret = del_perf_probe_events(params.dellist);
strlist__delete(params.dellist); strlist__delete(params.dellist);
if (params.nevents == 0) if (ret < 0) {
return 0; pr_err(" Error: Failed to delete events. (%d)\n", ret);
return ret;
}
} }
add_perf_probe_events(params.events, params.nevents, params.force_add); if (params.nevents) {
ret = add_perf_probe_events(params.events, params.nevents,
params.force_add);
if (ret < 0) {
pr_err(" Error: Failed to add events. (%d)\n", ret);
return ret;
}
}
return 0; return 0;
} }

28
tools/perf/util/hist.c
View File

@@ -68,7 +68,7 @@ hist_entry__cmp(struct hist_entry *left, struct hist_entry *right)
int64_t cmp = 0; int64_t cmp = 0;
list_for_each_entry(se, &hist_entry__sort_list, list) { list_for_each_entry(se, &hist_entry__sort_list, list) {
cmp = se->cmp(left, right); cmp = se->se_cmp(left, right);
if (cmp) if (cmp)
break; break;
} }
@@ -85,7 +85,7 @@ hist_entry__collapse(struct hist_entry *left, struct hist_entry *right)
list_for_each_entry(se, &hist_entry__sort_list, list) { list_for_each_entry(se, &hist_entry__sort_list, list) {
int64_t (*f)(struct hist_entry *, struct hist_entry *); int64_t (*f)(struct hist_entry *, struct hist_entry *);
f = se->collapse ?: se->cmp; f = se->se_collapse ?: se->se_cmp;
cmp = f(left, right); cmp = f(left, right);
if (cmp) if (cmp)
@@ -536,8 +536,8 @@ int hist_entry__snprintf(struct hist_entry *self,
continue; continue;
ret += snprintf(s + ret, size - ret, "%s", sep ?: " "); ret += snprintf(s + ret, size - ret, "%s", sep ?: " ");
ret += se->snprintf(self, s + ret, size - ret, ret += se->se_snprintf(self, s + ret, size - ret,
se->width ? *se->width : 0); se->se_width ? *se->se_width : 0);
} }
return ret; return ret;
@@ -564,7 +564,7 @@ static size_t hist_entry__fprintf_callchain(struct hist_entry *self, FILE *fp,
if (sort__first_dimension == SORT_COMM) { if (sort__first_dimension == SORT_COMM) {
struct sort_entry *se = list_first_entry(&hist_entry__sort_list, struct sort_entry *se = list_first_entry(&hist_entry__sort_list,
typeof(*se), list); typeof(*se), list);
left_margin = se->width ? *se->width : 0; left_margin = se->se_width ? *se->se_width : 0;
left_margin -= thread__comm_len(self->thread); left_margin -= thread__comm_len(self->thread);
} }
@@ -615,22 +615,22 @@ size_t perf_session__fprintf_hists(struct rb_root *hists,
if (se->elide) if (se->elide)
continue; continue;
if (sep) { if (sep) {
fprintf(fp, "%c%s", *sep, se->header); fprintf(fp, "%c%s", *sep, se->se_header);
continue; continue;
} }
width = strlen(se->header); width = strlen(se->se_header);
if (se->width) { if (se->se_width) {
if (symbol_conf.col_width_list_str) { if (symbol_conf.col_width_list_str) {
if (col_width) { if (col_width) {
*se->width = atoi(col_width); *se->se_width = atoi(col_width);
col_width = strchr(col_width, ','); col_width = strchr(col_width, ',');
if (col_width) if (col_width)
++col_width; ++col_width;
} }
} }
width = *se->width = max(*se->width, width); width = *se->se_width = max(*se->se_width, width);
} }
fprintf(fp, " %*s", width, se->header); fprintf(fp, " %*s", width, se->se_header);
} }
fprintf(fp, "\n"); fprintf(fp, "\n");
@@ -652,10 +652,10 @@ size_t perf_session__fprintf_hists(struct rb_root *hists,
continue; continue;
fprintf(fp, " "); fprintf(fp, " ");
if (se->width) if (se->se_width)
width = *se->width; width = *se->se_width;
else else
width = strlen(se->header); width = strlen(se->se_header);
for (i = 0; i < width; i++) for (i = 0; i < width; i++)
fprintf(fp, "."); fprintf(fp, ".");
} }

900
tools/perf/util/probe-event.c
View File

File diff suppressed because it is too large Load Diff

33
tools/perf/util/probe-event.h
View File

@@ -23,6 +23,7 @@ struct kprobe_trace_arg_ref {
struct kprobe_trace_arg { struct kprobe_trace_arg {
char *name; /* Argument name */ char *name; /* Argument name */
char *value; /* Base value */ char *value; /* Base value */
char *type; /* Type name */
struct kprobe_trace_arg_ref *ref; /* Referencing offset */ struct kprobe_trace_arg_ref *ref; /* Referencing offset */
}; };
@@ -55,6 +56,8 @@ struct perf_probe_arg_field {
/* Perf probe probing argument */ /* Perf probe probing argument */
struct perf_probe_arg { struct perf_probe_arg {
char *name; /* Argument name */ char *name; /* Argument name */
char *var; /* Variable name */
char *type; /* Type name */
struct perf_probe_arg_field *field; /* Structure fields */ struct perf_probe_arg_field *field; /* Structure fields */
}; };
@@ -71,25 +74,25 @@ struct perf_probe_event {
/* Line number container */ /* Line number container */
struct line_node { struct line_node {
struct list_head list; struct list_head list;
unsigned int line; int line;
}; };
/* Line range */ /* Line range */
struct line_range { struct line_range {
char *file; /* File name */ char *file; /* File name */
char *function; /* Function name */ char *function; /* Function name */
unsigned int start; /* Start line number */ int start; /* Start line number */
unsigned int end; /* End line number */ int end; /* End line number */
int offset; /* Start line offset */ int offset; /* Start line offset */
char *path; /* Real path name */ char *path; /* Real path name */
struct list_head line_list; /* Visible lines */ struct list_head line_list; /* Visible lines */
}; };
/* Command string to events */ /* Command string to events */
extern void parse_perf_probe_command(const char *cmd, extern int parse_perf_probe_command(const char *cmd,
struct perf_probe_event *pev); struct perf_probe_event *pev);
extern void parse_kprobe_trace_command(const char *cmd, extern int parse_kprobe_trace_command(const char *cmd,
struct kprobe_trace_event *tev); struct kprobe_trace_event *tev);
/* Events to command string */ /* Events to command string */
extern char *synthesize_perf_probe_command(struct perf_probe_event *pev); extern char *synthesize_perf_probe_command(struct perf_probe_event *pev);
@@ -101,22 +104,22 @@ extern int synthesize_perf_probe_arg(struct perf_probe_arg *pa, char *buf,
extern bool perf_probe_event_need_dwarf(struct perf_probe_event *pev); extern bool perf_probe_event_need_dwarf(struct perf_probe_event *pev);
/* Convert from kprobe_trace_event to perf_probe_event */ /* Convert from kprobe_trace_event to perf_probe_event */
extern void convert_to_perf_probe_event(struct kprobe_trace_event *tev, extern int convert_to_perf_probe_event(struct kprobe_trace_event *tev,
struct perf_probe_event *pev); struct perf_probe_event *pev);
/* Release event contents */ /* Release event contents */
extern void clear_perf_probe_event(struct perf_probe_event *pev); extern void clear_perf_probe_event(struct perf_probe_event *pev);
extern void clear_kprobe_trace_event(struct kprobe_trace_event *tev); extern void clear_kprobe_trace_event(struct kprobe_trace_event *tev);
/* Command string to line-range */ /* Command string to line-range */
extern void parse_line_range_desc(const char *cmd, struct line_range *lr); extern int parse_line_range_desc(const char *cmd, struct line_range *lr);
extern void add_perf_probe_events(struct perf_probe_event *pevs, int ntevs, extern int add_perf_probe_events(struct perf_probe_event *pevs, int ntevs,
bool force_add); bool force_add);
extern void del_perf_probe_events(struct strlist *dellist); extern int del_perf_probe_events(struct strlist *dellist);
extern void show_perf_probe_events(void); extern int show_perf_probe_events(void);
extern void show_line_range(struct line_range *lr); extern int show_line_range(struct line_range *lr);
/* Maximum index number of event-name postfix */ /* Maximum index number of event-name postfix */

755
tools/perf/util/probe-finder.c
View File

File diff suppressed because it is too large Load Diff

1
tools/perf/util/probe-finder.h
View File

@@ -42,6 +42,7 @@ struct probe_finder {
struct list_head lcache; /* Line cache for lazy match */ struct list_head lcache; /* Line cache for lazy match */
/* For variable searching */ /* For variable searching */
Dwarf_CFI *cfi; /* Call Frame Information */
Dwarf_Op *fb_ops; /* Frame base attribute */ Dwarf_Op *fb_ops; /* Frame base attribute */
struct perf_probe_arg *pvar; /* Current target variable */ struct perf_probe_arg *pvar; /* Current target variable */
struct kprobe_trace_arg *tvar; /* Current result variable */ struct kprobe_trace_arg *tvar; /* Current result variable */

42
tools/perf/util/sort.c
View File

@@ -30,38 +30,38 @@ static int hist_entry__parent_snprintf(struct hist_entry *self, char *bf,
size_t size, unsigned int width); size_t size, unsigned int width);
struct sort_entry sort_thread = { struct sort_entry sort_thread = {
.header = "Command: Pid", .se_header = "Command: Pid",
.cmp = sort__thread_cmp, .se_cmp = sort__thread_cmp,
.snprintf = hist_entry__thread_snprintf, .se_snprintf = hist_entry__thread_snprintf,
.width = &threads__col_width, .se_width = &threads__col_width,
}; };
struct sort_entry sort_comm = { struct sort_entry sort_comm = {
.header = "Command", .se_header = "Command",
.cmp = sort__comm_cmp, .se_cmp = sort__comm_cmp,
.collapse = sort__comm_collapse, .se_collapse = sort__comm_collapse,
.snprintf = hist_entry__comm_snprintf, .se_snprintf = hist_entry__comm_snprintf,
.width = &comms__col_width, .se_width = &comms__col_width,
}; };
struct sort_entry sort_dso = { struct sort_entry sort_dso = {
.header = "Shared Object", .se_header = "Shared Object",
.cmp = sort__dso_cmp, .se_cmp = sort__dso_cmp,
.snprintf = hist_entry__dso_snprintf, .se_snprintf = hist_entry__dso_snprintf,
.width = &dsos__col_width, .se_width = &dsos__col_width,
}; };
struct sort_entry sort_sym = { struct sort_entry sort_sym = {
.header = "Symbol", .se_header = "Symbol",
.cmp = sort__sym_cmp, .se_cmp = sort__sym_cmp,
.snprintf = hist_entry__sym_snprintf, .se_snprintf = hist_entry__sym_snprintf,
}; };
struct sort_entry sort_parent = { struct sort_entry sort_parent = {
.header = "Parent symbol", .se_header = "Parent symbol",
.cmp = sort__parent_cmp, .se_cmp = sort__parent_cmp,
.snprintf = hist_entry__parent_snprintf, .se_snprintf = hist_entry__parent_snprintf,
.width = &parent_symbol__col_width, .se_width = &parent_symbol__col_width,
}; };
struct sort_dimension { struct sort_dimension {
@@ -255,7 +255,7 @@ int sort_dimension__add(const char *tok)
if (strncasecmp(tok, sd->name, strlen(tok))) if (strncasecmp(tok, sd->name, strlen(tok)))
continue; continue;
if (sd->entry->collapse) if (sd->entry->se_collapse)
sort__need_collapse = 1; sort__need_collapse = 1;
if (sd->entry == &sort_parent) { if (sd->entry == &sort_parent) {

12
tools/perf/util/sort.h
View File

@@ -78,13 +78,13 @@ enum sort_type {
struct sort_entry { struct sort_entry {
struct list_head list; struct list_head list;
const char *header; const char *se_header;
int64_t (*cmp)(struct hist_entry *, struct hist_entry *); int64_t (*se_cmp)(struct hist_entry *, struct hist_entry *);
int64_t (*collapse)(struct hist_entry *, struct hist_entry *); int64_t (*se_collapse)(struct hist_entry *, struct hist_entry *);
int (*snprintf)(struct hist_entry *self, char *bf, size_t size, int (*se_snprintf)(struct hist_entry *self, char *bf, size_t size,
unsigned int width); unsigned int width);
unsigned int *width; unsigned int *se_width;
bool elide; bool elide;
}; };