[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20160520150514.GA8897@kernel.org>
Date: Fri, 20 May 2016 12:05:14 -0300
From: Arnaldo Carvalho de Melo <acme@...nel.org>
To: Ingo Molnar <mingo@...nel.org>, He Kuang <hekuang@...wei.com>
Cc: linux-kernel@...r.kernel.org,
Adrian Hunter <adrian.hunter@...el.com>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
Alexei Starovoitov <ast@...nel.org>,
Andi Kleen <ak@...ux.intel.com>,
Brendan Gregg <brendan.d.gregg@...il.com>,
Chris Ryder <chris.ryder@....com>,
David Ahern <dsahern@...il.com>,
Ekaterina Tumanova <tumanova@...ux.vnet.ibm.com>,
Frederic Weisbecker <fweisbec@...il.com>,
Jiri Olsa <jolsa@...nel.org>,
Josh Poimboeuf <jpoimboe@...hat.com>,
Kan Liang <kan.liang@...el.com>,
Mark Rutland <mark.rutland@....com>,
Masami Hiramatsu <mhiramat@...nel.org>,
Milian Wolff <milian.wolff@...b.com>,
Namhyung Kim <namhyung@...nel.org>,
Pawel Moll <pawel.moll@....com>,
Pekka Enberg <penberg@...nel.org>,
Peter Zijlstra <peterz@...radead.org>,
Stephane Eranian <eranian@...gle.com>,
Sukadev Bhattiprolu <sukadev@...ux.vnet.ibm.com>,
Thomas Gleixner <tglx@...utronix.de>,
Vince Weaver <vincent.weaver@...ne.edu>,
Wang Nan <wangnan0@...wei.com>,
Will Deacon <will.deacon@....com>,
Zefan Li <lizefan@...wei.com>,
Arnaldo Carvalho de Melo <acme@...hat.com>
Subject: Re: [GIT PULL 00/11] perf/core improvements and fixes
Em Thu, May 19, 2016 at 07:21:22PM -0300, Arnaldo Carvalho de Melo escreveu:
> Hi Ingo,
>
> Please consider pulling, this is on top of my previous pull
> request (perf-core-for-mingo-20160516).
So, here is a new pull req, removing the following patch, due to that
segfault you noticed while testing 'perf top' on an ubuntu system:
> He Kuang (2):
> perf tools: Find vdso supporting cross-platform analysis
The new tag is perf-core-for-mingo-20160520.
Kuang, Ingo proposed the patch below to fix the problem he noticed
(notice the 'dso && ' part, as __dsos__find() may return NULL), but he
had several other issues with code touched by this patch, I'll try to
address those, please check the patch below and resubmit.
- Arnaldo
tools/perf/util/vdso.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/perf/util/vdso.c b/tools/perf/util/vdso.c
index 8f81c415723d..3a9321f83d00 100644
--- a/tools/perf/util/vdso.c
+++ b/tools/perf/util/vdso.c
@@ -293,12 +293,12 @@ static struct dso *machine__find_vdso(struct machine *machine,
switch (dso_type) {
case DSO__TYPE_32BIT:
dso = __dsos__find(&machine->dsos, DSO__NAME_VDSO32, true);
- if (!dso) {
- dso = __dsos__find(&machine->dsos, DSO__NAME_VDSO,
- true);
- if (dso_type != dso__type(dso, machine))
- dso = NULL;
- }
+ if (dso)
+ break;
+
+ dso = __dsos__find(&machine->dsos, DSO__NAME_VDSO, true);
+ if (dso && dso_type != dso__type(dso, machine))
+ dso = NULL;
break;
case DSO__TYPE_X32BIT:
dso = __dsos__find(&machine->dsos, DSO__NAME_VDSOX32, true);
Powered by blists - more mailing lists