public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Wang Nan <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: rostedt@goodmis.org, wangnan0@huawei.com, namhyung@kernel.org,
	hpa@zytor.com, linux-kernel@vger.kernel.org, acme@redhat.com,
	mingo@kernel.org, masami.hiramatsu.pt@hitachi.com,
	tglx@linutronix.de, lizefan@huawei.com
Subject: [tip:perf/core] perf probe: Fix error reported when offset without function
Date: Thu, 27 Aug 2015 23:42:32 -0700	[thread overview]
Message-ID: <tip-6c6e024f0a62a6a08c06002fd3caa2307cc54fd0@git.kernel.org> (raw)
In-Reply-To: <1440586666-235233-6-git-send-email-wangnan0@huawei.com>

Commit-ID:  6c6e024f0a62a6a08c06002fd3caa2307cc54fd0
Gitweb:     http://git.kernel.org/tip/6c6e024f0a62a6a08c06002fd3caa2307cc54fd0
Author:     Wang Nan <wangnan0@huawei.com>
AuthorDate: Wed, 26 Aug 2015 10:57:44 +0000
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 26 Aug 2015 10:40:34 -0300

perf probe: Fix error reported when offset without function

This patch fixes a bug that, when offset is provided but function is
lost, parse_perf_probe_point() will give a "" string as function name,
so the checking code at the end of parse_perf_probe_point() become
useless.  For example:

  # perf probe +0x1234
  Failed to find symbol  in kernel
    Error: Failed to add events.

After this patch:

  # perf probe +0x1234
  Semantic error :Offset requires an entry function.
    Error: Command Parse Error.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1440586666-235233-6-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/probe-event.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 926bcec..eaacb58 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -1194,9 +1194,13 @@ static int parse_perf_probe_point(char *arg, struct perf_probe_event *pev)
 		*ptr++ = '\0';
 	}
 
-	tmp = strdup(arg);
-	if (tmp == NULL)
-		return -ENOMEM;
+	if (arg[0] == '\0')
+		tmp = NULL;
+	else {
+		tmp = strdup(arg);
+		if (tmp == NULL)
+			return -ENOMEM;
+	}
 
 	if (file_spec)
 		pp->file = tmp;

  parent reply	other threads:[~2015-08-28  6:42 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-26 10:57 [PATCH v3 0/6] perf probe, tracing/uprobes: Support probing at absolute address Wang Nan
2015-08-26 10:57 ` [PATCH v3 1/6] perf probe: Prevent segfault when reading probe point with " Wang Nan
2015-08-26 10:57 ` [PATCH v3 2/6] perf probe: Fix list result when neither dwarf nor map can't find symbol Wang Nan
2015-08-26 11:03   ` Wangnan (F)
2015-08-26 10:57 ` [PATCH v3 2/6] perf probe: Fix list result when symbol can't be found Wang Nan
2015-08-26 12:27   ` 平松雅巳 / HIRAMATU,MASAMI
2015-08-28  6:41   ` [tip:perf/core] perf probe: Fix list result when symbol can' t " tip-bot for Wang Nan
2015-08-26 10:57 ` [PATCH v3 3/6] perf probe: Fix list result when address is zero Wang Nan
2015-08-26 12:14   ` 平松雅巳 / HIRAMATU,MASAMI
2015-08-28  6:42   ` [tip:perf/core] " tip-bot for Wang Nan
2015-08-26 10:57 ` [PATCH v3 4/6] perf probe: Fix error reported when offset without function Wang Nan
2015-08-26 12:21   ` 平松雅巳 / HIRAMATU,MASAMI
2015-08-28  6:42   ` tip-bot for Wang Nan [this message]
2015-08-26 10:57 ` [PATCH v3 5/6] perf probe: Support probing at absolute address Wang Nan
2015-08-26 12:16   ` 平松雅巳 / HIRAMATU,MASAMI
2015-08-28  6:42   ` [tip:perf/core] " tip-bot for Wang Nan
2015-08-26 10:57 ` [PATCH v3 6/6] tracing/uprobes: Do not print '0x (null)' when offset is 0 Wang Nan
2015-08-28  6:43   ` [tip:perf/core] " tip-bot for Wang Nan

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=tip-6c6e024f0a62a6a08c06002fd3caa2307cc54fd0@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=acme@redhat.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=rostedt@goodmis.org \
    --cc=tglx@linutronix.de \
    --cc=wangnan0@huawei.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