From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org,
"Arnaldo Carvalho de Melo" <acme@redhat.com>,
"Frédéric Weisbecker" <fweisbec@gmail.com>,
"Mike Galbraith" <efault@gmx.de>,
"Paul Mackerras" <paulus@samba.org>,
"Peter Zijlstra" <a.p.zijlstra@chello.nl>,
"Tom Zanussi" <tzanussi@gmail.com>
Subject: [PATCH 2/4] perf symbols: Check if a struct machine instance was found
Date: Sun, 9 May 2010 20:39:27 -0300 [thread overview]
Message-ID: <1273448369-7479-3-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1273448369-7479-1-git-send-email-acme@infradead.org>
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Which can happen when processing old files that had no fake kernel MMAP,
events.
That shouldn't result in perf_session__create_kernel_maps not being
called, this will be fixed in a followup patch, for now do these checks
to avoid segfaulting.
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/event.c | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 46563e1..c44a5a8 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -493,8 +493,10 @@ int event__process_mmap(event_t *self, struct perf_session *session)
return 0;
}
- thread = perf_session__findnew(session, self->mmap.pid);
machine = perf_session__find_host_machine(session);
+ if (machine == NULL)
+ goto out_problem;
+ thread = perf_session__findnew(session, self->mmap.pid);
map = map__new(&machine->user_dsos, self->mmap.start,
self->mmap.len, self->mmap.pgoff,
self->mmap.pid, self->mmap.filename,
@@ -552,18 +554,12 @@ void thread__find_addr_map(struct thread *self,
if (cpumode == PERF_RECORD_MISC_KERNEL && perf_host) {
al->level = 'k';
machine = perf_session__find_host_machine(session);
- mg = &machine->kmaps;
} else if (cpumode == PERF_RECORD_MISC_USER && perf_host) {
al->level = '.';
machine = perf_session__find_host_machine(session);
} else if (cpumode == PERF_RECORD_MISC_GUEST_KERNEL && perf_guest) {
al->level = 'g';
machine = perf_session__find_machine(session, pid);
- if (!machine) {
- al->map = NULL;
- return;
- }
- mg = &machine->kmaps;
} else {
/*
* 'u' means guest os user space.
@@ -586,6 +582,13 @@ void thread__find_addr_map(struct thread *self,
return;
}
+
+ if (machine == NULL) {
+ al->map = NULL;
+ return;
+ }
+
+ mg = &machine->kmaps;
try_again:
al->map = map_groups__find(mg, type, al->addr);
if (al->map == NULL) {
--
1.6.2.5
next prev parent reply other threads:[~2010-05-09 23:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-09 23:39 [PATCH 0/4] perf tools improvements and minor fixes Arnaldo Carvalho de Melo
2010-05-09 23:39 ` [PATCH 1/4] perf symbols: Consider unresolved DSOs in the dso__col_widt calculation Arnaldo Carvalho de Melo
2010-05-09 23:39 ` Arnaldo Carvalho de Melo [this message]
2010-05-09 23:39 ` [PATCH 3/4] perf session: Embed the host machine data on perf_session Arnaldo Carvalho de Melo
2010-05-09 23:39 ` [PATCH 4/4] perf report: Allow limiting the number of entries to print in callchains Arnaldo Carvalho de Melo
2010-05-10 0:09 ` [PATCH 0/4] perf tools improvements and minor fixes Arnaldo Carvalho de Melo
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=1273448369-7479-3-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=efault@gmx.de \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulus@samba.org \
--cc=tzanussi@gmail.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
all inboxes | Powered by JetHome®