From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Don Zickus <dzickus@redhat.com>,
Douglas Hatch <doug.hatch@hp.com>, Ingo Molnar <mingo@redhat.com>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <peterz@infradead.org>,
Scott J Norton <scott.norton@hp.com>,
Waiman Long <Waiman.Long@hp.com>
Subject: [PATCH 20/24] perf machine: Add missing dsos->root rbtree root initialization
Date: Tue, 14 Oct 2014 18:04:29 -0300 [thread overview]
Message-ID: <1413320673-5784-21-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1413320673-5784-1-git-send-email-acme@kernel.org>
From: Arnaldo Carvalho de Melo <acme@redhat.com>
A segfault happens on 'perf test hists_link' because we end up using a
struct machines on the stack, and then machines__init() was not
initializing the newly introduced rb_root, just the existing list_head.
When we introduced struct dsos, to group the two ways to store dsos,
i.e. the linked list and the rbtree, we didn't turned the initialization
done in:
machines__init(machines->host) ->
machine__init() ->
INIT_LIST_HEAD
into a dsos__init() to keep on initializing the list_head but _as well_
initializing the rb_root, oops.
All worked because outside perf-test we probably zalloc the whole thing
which ends up initializing it in to NULL.
So the problem looks contained to 'perf test' that uses it on stack,
etc.
Reported-by: Jiri Olsa <jolsa@redhat.com>
Acked-by: Waiman Long <Waiman.Long@hp.com>,
Cc: Adrian Hunter <adrian.hunter@intel.com>,
Cc: Don Zickus <dzickus@redhat.com>
Cc: Douglas Hatch <doug.hatch@hp.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Scott J Norton <scott.norton@hp.com>
Cc: Waiman Long <Waiman.Long@hp.com>,
Link: http://lkml.kernel.org/r/20141014180353.GF3198@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/machine.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index b7d477fbda02..34fc7c8672e4 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -13,12 +13,18 @@
#include <symbol/kallsyms.h>
#include "unwind.h"
+static void dsos__init(struct dsos *dsos)
+{
+ INIT_LIST_HEAD(&dsos->head);
+ dsos->root = RB_ROOT;
+}
+
int machine__init(struct machine *machine, const char *root_dir, pid_t pid)
{
map_groups__init(&machine->kmaps);
RB_CLEAR_NODE(&machine->rb_node);
- INIT_LIST_HEAD(&machine->user_dsos.head);
- INIT_LIST_HEAD(&machine->kernel_dsos.head);
+ dsos__init(&machine->user_dsos);
+ dsos__init(&machine->kernel_dsos);
machine->threads = RB_ROOT;
INIT_LIST_HEAD(&machine->dead_threads);
--
1.9.3
next prev parent reply other threads:[~2014-10-14 21:06 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-14 21:04 [GIT PULL 00/24] perf/core improvements and fixes Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 01/24] perf kvm stat live: Fix perf_evlist__add_pollfd error handling Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 02/24] perf kvm stat live: Use perf_evlist__add_pollfd return fd position Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 03/24] perf kvm stat live: Use fdarray object instead of pollfd Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 04/24] perf callchain: Move callchain_param to util object in to fix python test Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 05/24] perf sched: Stop updating hists stats, not used Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 06/24] perf script: " Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 07/24] perf evsel: Add hists helper Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 08/24] perf session: Don't count per evsel events Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 09/24] perf tools: Move events_stats struct to event.h Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 10/24] perf ui browsers: Add missing include Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 11/24] perf session: Remove last reference to hists struct Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 12/24] perf evsel: Subclassing Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 13/24] perf callchain: Move the callchain_param extern to callchain.h Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 14/24] perf tools: Remove hists from evsel Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 15/24] perf thread_map: Create dummy constructor out of open coded equivalent Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 16/24] perf evlist: Check that there is a thread_map when preparing a workload Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 17/24] perf evlist: Default to syswide target when no thread/cpu maps set Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 18/24] perf evsel: Add missing 'target' struct forward declaration Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 19/24] perf evsel: Make some exit routines static Arnaldo Carvalho de Melo
2014-10-14 21:04 ` Arnaldo Carvalho de Melo [this message]
2014-10-14 21:04 ` [PATCH 21/24] perf tools: fix off-by-one error in maps Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 22/24] perf tools: Fixup off-by-one comparision in maps__find Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 23/24] perf symbols: Fix map->end fixup Arnaldo Carvalho de Melo
2014-10-14 21:04 ` [PATCH 24/24] perf symbols: Make sym->end be the first address after the symbol range Arnaldo Carvalho de Melo
2014-10-15 9:56 ` [GIT PULL 00/24] perf/core improvements and fixes Ingo Molnar
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=1413320673-5784-21-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=Waiman.Long@hp.com \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=doug.hatch@hp.com \
--cc=dzickus@redhat.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=scott.norton@hp.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;
as well as URLs for NNTP newsgroup(s).