linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for He Kuang <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: hpa@zytor.com, alexander.shishkin@linux.intel.com,
	ak@linux.intel.com, adrian.hunter@intel.com, wangnan0@huawei.com,
	kan.liang@intel.com, mingo@kernel.org, jpoimboe@redhat.com,
	penberg@kernel.org, sukadev@linux.vnet.ibm.com,
	tumanova@linux.vnet.ibm.com, mhiramat@kernel.org,
	tglx@linutronix.de, jolsa@kernel.org, peterz@infradead.org,
	eranian@google.com, hekuang@huawei.com, dsahern@gmail.com,
	acme@redhat.com, namhyung@kernel.org,
	linux-kernel@vger.kernel.org
Subject: [tip:perf/core] perf unwind: Move unwind__prepare_access from thread_new into thread__insert_map
Date: Wed, 8 Jun 2016 01:47:03 -0700	[thread overview]
Message-ID: <tip-8132a2a84147d3c98cf580d5759387325fbabf73@git.kernel.org> (raw)
In-Reply-To: <1464924803-22214-5-git-send-email-hekuang@huawei.com>

Commit-ID:  8132a2a84147d3c98cf580d5759387325fbabf73
Gitweb:     http://git.kernel.org/tip/8132a2a84147d3c98cf580d5759387325fbabf73
Author:     He Kuang <hekuang@huawei.com>
AuthorDate: Fri, 3 Jun 2016 03:33:13 +0000
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 7 Jun 2016 12:08:52 -0300

perf unwind: Move unwind__prepare_access from thread_new into thread__insert_map

To determine the libunwind methods to use, we should get the
32bit/64bit information from maps of a thread. When a thread is newly
created, the information is not prepared. This patch moves
unwind__prepare_access() into thread__insert_map() so we can get the
information we need from maps. Meanwhile, let thread__insert_map()
return value and show messages on error.

Signed-off-by: He Kuang <hekuang@huawei.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ekaterina Tumanova <tumanova@linux.vnet.ibm.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1464924803-22214-5-git-send-email-hekuang@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/machine.c | 14 ++++++++++++--
 tools/perf/util/thread.c  | 13 +++++++++----
 tools/perf/util/thread.h  |  2 +-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 205d270..9d931f5 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1353,11 +1353,16 @@ int machine__process_mmap2_event(struct machine *machine,
 	if (map == NULL)
 		goto out_problem_map;
 
-	thread__insert_map(thread, map);
+	ret = thread__insert_map(thread, map);
+	if (ret)
+		goto out_problem_insert;
+
 	thread__put(thread);
 	map__put(map);
 	return 0;
 
+out_problem_insert:
+	map__put(map);
 out_problem_map:
 	thread__put(thread);
 out_problem:
@@ -1403,11 +1408,16 @@ int machine__process_mmap_event(struct machine *machine, union perf_event *event
 	if (map == NULL)
 		goto out_problem_map;
 
-	thread__insert_map(thread, map);
+	ret = thread__insert_map(thread, map);
+	if (ret)
+		goto out_problem_insert;
+
 	thread__put(thread);
 	map__put(map);
 	return 0;
 
+out_problem_insert:
+	map__put(map);
 out_problem_map:
 	thread__put(thread);
 out_problem:
diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
index ada58e6..0bf55256 100644
--- a/tools/perf/util/thread.c
+++ b/tools/perf/util/thread.c
@@ -43,9 +43,6 @@ struct thread *thread__new(pid_t pid, pid_t tid)
 		thread->cpu = -1;
 		INIT_LIST_HEAD(&thread->comm_list);
 
-		if (unwind__prepare_access(thread) < 0)
-			goto err_thread;
-
 		comm_str = malloc(32);
 		if (!comm_str)
 			goto err_thread;
@@ -201,10 +198,18 @@ size_t thread__fprintf(struct thread *thread, FILE *fp)
 	       map_groups__fprintf(thread->mg, fp);
 }
 
-void thread__insert_map(struct thread *thread, struct map *map)
+int thread__insert_map(struct thread *thread, struct map *map)
 {
+	int ret;
+
+	ret = unwind__prepare_access(thread);
+	if (ret)
+		return ret;
+
 	map_groups__fixup_overlappings(thread->mg, map, stderr);
 	map_groups__insert(thread->mg, map);
+
+	return 0;
 }
 
 static int thread__clone_map_groups(struct thread *thread,
diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
index 07ffb18..99263cb 100644
--- a/tools/perf/util/thread.h
+++ b/tools/perf/util/thread.h
@@ -76,7 +76,7 @@ int thread__comm_len(struct thread *thread);
 struct comm *thread__comm(const struct thread *thread);
 struct comm *thread__exec_comm(const struct thread *thread);
 const char *thread__comm_str(const struct thread *thread);
-void thread__insert_map(struct thread *thread, struct map *map);
+int thread__insert_map(struct thread *thread, struct map *map);
 int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp);
 size_t thread__fprintf(struct thread *thread, FILE *fp);
 

  reply	other threads:[~2016-06-08  8:47 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-03  3:33 [PATCH v9 00/14] Add support for remote unwind He Kuang
2016-06-03  3:33 ` [PATCH v9 01/14] perf tools: Use LIBUNWIND_DIR for remote libunwind feature check He Kuang
2016-06-08  8:45   ` [tip:perf/core] perf unwind: " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 02/14] perf tools: Decouple thread->address_space on libunwind He Kuang
2016-06-08  8:46   ` [tip:perf/core] perf unwind: " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 03/14] perf tools: Introducing struct unwind_libunwind_ops for local unwind He Kuang
2016-06-08  8:46   ` [tip:perf/core] perf unwind: Introduce 'struct unwind_libunwind_ops' " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 04/14] perf tools: Move unwind__prepare_access from thread_new into thread__insert_map He Kuang
2016-06-08  8:47   ` tip-bot for He Kuang [this message]
2016-06-03  3:33 ` [PATCH v9 05/14] perf tools: Don't mix LIBUNWIND_LIBS into LIBUNWIND_LDFLAGS He Kuang
2016-06-08  8:47   ` [tip:perf/core] perf unwind: " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 06/14] perf tools: Separate local/remote libunwind config He Kuang
2016-06-08  8:47   ` [tip:perf/core] perf unwind: " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 07/14] perf tools: Rename unwind-libunwind.c to unwind-libunwind-local.c He Kuang
2016-06-08  8:48   ` [tip:perf/core] perf unwind: " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 08/14] perf tools: Extract common API out of unwind-libunwind-local.c He Kuang
2016-06-08  8:48   ` [tip:perf/core] " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 09/14] perf tools: Export normalize_arch() function He Kuang
2016-06-08  8:49   ` [tip:perf/core] " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 10/14] perf tools: Check the target platform before assigning unwind methods He Kuang
2016-06-04  5:36   ` [PATCH v9 10/14 UPDATE] " He Kuang
2016-06-07 18:06     ` Arnaldo Carvalho de Melo
2016-06-08  8:49   ` [tip:perf/core] perf unwind: " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 11/14] perf tools: Change fixed name of libunwind__arch_reg_id to macro He Kuang
2016-06-08  8:50   ` [tip:perf/core] perf unwind: " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 12/14] perf tools: Introduce flag to separate local/remote unwind compilation He Kuang
2016-06-08  8:50   ` [tip:perf/core] perf unwind: " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 13/14] perf callchain: Support x86 target platform He Kuang
2016-06-08  8:51   ` [tip:perf/core] " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 14/14] perf callchain: Support aarch64 cross-platform He Kuang
2016-06-08  8:51   ` [tip:perf/core] " tip-bot for He Kuang
2016-06-03  7:06 ` [PATCH v9 00/14] Add support for remote unwind Jiri Olsa
2016-06-03 19:42   ` Arnaldo Carvalho de Melo
2016-06-03 21:06     ` Arnaldo Carvalho de Melo
2016-06-03 21:09       ` Arnaldo Carvalho de Melo
2016-06-04  5:39         ` Hekuang
2016-06-07 15:12           ` Arnaldo Carvalho de Melo
2016-06-07 15:14             ` Arnaldo Carvalho de Melo
2016-06-07 19:44   ` Arnaldo Carvalho de Melo
2016-06-08  7:33     ` Hekuang

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-8132a2a84147d3c98cf580d5759387325fbabf73@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=acme@redhat.com \
    --cc=adrian.hunter@intel.com \
    --cc=ak@linux.intel.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=dsahern@gmail.com \
    --cc=eranian@google.com \
    --cc=hekuang@huawei.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@kernel.org \
    --cc=jpoimboe@redhat.com \
    --cc=kan.liang@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=penberg@kernel.org \
    --cc=peterz@infradead.org \
    --cc=sukadev@linux.vnet.ibm.com \
    --cc=tglx@linutronix.de \
    --cc=tumanova@linux.vnet.ibm.com \
    --cc=wangnan0@huawei.com \
    --subject='Re: [tip:perf/core] perf unwind: Move unwind__prepare_access from thread_new into thread__insert_map' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).