[for-next][PATCH 06/17] tracing/probes: Integrate duplicate set_print_fmt()
From: Namhyung Kim The set_print_fmt() functions are implemented almost same for [ku]probes. Move it to a common place and get rid of the duplication. Acked-by: Masami Hiramatsu Acked-by: Oleg Nesterov Cc: Srikar Dronamraju Cc: zhangwei(Jovi) Cc: Arnaldo Carvalho de Melo Signed-off-by: Namhyung Kim --- kernel/trace/trace_kprobe.c | 63 + kernel/trace/trace_probe.c | 62 kernel/trace/trace_probe.h | 2 ++ kernel/trace/trace_uprobe.c | 55 +-- 4 files changed, 66 insertions(+), 116 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index fb1a027..c9ffdaf 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -964,67 +964,6 @@ static int kretprobe_event_define_fields(struct ftrace_event_call *event_call) return 0; } -static int __set_print_fmt(struct trace_kprobe *tk, char *buf, int len) -{ - int i; - int pos = 0; - - const char *fmt, *arg; - - if (!trace_kprobe_is_return(tk)) { - fmt = "(%lx)"; - arg = "REC->" FIELD_STRING_IP; - } else { - fmt = "(%lx <- %lx)"; - arg = "REC->" FIELD_STRING_FUNC ", REC->" FIELD_STRING_RETIP; - } - - /* When len=0, we just calculate the needed length */ -#define LEN_OR_ZERO (len ? len - pos : 0) - - pos += snprintf(buf + pos, LEN_OR_ZERO, "\"%s", fmt); - - for (i = 0; i < tk->tp.nr_args; i++) { - pos += snprintf(buf + pos, LEN_OR_ZERO, " %s=%s", - tk->tp.args[i].name, tk->tp.args[i].type->fmt); - } - - pos += snprintf(buf + pos, LEN_OR_ZERO, "\", %s", arg); - - for (i = 0; i < tk->tp.nr_args; i++) { - if (strcmp(tk->tp.args[i].type->name, "string") == 0) - pos += snprintf(buf + pos, LEN_OR_ZERO, - ", __get_str(%s)", - tk->tp.args[i].name); - else - pos += snprintf(buf + pos, LEN_OR_ZERO, ", REC->%s", - tk->tp.args[i].name); - } - -#undef LEN_OR_ZERO - - /* return the length of print_fmt */ - return pos; -} - -static int set_print_fmt(struct trace_kprobe *tk) -{ - int len; - char *print_fmt; - - /* First: called with 0 length to calculate the needed length */ - len = __set_print_fmt(tk, NULL, 0); - print_fmt = kmalloc(len + 1, GFP_KERNEL); - if (!print_fmt) - return -ENOMEM; - - /* Second: actually write the @print_fmt */ - __set_print_fmt(tk, print_fmt, len + 1); - tk->tp.call.print_fmt = print_fmt; - - return 0; -} - #ifdef CONFIG_PERF_EVENTS /* Kprobe profile handler */ @@ -1175,7 +1114,7 @@ static int register_kprobe_event(struct trace_kprobe *tk) call->event.funcs = _funcs; call->class->define_fields = kprobe_event_define_fields; } - if (set_print_fmt(tk) < 0) + if (set_print_fmt(>tp, trace_kprobe_is_return(tk)) < 0) return -ENOMEM; ret = register_ftrace_event(>event); if (!ret) { diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index 430505b..d8347b0 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -837,3 +837,65 @@ out: return ret; } + +static int __set_print_fmt(struct trace_probe *tp, char *buf, int len, + bool is_return) +{ + int i; + int pos = 0; + + const char *fmt, *arg; + + if (!is_return) { + fmt = "(%lx)"; + arg = "REC->" FIELD_STRING_IP; + } else { + fmt = "(%lx <- %lx)"; + arg = "REC->" FIELD_STRING_FUNC ", REC->" FIELD_STRING_RETIP; + } + + /* When len=0, we just calculate the needed length */ +#define LEN_OR_ZERO (len ? len - pos : 0) + + pos += snprintf(buf + pos, LEN_OR_ZERO, "\"%s", fmt); + + for (i = 0; i < tp->nr_args; i++) { + pos += snprintf(buf + pos, LEN_OR_ZERO, " %s=%s", + tp->args[i].name, tp->args[i].type->fmt); + } + + pos += snprintf(buf + pos, LEN_OR_ZERO, "\", %s", arg); + + for (i = 0; i < tp->nr_args; i++) { + if (strcmp(tp->args[i].type->name, "string") == 0) + pos += snprintf(buf + pos, LEN_OR_ZERO, + ", __get_str(%s)", + tp->args[i].name); + else + pos += snprintf(buf + pos, LEN_OR_ZERO, ", REC->%s", + tp->args[i].name); + } + +#undef LEN_OR_ZERO + + /* return the length of print_fmt */ + return pos; +} + +int set_print_fmt(struct trace_probe *tp, bool
[for-next][PATCH 06/17] tracing/probes: Integrate duplicate set_print_fmt()
From: Namhyung Kim namhyung@lge.com The set_print_fmt() functions are implemented almost same for [ku]probes. Move it to a common place and get rid of the duplication. Acked-by: Masami Hiramatsu masami.hiramatsu...@hitachi.com Acked-by: Oleg Nesterov o...@redhat.com Cc: Srikar Dronamraju sri...@linux.vnet.ibm.com Cc: zhangwei(Jovi) jovi.zhang...@huawei.com Cc: Arnaldo Carvalho de Melo a...@ghostprotocols.net Signed-off-by: Namhyung Kim namhy...@kernel.org --- kernel/trace/trace_kprobe.c | 63 + kernel/trace/trace_probe.c | 62 kernel/trace/trace_probe.h | 2 ++ kernel/trace/trace_uprobe.c | 55 +-- 4 files changed, 66 insertions(+), 116 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index fb1a027..c9ffdaf 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -964,67 +964,6 @@ static int kretprobe_event_define_fields(struct ftrace_event_call *event_call) return 0; } -static int __set_print_fmt(struct trace_kprobe *tk, char *buf, int len) -{ - int i; - int pos = 0; - - const char *fmt, *arg; - - if (!trace_kprobe_is_return(tk)) { - fmt = (%lx); - arg = REC- FIELD_STRING_IP; - } else { - fmt = (%lx - %lx); - arg = REC- FIELD_STRING_FUNC , REC- FIELD_STRING_RETIP; - } - - /* When len=0, we just calculate the needed length */ -#define LEN_OR_ZERO (len ? len - pos : 0) - - pos += snprintf(buf + pos, LEN_OR_ZERO, \%s, fmt); - - for (i = 0; i tk-tp.nr_args; i++) { - pos += snprintf(buf + pos, LEN_OR_ZERO, %s=%s, - tk-tp.args[i].name, tk-tp.args[i].type-fmt); - } - - pos += snprintf(buf + pos, LEN_OR_ZERO, \, %s, arg); - - for (i = 0; i tk-tp.nr_args; i++) { - if (strcmp(tk-tp.args[i].type-name, string) == 0) - pos += snprintf(buf + pos, LEN_OR_ZERO, - , __get_str(%s), - tk-tp.args[i].name); - else - pos += snprintf(buf + pos, LEN_OR_ZERO, , REC-%s, - tk-tp.args[i].name); - } - -#undef LEN_OR_ZERO - - /* return the length of print_fmt */ - return pos; -} - -static int set_print_fmt(struct trace_kprobe *tk) -{ - int len; - char *print_fmt; - - /* First: called with 0 length to calculate the needed length */ - len = __set_print_fmt(tk, NULL, 0); - print_fmt = kmalloc(len + 1, GFP_KERNEL); - if (!print_fmt) - return -ENOMEM; - - /* Second: actually write the @print_fmt */ - __set_print_fmt(tk, print_fmt, len + 1); - tk-tp.call.print_fmt = print_fmt; - - return 0; -} - #ifdef CONFIG_PERF_EVENTS /* Kprobe profile handler */ @@ -1175,7 +1114,7 @@ static int register_kprobe_event(struct trace_kprobe *tk) call-event.funcs = kprobe_funcs; call-class-define_fields = kprobe_event_define_fields; } - if (set_print_fmt(tk) 0) + if (set_print_fmt(tk-tp, trace_kprobe_is_return(tk)) 0) return -ENOMEM; ret = register_ftrace_event(call-event); if (!ret) { diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index 430505b..d8347b0 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -837,3 +837,65 @@ out: return ret; } + +static int __set_print_fmt(struct trace_probe *tp, char *buf, int len, + bool is_return) +{ + int i; + int pos = 0; + + const char *fmt, *arg; + + if (!is_return) { + fmt = (%lx); + arg = REC- FIELD_STRING_IP; + } else { + fmt = (%lx - %lx); + arg = REC- FIELD_STRING_FUNC , REC- FIELD_STRING_RETIP; + } + + /* When len=0, we just calculate the needed length */ +#define LEN_OR_ZERO (len ? len - pos : 0) + + pos += snprintf(buf + pos, LEN_OR_ZERO, \%s, fmt); + + for (i = 0; i tp-nr_args; i++) { + pos += snprintf(buf + pos, LEN_OR_ZERO, %s=%s, + tp-args[i].name, tp-args[i].type-fmt); + } + + pos += snprintf(buf + pos, LEN_OR_ZERO, \, %s, arg); + + for (i = 0; i tp-nr_args; i++) { + if (strcmp(tp-args[i].type-name, string) == 0) + pos += snprintf(buf + pos, LEN_OR_ZERO, + , __get_str(%s), + tp-args[i].name); + else + pos += snprintf(buf + pos, LEN_OR_ZERO, , REC-%s, + tp-args[i].name); + } + +#undef LEN_OR_ZERO + + /* return the length of
[PATCH 06/17] tracing/probes: Integrate duplicate set_print_fmt()
From: Namhyung Kim The set_print_fmt() functions are implemented almost same for [ku]probes. Move it to a common place and get rid of the duplication. Acked-by: Masami Hiramatsu Cc: Srikar Dronamraju Cc: Oleg Nesterov Cc: zhangwei(Jovi) Cc: Arnaldo Carvalho de Melo Signed-off-by: Namhyung Kim --- kernel/trace/trace_kprobe.c | 63 + kernel/trace/trace_probe.c | 62 kernel/trace/trace_probe.h | 2 ++ kernel/trace/trace_uprobe.c | 55 +-- 4 files changed, 66 insertions(+), 116 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 0167d4b92431..62d6c961bbce 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -964,67 +964,6 @@ static int kretprobe_event_define_fields(struct ftrace_event_call *event_call) return 0; } -static int __set_print_fmt(struct trace_kprobe *tk, char *buf, int len) -{ - int i; - int pos = 0; - - const char *fmt, *arg; - - if (!trace_kprobe_is_return(tk)) { - fmt = "(%lx)"; - arg = "REC->" FIELD_STRING_IP; - } else { - fmt = "(%lx <- %lx)"; - arg = "REC->" FIELD_STRING_FUNC ", REC->" FIELD_STRING_RETIP; - } - - /* When len=0, we just calculate the needed length */ -#define LEN_OR_ZERO (len ? len - pos : 0) - - pos += snprintf(buf + pos, LEN_OR_ZERO, "\"%s", fmt); - - for (i = 0; i < tk->tp.nr_args; i++) { - pos += snprintf(buf + pos, LEN_OR_ZERO, " %s=%s", - tk->tp.args[i].name, tk->tp.args[i].type->fmt); - } - - pos += snprintf(buf + pos, LEN_OR_ZERO, "\", %s", arg); - - for (i = 0; i < tk->tp.nr_args; i++) { - if (strcmp(tk->tp.args[i].type->name, "string") == 0) - pos += snprintf(buf + pos, LEN_OR_ZERO, - ", __get_str(%s)", - tk->tp.args[i].name); - else - pos += snprintf(buf + pos, LEN_OR_ZERO, ", REC->%s", - tk->tp.args[i].name); - } - -#undef LEN_OR_ZERO - - /* return the length of print_fmt */ - return pos; -} - -static int set_print_fmt(struct trace_kprobe *tk) -{ - int len; - char *print_fmt; - - /* First: called with 0 length to calculate the needed length */ - len = __set_print_fmt(tk, NULL, 0); - print_fmt = kmalloc(len + 1, GFP_KERNEL); - if (!print_fmt) - return -ENOMEM; - - /* Second: actually write the @print_fmt */ - __set_print_fmt(tk, print_fmt, len + 1); - tk->tp.call.print_fmt = print_fmt; - - return 0; -} - #ifdef CONFIG_PERF_EVENTS /* Kprobe profile handler */ @@ -1175,7 +1114,7 @@ static int register_kprobe_event(struct trace_kprobe *tk) call->event.funcs = _funcs; call->class->define_fields = kprobe_event_define_fields; } - if (set_print_fmt(tk) < 0) + if (set_print_fmt(>tp, trace_kprobe_is_return(tk)) < 0) return -ENOMEM; ret = register_ftrace_event(>event); if (!ret) { diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index 430505b08a6f..d8347b01ce89 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -837,3 +837,65 @@ out: return ret; } + +static int __set_print_fmt(struct trace_probe *tp, char *buf, int len, + bool is_return) +{ + int i; + int pos = 0; + + const char *fmt, *arg; + + if (!is_return) { + fmt = "(%lx)"; + arg = "REC->" FIELD_STRING_IP; + } else { + fmt = "(%lx <- %lx)"; + arg = "REC->" FIELD_STRING_FUNC ", REC->" FIELD_STRING_RETIP; + } + + /* When len=0, we just calculate the needed length */ +#define LEN_OR_ZERO (len ? len - pos : 0) + + pos += snprintf(buf + pos, LEN_OR_ZERO, "\"%s", fmt); + + for (i = 0; i < tp->nr_args; i++) { + pos += snprintf(buf + pos, LEN_OR_ZERO, " %s=%s", + tp->args[i].name, tp->args[i].type->fmt); + } + + pos += snprintf(buf + pos, LEN_OR_ZERO, "\", %s", arg); + + for (i = 0; i < tp->nr_args; i++) { + if (strcmp(tp->args[i].type->name, "string") == 0) + pos += snprintf(buf + pos, LEN_OR_ZERO, + ", __get_str(%s)", + tp->args[i].name); + else + pos += snprintf(buf + pos, LEN_OR_ZERO, ", REC->%s", + tp->args[i].name); + } + +#undef LEN_OR_ZERO + + /* return the length of print_fmt */ + return pos; +} + +int set_print_fmt(struct
[PATCH 06/17] tracing/probes: Integrate duplicate set_print_fmt()
From: Namhyung Kim namhyung@lge.com The set_print_fmt() functions are implemented almost same for [ku]probes. Move it to a common place and get rid of the duplication. Acked-by: Masami Hiramatsu masami.hiramatsu...@hitachi.com Cc: Srikar Dronamraju sri...@linux.vnet.ibm.com Cc: Oleg Nesterov o...@redhat.com Cc: zhangwei(Jovi) jovi.zhang...@huawei.com Cc: Arnaldo Carvalho de Melo a...@ghostprotocols.net Signed-off-by: Namhyung Kim namhy...@kernel.org --- kernel/trace/trace_kprobe.c | 63 + kernel/trace/trace_probe.c | 62 kernel/trace/trace_probe.h | 2 ++ kernel/trace/trace_uprobe.c | 55 +-- 4 files changed, 66 insertions(+), 116 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 0167d4b92431..62d6c961bbce 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -964,67 +964,6 @@ static int kretprobe_event_define_fields(struct ftrace_event_call *event_call) return 0; } -static int __set_print_fmt(struct trace_kprobe *tk, char *buf, int len) -{ - int i; - int pos = 0; - - const char *fmt, *arg; - - if (!trace_kprobe_is_return(tk)) { - fmt = (%lx); - arg = REC- FIELD_STRING_IP; - } else { - fmt = (%lx - %lx); - arg = REC- FIELD_STRING_FUNC , REC- FIELD_STRING_RETIP; - } - - /* When len=0, we just calculate the needed length */ -#define LEN_OR_ZERO (len ? len - pos : 0) - - pos += snprintf(buf + pos, LEN_OR_ZERO, \%s, fmt); - - for (i = 0; i tk-tp.nr_args; i++) { - pos += snprintf(buf + pos, LEN_OR_ZERO, %s=%s, - tk-tp.args[i].name, tk-tp.args[i].type-fmt); - } - - pos += snprintf(buf + pos, LEN_OR_ZERO, \, %s, arg); - - for (i = 0; i tk-tp.nr_args; i++) { - if (strcmp(tk-tp.args[i].type-name, string) == 0) - pos += snprintf(buf + pos, LEN_OR_ZERO, - , __get_str(%s), - tk-tp.args[i].name); - else - pos += snprintf(buf + pos, LEN_OR_ZERO, , REC-%s, - tk-tp.args[i].name); - } - -#undef LEN_OR_ZERO - - /* return the length of print_fmt */ - return pos; -} - -static int set_print_fmt(struct trace_kprobe *tk) -{ - int len; - char *print_fmt; - - /* First: called with 0 length to calculate the needed length */ - len = __set_print_fmt(tk, NULL, 0); - print_fmt = kmalloc(len + 1, GFP_KERNEL); - if (!print_fmt) - return -ENOMEM; - - /* Second: actually write the @print_fmt */ - __set_print_fmt(tk, print_fmt, len + 1); - tk-tp.call.print_fmt = print_fmt; - - return 0; -} - #ifdef CONFIG_PERF_EVENTS /* Kprobe profile handler */ @@ -1175,7 +1114,7 @@ static int register_kprobe_event(struct trace_kprobe *tk) call-event.funcs = kprobe_funcs; call-class-define_fields = kprobe_event_define_fields; } - if (set_print_fmt(tk) 0) + if (set_print_fmt(tk-tp, trace_kprobe_is_return(tk)) 0) return -ENOMEM; ret = register_ftrace_event(call-event); if (!ret) { diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index 430505b08a6f..d8347b01ce89 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -837,3 +837,65 @@ out: return ret; } + +static int __set_print_fmt(struct trace_probe *tp, char *buf, int len, + bool is_return) +{ + int i; + int pos = 0; + + const char *fmt, *arg; + + if (!is_return) { + fmt = (%lx); + arg = REC- FIELD_STRING_IP; + } else { + fmt = (%lx - %lx); + arg = REC- FIELD_STRING_FUNC , REC- FIELD_STRING_RETIP; + } + + /* When len=0, we just calculate the needed length */ +#define LEN_OR_ZERO (len ? len - pos : 0) + + pos += snprintf(buf + pos, LEN_OR_ZERO, \%s, fmt); + + for (i = 0; i tp-nr_args; i++) { + pos += snprintf(buf + pos, LEN_OR_ZERO, %s=%s, + tp-args[i].name, tp-args[i].type-fmt); + } + + pos += snprintf(buf + pos, LEN_OR_ZERO, \, %s, arg); + + for (i = 0; i tp-nr_args; i++) { + if (strcmp(tp-args[i].type-name, string) == 0) + pos += snprintf(buf + pos, LEN_OR_ZERO, + , __get_str(%s), + tp-args[i].name); + else + pos += snprintf(buf + pos, LEN_OR_ZERO, , REC-%s, + tp-args[i].name); + } + +#undef LEN_OR_ZERO + + /* return the
[PATCH 06/17] tracing/probes: Integrate duplicate set_print_fmt()
From: Namhyung Kim The set_print_fmt() functions are implemented almost same for [ku]probes. Move it to a common place and get rid of the duplication. Acked-by: Masami Hiramatsu Cc: Srikar Dronamraju Cc: Oleg Nesterov Cc: zhangwei(Jovi) Cc: Arnaldo Carvalho de Melo Signed-off-by: Namhyung Kim --- kernel/trace/trace_kprobe.c | 63 + kernel/trace/trace_probe.c | 62 kernel/trace/trace_probe.h | 2 ++ kernel/trace/trace_uprobe.c | 55 +-- 4 files changed, 66 insertions(+), 116 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 0167d4b92431..62d6c961bbce 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -964,67 +964,6 @@ static int kretprobe_event_define_fields(struct ftrace_event_call *event_call) return 0; } -static int __set_print_fmt(struct trace_kprobe *tk, char *buf, int len) -{ - int i; - int pos = 0; - - const char *fmt, *arg; - - if (!trace_kprobe_is_return(tk)) { - fmt = "(%lx)"; - arg = "REC->" FIELD_STRING_IP; - } else { - fmt = "(%lx <- %lx)"; - arg = "REC->" FIELD_STRING_FUNC ", REC->" FIELD_STRING_RETIP; - } - - /* When len=0, we just calculate the needed length */ -#define LEN_OR_ZERO (len ? len - pos : 0) - - pos += snprintf(buf + pos, LEN_OR_ZERO, "\"%s", fmt); - - for (i = 0; i < tk->tp.nr_args; i++) { - pos += snprintf(buf + pos, LEN_OR_ZERO, " %s=%s", - tk->tp.args[i].name, tk->tp.args[i].type->fmt); - } - - pos += snprintf(buf + pos, LEN_OR_ZERO, "\", %s", arg); - - for (i = 0; i < tk->tp.nr_args; i++) { - if (strcmp(tk->tp.args[i].type->name, "string") == 0) - pos += snprintf(buf + pos, LEN_OR_ZERO, - ", __get_str(%s)", - tk->tp.args[i].name); - else - pos += snprintf(buf + pos, LEN_OR_ZERO, ", REC->%s", - tk->tp.args[i].name); - } - -#undef LEN_OR_ZERO - - /* return the length of print_fmt */ - return pos; -} - -static int set_print_fmt(struct trace_kprobe *tk) -{ - int len; - char *print_fmt; - - /* First: called with 0 length to calculate the needed length */ - len = __set_print_fmt(tk, NULL, 0); - print_fmt = kmalloc(len + 1, GFP_KERNEL); - if (!print_fmt) - return -ENOMEM; - - /* Second: actually write the @print_fmt */ - __set_print_fmt(tk, print_fmt, len + 1); - tk->tp.call.print_fmt = print_fmt; - - return 0; -} - #ifdef CONFIG_PERF_EVENTS /* Kprobe profile handler */ @@ -1175,7 +1114,7 @@ static int register_kprobe_event(struct trace_kprobe *tk) call->event.funcs = _funcs; call->class->define_fields = kprobe_event_define_fields; } - if (set_print_fmt(tk) < 0) + if (set_print_fmt(>tp, trace_kprobe_is_return(tk)) < 0) return -ENOMEM; ret = register_ftrace_event(>event); if (!ret) { diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index 430505b08a6f..d8347b01ce89 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -837,3 +837,65 @@ out: return ret; } + +static int __set_print_fmt(struct trace_probe *tp, char *buf, int len, + bool is_return) +{ + int i; + int pos = 0; + + const char *fmt, *arg; + + if (!is_return) { + fmt = "(%lx)"; + arg = "REC->" FIELD_STRING_IP; + } else { + fmt = "(%lx <- %lx)"; + arg = "REC->" FIELD_STRING_FUNC ", REC->" FIELD_STRING_RETIP; + } + + /* When len=0, we just calculate the needed length */ +#define LEN_OR_ZERO (len ? len - pos : 0) + + pos += snprintf(buf + pos, LEN_OR_ZERO, "\"%s", fmt); + + for (i = 0; i < tp->nr_args; i++) { + pos += snprintf(buf + pos, LEN_OR_ZERO, " %s=%s", + tp->args[i].name, tp->args[i].type->fmt); + } + + pos += snprintf(buf + pos, LEN_OR_ZERO, "\", %s", arg); + + for (i = 0; i < tp->nr_args; i++) { + if (strcmp(tp->args[i].type->name, "string") == 0) + pos += snprintf(buf + pos, LEN_OR_ZERO, + ", __get_str(%s)", + tp->args[i].name); + else + pos += snprintf(buf + pos, LEN_OR_ZERO, ", REC->%s", + tp->args[i].name); + } + +#undef LEN_OR_ZERO + + /* return the length of print_fmt */ + return pos; +} + +int set_print_fmt(struct
[PATCH 06/17] tracing/probes: Integrate duplicate set_print_fmt()
From: Namhyung Kim namhyung@lge.com The set_print_fmt() functions are implemented almost same for [ku]probes. Move it to a common place and get rid of the duplication. Acked-by: Masami Hiramatsu masami.hiramatsu...@hitachi.com Cc: Srikar Dronamraju sri...@linux.vnet.ibm.com Cc: Oleg Nesterov o...@redhat.com Cc: zhangwei(Jovi) jovi.zhang...@huawei.com Cc: Arnaldo Carvalho de Melo a...@ghostprotocols.net Signed-off-by: Namhyung Kim namhy...@kernel.org --- kernel/trace/trace_kprobe.c | 63 + kernel/trace/trace_probe.c | 62 kernel/trace/trace_probe.h | 2 ++ kernel/trace/trace_uprobe.c | 55 +-- 4 files changed, 66 insertions(+), 116 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 0167d4b92431..62d6c961bbce 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -964,67 +964,6 @@ static int kretprobe_event_define_fields(struct ftrace_event_call *event_call) return 0; } -static int __set_print_fmt(struct trace_kprobe *tk, char *buf, int len) -{ - int i; - int pos = 0; - - const char *fmt, *arg; - - if (!trace_kprobe_is_return(tk)) { - fmt = (%lx); - arg = REC- FIELD_STRING_IP; - } else { - fmt = (%lx - %lx); - arg = REC- FIELD_STRING_FUNC , REC- FIELD_STRING_RETIP; - } - - /* When len=0, we just calculate the needed length */ -#define LEN_OR_ZERO (len ? len - pos : 0) - - pos += snprintf(buf + pos, LEN_OR_ZERO, \%s, fmt); - - for (i = 0; i tk-tp.nr_args; i++) { - pos += snprintf(buf + pos, LEN_OR_ZERO, %s=%s, - tk-tp.args[i].name, tk-tp.args[i].type-fmt); - } - - pos += snprintf(buf + pos, LEN_OR_ZERO, \, %s, arg); - - for (i = 0; i tk-tp.nr_args; i++) { - if (strcmp(tk-tp.args[i].type-name, string) == 0) - pos += snprintf(buf + pos, LEN_OR_ZERO, - , __get_str(%s), - tk-tp.args[i].name); - else - pos += snprintf(buf + pos, LEN_OR_ZERO, , REC-%s, - tk-tp.args[i].name); - } - -#undef LEN_OR_ZERO - - /* return the length of print_fmt */ - return pos; -} - -static int set_print_fmt(struct trace_kprobe *tk) -{ - int len; - char *print_fmt; - - /* First: called with 0 length to calculate the needed length */ - len = __set_print_fmt(tk, NULL, 0); - print_fmt = kmalloc(len + 1, GFP_KERNEL); - if (!print_fmt) - return -ENOMEM; - - /* Second: actually write the @print_fmt */ - __set_print_fmt(tk, print_fmt, len + 1); - tk-tp.call.print_fmt = print_fmt; - - return 0; -} - #ifdef CONFIG_PERF_EVENTS /* Kprobe profile handler */ @@ -1175,7 +1114,7 @@ static int register_kprobe_event(struct trace_kprobe *tk) call-event.funcs = kprobe_funcs; call-class-define_fields = kprobe_event_define_fields; } - if (set_print_fmt(tk) 0) + if (set_print_fmt(tk-tp, trace_kprobe_is_return(tk)) 0) return -ENOMEM; ret = register_ftrace_event(call-event); if (!ret) { diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index 430505b08a6f..d8347b01ce89 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -837,3 +837,65 @@ out: return ret; } + +static int __set_print_fmt(struct trace_probe *tp, char *buf, int len, + bool is_return) +{ + int i; + int pos = 0; + + const char *fmt, *arg; + + if (!is_return) { + fmt = (%lx); + arg = REC- FIELD_STRING_IP; + } else { + fmt = (%lx - %lx); + arg = REC- FIELD_STRING_FUNC , REC- FIELD_STRING_RETIP; + } + + /* When len=0, we just calculate the needed length */ +#define LEN_OR_ZERO (len ? len - pos : 0) + + pos += snprintf(buf + pos, LEN_OR_ZERO, \%s, fmt); + + for (i = 0; i tp-nr_args; i++) { + pos += snprintf(buf + pos, LEN_OR_ZERO, %s=%s, + tp-args[i].name, tp-args[i].type-fmt); + } + + pos += snprintf(buf + pos, LEN_OR_ZERO, \, %s, arg); + + for (i = 0; i tp-nr_args; i++) { + if (strcmp(tp-args[i].type-name, string) == 0) + pos += snprintf(buf + pos, LEN_OR_ZERO, + , __get_str(%s), + tp-args[i].name); + else + pos += snprintf(buf + pos, LEN_OR_ZERO, , REC-%s, + tp-args[i].name); + } + +#undef LEN_OR_ZERO + + /* return the
[PATCH 06/17] tracing/probes: Integrate duplicate set_print_fmt()
From: Namhyung Kim The set_print_fmt() functions are implemented almost same for [ku]probes. Move it to a common place and get rid of the duplication. Acked-by: Masami Hiramatsu Cc: Srikar Dronamraju Cc: Oleg Nesterov Cc: zhangwei(Jovi) Cc: Arnaldo Carvalho de Melo Signed-off-by: Namhyung Kim --- kernel/trace/trace_kprobe.c | 63 + kernel/trace/trace_probe.c | 62 kernel/trace/trace_probe.h | 2 ++ kernel/trace/trace_uprobe.c | 55 +-- 4 files changed, 66 insertions(+), 116 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index bc85240a8e43..a8129dfa36bb 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -964,67 +964,6 @@ static int kretprobe_event_define_fields(struct ftrace_event_call *event_call) return 0; } -static int __set_print_fmt(struct trace_kprobe *tp, char *buf, int len) -{ - int i; - int pos = 0; - - const char *fmt, *arg; - - if (!trace_kprobe_is_return(tp)) { - fmt = "(%lx)"; - arg = "REC->" FIELD_STRING_IP; - } else { - fmt = "(%lx <- %lx)"; - arg = "REC->" FIELD_STRING_FUNC ", REC->" FIELD_STRING_RETIP; - } - - /* When len=0, we just calculate the needed length */ -#define LEN_OR_ZERO (len ? len - pos : 0) - - pos += snprintf(buf + pos, LEN_OR_ZERO, "\"%s", fmt); - - for (i = 0; i < tp->p.nr_args; i++) { - pos += snprintf(buf + pos, LEN_OR_ZERO, " %s=%s", - tp->p.args[i].name, tp->p.args[i].type->fmt); - } - - pos += snprintf(buf + pos, LEN_OR_ZERO, "\", %s", arg); - - for (i = 0; i < tp->p.nr_args; i++) { - if (strcmp(tp->p.args[i].type->name, "string") == 0) - pos += snprintf(buf + pos, LEN_OR_ZERO, - ", __get_str(%s)", - tp->p.args[i].name); - else - pos += snprintf(buf + pos, LEN_OR_ZERO, ", REC->%s", - tp->p.args[i].name); - } - -#undef LEN_OR_ZERO - - /* return the length of print_fmt */ - return pos; -} - -static int set_print_fmt(struct trace_kprobe *tp) -{ - int len; - char *print_fmt; - - /* First: called with 0 length to calculate the needed length */ - len = __set_print_fmt(tp, NULL, 0); - print_fmt = kmalloc(len + 1, GFP_KERNEL); - if (!print_fmt) - return -ENOMEM; - - /* Second: actually write the @print_fmt */ - __set_print_fmt(tp, print_fmt, len + 1); - tp->p.call.print_fmt = print_fmt; - - return 0; -} - #ifdef CONFIG_PERF_EVENTS /* Kprobe profile handler */ @@ -1175,7 +1114,7 @@ static int register_kprobe_event(struct trace_kprobe *tp) call->event.funcs = _funcs; call->class->define_fields = kprobe_event_define_fields; } - if (set_print_fmt(tp) < 0) + if (set_print_fmt(>p, trace_kprobe_is_return(tp)) < 0) return -ENOMEM; ret = register_ftrace_event(>event); if (!ret) { diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index e1b975fb5d7c..7de2f58d2acb 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -837,3 +837,65 @@ out: return ret; } + +static int __set_print_fmt(struct trace_probe *tp, char *buf, int len, + bool is_return) +{ + int i; + int pos = 0; + + const char *fmt, *arg; + + if (!is_return) { + fmt = "(%lx)"; + arg = "REC->" FIELD_STRING_IP; + } else { + fmt = "(%lx <- %lx)"; + arg = "REC->" FIELD_STRING_FUNC ", REC->" FIELD_STRING_RETIP; + } + + /* When len=0, we just calculate the needed length */ +#define LEN_OR_ZERO (len ? len - pos : 0) + + pos += snprintf(buf + pos, LEN_OR_ZERO, "\"%s", fmt); + + for (i = 0; i < tp->nr_args; i++) { + pos += snprintf(buf + pos, LEN_OR_ZERO, " %s=%s", + tp->args[i].name, tp->args[i].type->fmt); + } + + pos += snprintf(buf + pos, LEN_OR_ZERO, "\", %s", arg); + + for (i = 0; i < tp->nr_args; i++) { + if (strcmp(tp->args[i].type->name, "string") == 0) + pos += snprintf(buf + pos, LEN_OR_ZERO, + ", __get_str(%s)", + tp->args[i].name); + else + pos += snprintf(buf + pos, LEN_OR_ZERO, ", REC->%s", + tp->args[i].name); + } + +#undef LEN_OR_ZERO + + /* return the length of print_fmt */ + return pos; +} + +int set_print_fmt(struct trace_probe *tp,
[PATCH 06/17] tracing/probes: Integrate duplicate set_print_fmt()
From: Namhyung Kim namhyung@lge.com The set_print_fmt() functions are implemented almost same for [ku]probes. Move it to a common place and get rid of the duplication. Acked-by: Masami Hiramatsu masami.hiramatsu...@hitachi.com Cc: Srikar Dronamraju sri...@linux.vnet.ibm.com Cc: Oleg Nesterov o...@redhat.com Cc: zhangwei(Jovi) jovi.zhang...@huawei.com Cc: Arnaldo Carvalho de Melo a...@ghostprotocols.net Signed-off-by: Namhyung Kim namhy...@kernel.org --- kernel/trace/trace_kprobe.c | 63 + kernel/trace/trace_probe.c | 62 kernel/trace/trace_probe.h | 2 ++ kernel/trace/trace_uprobe.c | 55 +-- 4 files changed, 66 insertions(+), 116 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index bc85240a8e43..a8129dfa36bb 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -964,67 +964,6 @@ static int kretprobe_event_define_fields(struct ftrace_event_call *event_call) return 0; } -static int __set_print_fmt(struct trace_kprobe *tp, char *buf, int len) -{ - int i; - int pos = 0; - - const char *fmt, *arg; - - if (!trace_kprobe_is_return(tp)) { - fmt = (%lx); - arg = REC- FIELD_STRING_IP; - } else { - fmt = (%lx - %lx); - arg = REC- FIELD_STRING_FUNC , REC- FIELD_STRING_RETIP; - } - - /* When len=0, we just calculate the needed length */ -#define LEN_OR_ZERO (len ? len - pos : 0) - - pos += snprintf(buf + pos, LEN_OR_ZERO, \%s, fmt); - - for (i = 0; i tp-p.nr_args; i++) { - pos += snprintf(buf + pos, LEN_OR_ZERO, %s=%s, - tp-p.args[i].name, tp-p.args[i].type-fmt); - } - - pos += snprintf(buf + pos, LEN_OR_ZERO, \, %s, arg); - - for (i = 0; i tp-p.nr_args; i++) { - if (strcmp(tp-p.args[i].type-name, string) == 0) - pos += snprintf(buf + pos, LEN_OR_ZERO, - , __get_str(%s), - tp-p.args[i].name); - else - pos += snprintf(buf + pos, LEN_OR_ZERO, , REC-%s, - tp-p.args[i].name); - } - -#undef LEN_OR_ZERO - - /* return the length of print_fmt */ - return pos; -} - -static int set_print_fmt(struct trace_kprobe *tp) -{ - int len; - char *print_fmt; - - /* First: called with 0 length to calculate the needed length */ - len = __set_print_fmt(tp, NULL, 0); - print_fmt = kmalloc(len + 1, GFP_KERNEL); - if (!print_fmt) - return -ENOMEM; - - /* Second: actually write the @print_fmt */ - __set_print_fmt(tp, print_fmt, len + 1); - tp-p.call.print_fmt = print_fmt; - - return 0; -} - #ifdef CONFIG_PERF_EVENTS /* Kprobe profile handler */ @@ -1175,7 +1114,7 @@ static int register_kprobe_event(struct trace_kprobe *tp) call-event.funcs = kprobe_funcs; call-class-define_fields = kprobe_event_define_fields; } - if (set_print_fmt(tp) 0) + if (set_print_fmt(tp-p, trace_kprobe_is_return(tp)) 0) return -ENOMEM; ret = register_ftrace_event(call-event); if (!ret) { diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index e1b975fb5d7c..7de2f58d2acb 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -837,3 +837,65 @@ out: return ret; } + +static int __set_print_fmt(struct trace_probe *tp, char *buf, int len, + bool is_return) +{ + int i; + int pos = 0; + + const char *fmt, *arg; + + if (!is_return) { + fmt = (%lx); + arg = REC- FIELD_STRING_IP; + } else { + fmt = (%lx - %lx); + arg = REC- FIELD_STRING_FUNC , REC- FIELD_STRING_RETIP; + } + + /* When len=0, we just calculate the needed length */ +#define LEN_OR_ZERO (len ? len - pos : 0) + + pos += snprintf(buf + pos, LEN_OR_ZERO, \%s, fmt); + + for (i = 0; i tp-nr_args; i++) { + pos += snprintf(buf + pos, LEN_OR_ZERO, %s=%s, + tp-args[i].name, tp-args[i].type-fmt); + } + + pos += snprintf(buf + pos, LEN_OR_ZERO, \, %s, arg); + + for (i = 0; i tp-nr_args; i++) { + if (strcmp(tp-args[i].type-name, string) == 0) + pos += snprintf(buf + pos, LEN_OR_ZERO, + , __get_str(%s), + tp-args[i].name); + else + pos += snprintf(buf + pos, LEN_OR_ZERO, , REC-%s, + tp-args[i].name); + } + +#undef LEN_OR_ZERO + + /* return the length of