From: Masami Hiramatsu <mhiramat@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
linux-kernel@vger.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: Re: [PATCH v2 01/17] tracing: probeevent: Fix to support minus offset from symbol
Date: Thu, 22 Feb 2018 08:41:53 +0900 [thread overview]
Message-ID: <20180222084153.e057d86729063fe39b8232f0@kernel.org> (raw)
In-Reply-To: <151922487738.6217.16114601174401123273.stgit@devbox>
Hi Steve,
Could you pick this separately since this is a bugfix?
Thank you,
On Wed, 21 Feb 2018 23:54:37 +0900
Masami Hiramatsu <mhiramat@kernel.org> wrote:
> In Documentation/trace/kprobetrace.txt, it says
>
> @SYM[+|-offs] : Fetch memory at SYM +|- offs (SYM should be a data symbol)
>
> However, the parser doesn't parse minus offset correctly.
> This fixes the parser to get minus offset correctly.
>
> Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
> ---
> kernel/trace/trace_kprobe.c | 2 +-
> kernel/trace/trace_probe.c | 10 +++++-----
> kernel/trace/trace_probe.h | 2 +-
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
> index 5ce9b8cf7be3..dab4a5b54269 100644
> --- a/kernel/trace/trace_kprobe.c
> +++ b/kernel/trace/trace_kprobe.c
> @@ -754,7 +754,7 @@ static int create_trace_kprobe(int argc, char **argv)
> /* a symbol specified */
> symbol = argv[1];
> /* TODO: support .init module functions */
> - ret = traceprobe_split_symbol_offset(symbol, &offset);
> + ret = traceprobe_split_symbol_offset(symbol, (long *)&offset);
> if (ret) {
> pr_info("Failed to parse either an address or a symbol.\n");
> return ret;
> diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
> index d59357308677..3e291a754862 100644
> --- a/kernel/trace/trace_probe.c
> +++ b/kernel/trace/trace_probe.c
> @@ -320,7 +320,7 @@ static fetch_func_t get_fetch_size_function(const struct fetch_type *type,
> }
>
> /* Split symbol and offset. */
> -int traceprobe_split_symbol_offset(char *symbol, unsigned long *offset)
> +int traceprobe_split_symbol_offset(char *symbol, long *offset)
> {
> char *tmp;
> int ret;
> @@ -328,13 +328,13 @@ int traceprobe_split_symbol_offset(char *symbol, unsigned long *offset)
> if (!offset)
> return -EINVAL;
>
> - tmp = strchr(symbol, '+');
> + tmp = strpbrk(symbol, "+-");
> if (tmp) {
> - /* skip sign because kstrtoul doesn't accept '+' */
> - ret = kstrtoul(tmp + 1, 0, offset);
> + ret = kstrtoul(tmp + 1, 0, (unsigned long *)offset);
> if (ret)
> return ret;
> -
> + if (*tmp == '-')
> + *offset = -(*offset);
> *tmp = '\0';
> } else
> *offset = 0;
> diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h
> index 0745f895f780..75daff22ccea 100644
> --- a/kernel/trace/trace_probe.h
> +++ b/kernel/trace/trace_probe.h
> @@ -365,7 +365,7 @@ extern int traceprobe_conflict_field_name(const char *name,
> extern void traceprobe_update_arg(struct probe_arg *arg);
> extern void traceprobe_free_probe_arg(struct probe_arg *arg);
>
> -extern int traceprobe_split_symbol_offset(char *symbol, unsigned long *offset);
> +extern int traceprobe_split_symbol_offset(char *symbol, long *offset);
>
> /* Sum up total data length for dynamic arraies (strings) */
> static nokprobe_inline int
>
--
Masami Hiramatsu <mhiramat@kernel.org>
next prev parent reply other threads:[~2018-02-21 23:42 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 [this message]
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 ` [PATCH v2 05/17] tracing: probeevent: Cleanup argument field definition Masami Hiramatsu
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=20180222084153.e057d86729063fe39b8232f0@kernel.org \
--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