From: Masami Hiramatsu <mhiramat@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>, linux-kernel@vger.kernel.org
Cc: mhiramat@kernel.org, Ingo Molnar <mingo@redhat.com>,
Namhyung Kim <namhyung@kernel.org>,
Tom Zanussi <tom.zanussi@linux.intel.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
linux-trace-users@vger.kernel.org,
linux-kselftest@vger.kernel.org, shuah@kernel.org
Subject: [PATCH v2 05/17] tracing: probeevent: Cleanup argument field definition
Date: Wed, 21 Feb 2018 23:56:38 +0900 [thread overview]
Message-ID: <151922499866.6217.4568743070447952036.stgit@devbox> (raw)
In-Reply-To: <151922484560.6217.1143686155616343906.stgit@devbox>
Cleanup event argument definition code in one place for
maintenancability.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
kernel/trace/trace_kprobe.c | 32 ++++----------------------------
kernel/trace/trace_probe.c | 21 +++++++++++++++++++++
kernel/trace/trace_probe.h | 2 ++
kernel/trace/trace_uprobe.c | 15 ++-------------
4 files changed, 29 insertions(+), 41 deletions(-)
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 59882393fc1b..a96328dfc012 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1146,49 +1146,25 @@ print_kretprobe_event(struct trace_iterator *iter, int flags,
static int kprobe_event_define_fields(struct trace_event_call *event_call)
{
- int ret, i;
+ int ret;
struct kprobe_trace_entry_head field;
struct trace_kprobe *tk = (struct trace_kprobe *)event_call->data;
DEFINE_FIELD(unsigned long, ip, FIELD_STRING_IP, 0);
- /* Set argument names as fields */
- for (i = 0; i < tk->tp.nr_args; i++) {
- struct probe_arg *parg = &tk->tp.args[i];
- ret = trace_define_field(event_call, parg->type->fmttype,
- parg->name,
- sizeof(field) + parg->offset,
- parg->type->size,
- parg->type->is_signed,
- FILTER_OTHER);
- if (ret)
- return ret;
- }
- return 0;
+ return traceprobe_define_arg_fields(event_call, sizeof(field), &tk->tp);
}
static int kretprobe_event_define_fields(struct trace_event_call *event_call)
{
- int ret, i;
+ int ret;
struct kretprobe_trace_entry_head field;
struct trace_kprobe *tk = (struct trace_kprobe *)event_call->data;
DEFINE_FIELD(unsigned long, func, FIELD_STRING_FUNC, 0);
DEFINE_FIELD(unsigned long, ret_ip, FIELD_STRING_RETIP, 0);
- /* Set argument names as fields */
- for (i = 0; i < tk->tp.nr_args; i++) {
- struct probe_arg *parg = &tk->tp.args[i];
- ret = trace_define_field(event_call, parg->type->fmttype,
- parg->name,
- sizeof(field) + parg->offset,
- parg->type->size,
- parg->type->is_signed,
- FILTER_OTHER);
- if (ret)
- return ret;
- }
- return 0;
+ return traceprobe_define_arg_fields(event_call, sizeof(field), &tk->tp);
}
#ifdef CONFIG_PERF_EVENTS
diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index 59b0f76fb4a5..4f5447cec44a 100644
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -682,3 +682,24 @@ int set_print_fmt(struct trace_probe *tp, bool is_return)
return 0;
}
+
+int traceprobe_define_arg_fields(struct trace_event_call *event_call,
+ size_t offset, struct trace_probe *tp)
+{
+ int ret, i;
+
+ /* Set argument names as fields */
+ for (i = 0; i < tp->nr_args; i++) {
+ struct probe_arg *parg = &tp->args[i];
+
+ ret = trace_define_field(event_call, parg->type->fmttype,
+ parg->name,
+ offset + parg->offset,
+ parg->type->size,
+ parg->type->is_signed,
+ FILTER_OTHER);
+ if (ret)
+ return ret;
+ }
+ return 0;
+}
diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h
index 0c8e66f9c855..de928052926b 100644
--- a/kernel/trace/trace_probe.h
+++ b/kernel/trace/trace_probe.h
@@ -440,3 +440,5 @@ extern struct trace_event_call *
create_local_trace_uprobe(char *name, unsigned long offs, bool is_return);
extern void destroy_local_trace_uprobe(struct trace_event_call *event_call);
#endif
+extern int traceprobe_define_arg_fields(struct trace_event_call *event_call,
+ size_t offset, struct trace_probe *tp);
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 4c006a693663..887da2bb63aa 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -982,7 +982,7 @@ probe_event_disable(struct trace_uprobe *tu, struct trace_event_file *file)
static int uprobe_event_define_fields(struct trace_event_call *event_call)
{
- int ret, i, size;
+ int ret, size;
struct uprobe_trace_entry_head field;
struct trace_uprobe *tu = event_call->data;
@@ -994,19 +994,8 @@ static int uprobe_event_define_fields(struct trace_event_call *event_call)
DEFINE_FIELD(unsigned long, vaddr[0], FIELD_STRING_IP, 0);
size = SIZEOF_TRACE_ENTRY(false);
}
- /* Set argument names as fields */
- for (i = 0; i < tu->tp.nr_args; i++) {
- struct probe_arg *parg = &tu->tp.args[i];
-
- ret = trace_define_field(event_call, parg->type->fmttype,
- parg->name, size + parg->offset,
- parg->type->size, parg->type->is_signed,
- FILTER_OTHER);
- if (ret)
- return ret;
- }
- return 0;
+ return traceprobe_define_arg_fields(event_call, size, &tu->tp);
}
#ifdef CONFIG_PERF_EVENTS
next prev parent reply other threads:[~2018-02-21 14:57 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-21 14:54 [PATCH v2 00/17] tracing: probeevent: Improve fetcharg features Masami Hiramatsu
2018-02-21 14:54 ` [PATCH v2 01/17] tracing: probeevent: Fix to support minus offset from symbol Masami Hiramatsu
2018-02-21 23:41 ` Masami Hiramatsu
2018-02-22 1:53 ` Steven Rostedt
2018-02-22 6:35 ` Masami Hiramatsu
2018-02-22 7:45 ` [BUGFIX PATCH v2.1] " Masami Hiramatsu
2018-02-23 0:15 ` Namhyung Kim
2018-02-23 9:44 ` Masami Hiramatsu
2018-02-21 14:55 ` [PATCH v2 02/17] selftests: ftrace: Add probe event argument syntax testcase Masami Hiramatsu
2018-02-21 14:55 ` [PATCH v2 03/17] selftests: ftrace: Add a testcase for string type with kprobe_event Masami Hiramatsu
2018-02-21 14:56 ` [PATCH v2 04/17] tracing: probeevent: Cleanup print argument functions Masami Hiramatsu
2018-02-21 14:56 ` Masami Hiramatsu [this message]
2018-02-21 14:57 ` [PATCH v2 06/17] tracing: probeevent: Remove NOKPROBE_SYMBOL from print functions Masami Hiramatsu
2018-02-21 14:57 ` [PATCH v2 07/17] tracing: probeevent: Introduce new argument fetching code Masami Hiramatsu
2018-02-23 4:30 ` Namhyung Kim
2018-02-23 9:43 ` Masami Hiramatsu
2018-02-21 14:58 ` [PATCH v2 08/17] tracing: probeevent: Return consumed bytes of dynamic area Masami Hiramatsu
2018-02-21 14:58 ` [PATCH v2 09/17] tracing: probeevent: Append traceprobe_ for exported function Masami Hiramatsu
2018-02-21 14:59 ` [PATCH v2 10/17] tracing: probeevent: Unify fetch_insn processing common part Masami Hiramatsu
2018-02-21 14:59 ` [PATCH v2 11/17] tracing: probeevent: Add symbol type Masami Hiramatsu
2018-02-21 15:00 ` [PATCH v2 12/17] x86: ptrace: Add function argument access API Masami Hiramatsu
2018-02-21 15:00 ` [PATCH v2 13/17] tracing: probeevent: Add $argN for accessing function args Masami Hiramatsu
2018-02-22 8:35 ` Masami Hiramatsu
2018-02-21 15:01 ` [PATCH v2 14/17] tracing: probeevent: Add array type support Masami Hiramatsu
2018-02-21 15:01 ` [PATCH v2 15/17] selftests: ftrace: Add a testcase for symbol type Masami Hiramatsu
2018-02-22 11:43 ` Masami Hiramatsu
2018-02-21 15:01 ` [PATCH v2 16/17] selftests: ftrace: Add a testcase for $argN with kprobe_event Masami Hiramatsu
2018-02-21 15:02 ` [PATCH v2 17/17] selftests: ftrace: Add a testcase for array type " Masami Hiramatsu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=151922499866.6217.4568743070447952036.stgit@devbox \
--to=mhiramat@kernel.org \
--cc=acme@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-trace-users@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=rostedt@goodmis.org \
--cc=shuah@kernel.org \
--cc=tom.zanussi@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox