OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tracing: probeevent: Unify fetch type tables 

Unify {k,u}probe_fetch_type_table to probe_fetch_type_table
because the main difference of those type tables (fetcharg
methods) are gone. Now we can consolidate it.

Link: http://lkml.kernel.org/r/152465871274.26224.13999436317830479698.stgit@devbox

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Masami Hiramatsu 2018-04-25 21:18:32 +09:00 committed by Steven Rostedt (VMware)
parent 533059281e
commit f451bc89d8
4 changed files with 39 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
kernel/trace/trace_kprobe.c
View File

@ -121,30 +121,6 @@ static int kprobe_dispatcher(struct kprobe *kp, struct pt_regs *regs);
static int kretprobe_dispatcher(struct kretprobe_instance *ri, static int kretprobe_dispatcher(struct kretprobe_instance *ri,
struct pt_regs *regs); struct pt_regs *regs);
/* Fetch type information table */
static const struct fetch_type kprobes_fetch_type_table[] = {
/* Special types */
[FETCH_TYPE_STRING] = __ASSIGN_FETCH_TYPE("string", string, string,
sizeof(u32), 1, "__data_loc char[]"),
[FETCH_TYPE_STRSIZE] = __ASSIGN_FETCH_TYPE("string_size", u32,
string_size, sizeof(u32), 0, "u32"),
/* Basic types */
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),
ASSIGN_FETCH_TYPE_ALIAS(x8, u8, u8, 0),
ASSIGN_FETCH_TYPE_ALIAS(x16, u16, u16, 0),
ASSIGN_FETCH_TYPE_ALIAS(x32, u32, u32, 0),
ASSIGN_FETCH_TYPE_ALIAS(x64, u64, u64, 0),
ASSIGN_FETCH_TYPE_END
};
/* /*
* Allocate new trace_probe and initialize it (including kprobes). * Allocate new trace_probe and initialize it (including kprobes).
*/ */
@ -720,8 +696,7 @@ static int create_trace_kprobe(int argc, char **argv)
/* Parse fetch argument */ /* Parse fetch argument */
ret = traceprobe_parse_probe_arg(arg, &tk->tp.size, parg, ret = traceprobe_parse_probe_arg(arg, &tk->tp.size, parg,
is_return, true, is_return, true);
kprobes_fetch_type_table);
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);
goto error; goto error;

54
kernel/trace/trace_probe.c
View File

@ -61,8 +61,29 @@ int PRINT_TYPE_FUNC_NAME(string)(struct trace_seq *s, void *data, void *ent)
const char PRINT_TYPE_FMT_NAME(string)[] = "\\\"%s\\\""; const char PRINT_TYPE_FMT_NAME(string)[] = "\\\"%s\\\"";
static const struct fetch_type *find_fetch_type(const char *type, /* Fetch type information table */
const struct fetch_type *ftbl) static const struct fetch_type probe_fetch_types[] = {
/* Special types */
__ASSIGN_FETCH_TYPE("string", string, string, sizeof(u32), 1,
"__data_loc char[]"),
/* Basic types */
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),
ASSIGN_FETCH_TYPE_ALIAS(x8, u8, u8, 0),
ASSIGN_FETCH_TYPE_ALIAS(x16, u16, u16, 0),
ASSIGN_FETCH_TYPE_ALIAS(x32, u32, u32, 0),
ASSIGN_FETCH_TYPE_ALIAS(x64, u64, u64, 0),
ASSIGN_FETCH_TYPE_END
};
static const struct fetch_type *find_fetch_type(const char *type)
{ {
int i; int i;
@ -83,21 +104,21 @@ static const struct fetch_type *find_fetch_type(const char *type,
switch (bs) { switch (bs) {
case 8: case 8:
return find_fetch_type("u8", ftbl); return find_fetch_type("u8");
case 16: case 16:
return find_fetch_type("u16", ftbl); return find_fetch_type("u16");
case 32: case 32:
return find_fetch_type("u32", ftbl); return find_fetch_type("u32");
case 64: case 64:
return find_fetch_type("u64", ftbl); return find_fetch_type("u64");
default: default:
goto fail; goto fail;
} }
} }
for (i = 0; ftbl[i].name; i++) { for (i = 0; probe_fetch_types[i].name; i++) {
if (strcmp(type, ftbl[i].name) == 0) if (strcmp(type, probe_fetch_types[i].name) == 0)
return &ftbl[i]; return &probe_fetch_types[i];
} }
fail: fail:
@ -164,8 +185,7 @@ static int parse_probe_vars(char *arg, const struct fetch_type *t,
static int static int
parse_probe_arg(char *arg, const struct fetch_type *type, parse_probe_arg(char *arg, const struct fetch_type *type,
struct fetch_insn **pcode, struct fetch_insn *end, struct fetch_insn **pcode, struct fetch_insn *end,
bool is_return, bool is_kprobe, bool is_return, bool is_kprobe)
const struct fetch_type *ftbl)
{ {
struct fetch_insn *code = *pcode; struct fetch_insn *code = *pcode;
unsigned long param; unsigned long param;
@ -247,12 +267,11 @@ parse_probe_arg(char *arg, const struct fetch_type *type,
tmp = strrchr(arg, ')'); tmp = strrchr(arg, ')');
if (tmp) { if (tmp) {
const struct fetch_type *t2; const struct fetch_type *t2 = find_fetch_type(NULL);
t2 = find_fetch_type(NULL, ftbl);
*tmp = '\0'; *tmp = '\0';
ret = parse_probe_arg(arg, t2, &code, end, is_return, ret = parse_probe_arg(arg, t2, &code, end, is_return,
is_kprobe, ftbl); is_kprobe);
if (ret) if (ret)
break; break;
if (code->op == FETCH_OP_COMM) if (code->op == FETCH_OP_COMM)
@ -312,8 +331,7 @@ static int __parse_bitfield_probe_arg(const char *bf,
/* String length checking wrapper */ /* String length checking wrapper */
int traceprobe_parse_probe_arg(char *arg, ssize_t *size, int traceprobe_parse_probe_arg(char *arg, ssize_t *size,
struct probe_arg *parg, bool is_return, bool is_kprobe, struct probe_arg *parg, bool is_return, bool is_kprobe)
const struct fetch_type *ftbl)
{ {
struct fetch_insn *code, *tmp = NULL; struct fetch_insn *code, *tmp = NULL;
const char *t; const char *t;
@ -339,7 +357,7 @@ int traceprobe_parse_probe_arg(char *arg, ssize_t *size,
*/ */
if (!t && strcmp(arg, "$comm") == 0) if (!t && strcmp(arg, "$comm") == 0)
t = "string"; t = "string";
parg->type = find_fetch_type(t, ftbl); parg->type = find_fetch_type(t);
if (!parg->type) { if (!parg->type) {
pr_info("Unsupported type: %s\n", t); pr_info("Unsupported type: %s\n", t);
return -EINVAL; return -EINVAL;
@ -353,7 +371,7 @@ int traceprobe_parse_probe_arg(char *arg, ssize_t *size,
code[FETCH_INSN_MAX - 1].op = FETCH_OP_END; code[FETCH_INSN_MAX - 1].op = FETCH_OP_END;
ret = parse_probe_arg(arg, parg->type, &code, &code[FETCH_INSN_MAX - 1], ret = parse_probe_arg(arg, parg->type, &code, &code[FETCH_INSN_MAX - 1],
is_return, is_kprobe, ftbl); is_return, is_kprobe);
if (ret) if (ret)
goto fail; goto fail;

6
kernel/trace/trace_probe.h
View File

@ -184,9 +184,6 @@ DECLARE_BASIC_PRINT_TYPE_FUNC(string);
#define ASSIGN_FETCH_TYPE_END {} #define ASSIGN_FETCH_TYPE_END {}
#define FETCH_TYPE_STRING 0
#define FETCH_TYPE_STRSIZE 1
#ifdef CONFIG_KPROBE_EVENTS #ifdef CONFIG_KPROBE_EVENTS
bool trace_kprobe_on_func_entry(struct trace_event_call *call); bool trace_kprobe_on_func_entry(struct trace_event_call *call);
bool trace_kprobe_error_injectable(struct trace_event_call *call); bool trace_kprobe_error_injectable(struct trace_event_call *call);
@ -261,8 +258,7 @@ find_event_file_link(struct trace_probe *tp, struct trace_event_file *file)
} }
extern int traceprobe_parse_probe_arg(char *arg, ssize_t *size, extern int traceprobe_parse_probe_arg(char *arg, ssize_t *size,
struct probe_arg *parg, bool is_return, bool is_kprobe, struct probe_arg *parg, bool is_return, bool is_kprobe);
const struct fetch_type *ftbl);
extern int traceprobe_conflict_field_name(const char *name, extern int traceprobe_conflict_field_name(const char *name,
struct probe_arg *args, int narg); struct probe_arg *args, int narg);

27
kernel/trace/trace_uprobe.c
View File

@ -161,30 +161,6 @@ static unsigned long translate_user_vaddr(unsigned long file_offset)
return base_addr + file_offset; return base_addr + file_offset;
} }
/* Fetch type information table */
static const struct fetch_type uprobes_fetch_type_table[] = {
/* Special types */
[FETCH_TYPE_STRING] = __ASSIGN_FETCH_TYPE("string", string, string,
sizeof(u32), 1, "__data_loc char[]"),
[FETCH_TYPE_STRSIZE] = __ASSIGN_FETCH_TYPE("string_size", u32,
string_size, sizeof(u32), 0, "u32"),
/* Basic types */
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),
ASSIGN_FETCH_TYPE_ALIAS(x8, u8, u8, 0),
ASSIGN_FETCH_TYPE_ALIAS(x16, u16, u16, 0),
ASSIGN_FETCH_TYPE_ALIAS(x32, u32, u32, 0),
ASSIGN_FETCH_TYPE_ALIAS(x64, u64, u64, 0),
ASSIGN_FETCH_TYPE_END
};
/* Note that we don't verify it, since the code does not come from user space */ /* Note that we don't verify it, since the code does not come from user space */
static int static int
process_fetch_insn(struct fetch_insn *code, struct pt_regs *regs, void *dest, process_fetch_insn(struct fetch_insn *code, struct pt_regs *regs, void *dest,
@ -621,8 +597,7 @@ static int create_trace_uprobe(int argc, char **argv)
/* Parse fetch argument */ /* Parse fetch argument */
ret = traceprobe_parse_probe_arg(arg, &tu->tp.size, parg, ret = traceprobe_parse_probe_arg(arg, &tu->tp.size, parg,
is_return, false, is_return, false);
uprobes_fetch_type_table);
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);
goto error; goto error;