* [PATCH] perf, tools: Fix crash in 'perf trace'
@ 2015-06-12 6:00 Sukadev Bhattiprolu
2015-06-12 19:35 ` Arnaldo Carvalho de Melo
2015-06-18 8:17 ` [tip:perf/core] perf trace: Fix race condition at the end of started workloads tip-bot for Sukadev Bhattiprolu
0 siblings, 2 replies; 4+ messages in thread
From: Sukadev Bhattiprolu @ 2015-06-12 6:00 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo; +Cc: Jiri Olsa, Ingo Molnar, Li Zhang, linux-kernel
>From 6669ed960a3ee4f9a02790f60b6a73ffc82fd6de Mon Sep 17 00:00:00 2001
From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Date: Fri, 12 Jun 2015 01:28:36 -0400
Subject: [PATCH] perf, tools: Fix crash in perf trace
I get following crash on multiple systems and across several releases
(at least since v3.18).
Core was generated by `/tmp/perf trace sleep 0.2 '.
Program terminated with signal SIGSEGV, Segmentation fault.
#0 perf_mmap__read_head (mm=0x3fff9bf30070) at util/evlist.h:195
195 u64 head = ACCESS_ONCE(pc->data_head);
(gdb) bt
#0 perf_mmap__read_head (mm=0x3fff9bf30070) at util/evlist.h:195
#1 perf_evlist__mmap_read (evlist=0x10027f11910, idx=<optimized out>)
at util/evlist.c:637
#2 0x000000001003ce4c in trace__run (argv=<optimized out>,
argc=<optimized out>, trace=0x3fffd7b28288) at builtin-trace.c:2259
#3 cmd_trace (argc=<optimized out>, argv=<optimized out>,
prefix=<optimized out>) at builtin-trace.c:2799
#4 0x00000000100657b8 in run_builtin (p=0x10176798 <commands+480>, argc=3,
argv=0x3fffd7b2b550) at perf.c:370
#5 0x00000000100063e8 in handle_internal_command (argv=0x3fffd7b2b550, argc=3)
at perf.c:429
#6 run_argv (argv=0x3fffd7b2af70, argcp=0x3fffd7b2af7c) at perf.c:473
#7 main (argc=3, argv=0x3fffd7b2b550) at perf.c:588
The problem seems to be a race condition, when the application has just
exited. Some/all fds associated with the perf-events (tracepoints) go
into a POLLHUP/ POLLERR state and the mmap region associated with those
events are unmapped (in perf_evlist__filter_pollfd()).
But we go back and do a perf_evlist__mmap_read() which assumes that the
mmaps are still valid and we hit the crash.
If the mapping for an event is released, its refcnt is 0 (and ->base
is NULL), so ensure we have non-zero refcount before accessing the map.
Note that perf-record has a similar logic but unlike perf-trace, the
record__mmap_read_all() checks the evlist->mmap[i].base before accessing
the map.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
---
tools/perf/util/evlist.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 080be93..084535b 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -634,11 +634,18 @@ static struct perf_evsel *perf_evlist__event2evsel(struct perf_evlist *evlist,
union perf_event *perf_evlist__mmap_read(struct perf_evlist *evlist, int idx)
{
struct perf_mmap *md = &evlist->mmap[idx];
- u64 head = perf_mmap__read_head(md);
+ u64 head;
u64 old = md->prev;
unsigned char *data = md->base + page_size;
union perf_event *event = NULL;
+ /*
+ * Check if event was unmapped due to a POLLHUP/POLLERR.
+ */
+ if (!md->refcnt)
+ return NULL;
+
+ head = perf_mmap__read_head(md);
if (evlist->overwrite) {
/*
* If we're further behind than half the buffer, there's a chance
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] perf, tools: Fix crash in 'perf trace'
2015-06-12 6:00 [PATCH] perf, tools: Fix crash in 'perf trace' Sukadev Bhattiprolu
@ 2015-06-12 19:35 ` Arnaldo Carvalho de Melo
2015-06-13 1:57 ` Sukadev Bhattiprolu
2015-06-18 8:17 ` [tip:perf/core] perf trace: Fix race condition at the end of started workloads tip-bot for Sukadev Bhattiprolu
1 sibling, 1 reply; 4+ messages in thread
From: Arnaldo Carvalho de Melo @ 2015-06-12 19:35 UTC (permalink / raw)
To: Sukadev Bhattiprolu; +Cc: Jiri Olsa, Ingo Molnar, Li Zhang, linux-kernel
Em Thu, Jun 11, 2015 at 11:00:04PM -0700, Sukadev Bhattiprolu escreveu:
> >From 6669ed960a3ee4f9a02790f60b6a73ffc82fd6de Mon Sep 17 00:00:00 2001
> From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
> Date: Fri, 12 Jun 2015 01:28:36 -0400
> Subject: [PATCH] perf, tools: Fix crash in perf trace
>
> I get following crash on multiple systems and across several releases
> (at least since v3.18).
Trying it in perf/core I get:
util/evlist.c: In function ‘perf_evlist__mmap_read’:
util/evlist.c:645:6: error: wrong type argument to unary exclamation
mark
if (!md->refcnt)
Trying after changing it to !atomic_read(&md->refcnt)
And it fixes the segfault that I reproduced, but this still looks
strange, i.e. if it hit zero, then it should not have been used at this
point anymore... Will look at it again in the weekend. :-\
- Arnaldo
> Core was generated by `/tmp/perf trace sleep 0.2 '.
> Program terminated with signal SIGSEGV, Segmentation fault.
> #0 perf_mmap__read_head (mm=0x3fff9bf30070) at util/evlist.h:195
> 195 u64 head = ACCESS_ONCE(pc->data_head);
> (gdb) bt
> #0 perf_mmap__read_head (mm=0x3fff9bf30070) at util/evlist.h:195
> #1 perf_evlist__mmap_read (evlist=0x10027f11910, idx=<optimized out>)
> at util/evlist.c:637
> #2 0x000000001003ce4c in trace__run (argv=<optimized out>,
> argc=<optimized out>, trace=0x3fffd7b28288) at builtin-trace.c:2259
> #3 cmd_trace (argc=<optimized out>, argv=<optimized out>,
> prefix=<optimized out>) at builtin-trace.c:2799
> #4 0x00000000100657b8 in run_builtin (p=0x10176798 <commands+480>, argc=3,
> argv=0x3fffd7b2b550) at perf.c:370
> #5 0x00000000100063e8 in handle_internal_command (argv=0x3fffd7b2b550, argc=3)
> at perf.c:429
> #6 run_argv (argv=0x3fffd7b2af70, argcp=0x3fffd7b2af7c) at perf.c:473
> #7 main (argc=3, argv=0x3fffd7b2b550) at perf.c:588
>
> The problem seems to be a race condition, when the application has just
> exited. Some/all fds associated with the perf-events (tracepoints) go
> into a POLLHUP/ POLLERR state and the mmap region associated with those
> events are unmapped (in perf_evlist__filter_pollfd()).
>
> But we go back and do a perf_evlist__mmap_read() which assumes that the
> mmaps are still valid and we hit the crash.
>
> If the mapping for an event is released, its refcnt is 0 (and ->base
> is NULL), so ensure we have non-zero refcount before accessing the map.
>
> Note that perf-record has a similar logic but unlike perf-trace, the
> record__mmap_read_all() checks the evlist->mmap[i].base before accessing
> the map.
>
> Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
> ---
> tools/perf/util/evlist.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> index 080be93..084535b 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -634,11 +634,18 @@ static struct perf_evsel *perf_evlist__event2evsel(struct perf_evlist *evlist,
> union perf_event *perf_evlist__mmap_read(struct perf_evlist *evlist, int idx)
> {
> struct perf_mmap *md = &evlist->mmap[idx];
> - u64 head = perf_mmap__read_head(md);
> + u64 head;
> u64 old = md->prev;
> unsigned char *data = md->base + page_size;
> union perf_event *event = NULL;
>
> + /*
> + * Check if event was unmapped due to a POLLHUP/POLLERR.
> + */
> + if (!md->refcnt)
> + return NULL;
> +
> + head = perf_mmap__read_head(md);
> if (evlist->overwrite) {
> /*
> * If we're further behind than half the buffer, there's a chance
> --
> 2.1.4
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] perf, tools: Fix crash in 'perf trace'
2015-06-12 19:35 ` Arnaldo Carvalho de Melo
@ 2015-06-13 1:57 ` Sukadev Bhattiprolu
0 siblings, 0 replies; 4+ messages in thread
From: Sukadev Bhattiprolu @ 2015-06-13 1:57 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo; +Cc: Jiri Olsa, Ingo Molnar, Li Zhang, linux-kernel
Arnaldo Carvalho de Melo [acme@kernel.org] wrote:
| Em Thu, Jun 11, 2015 at 11:00:04PM -0700, Sukadev Bhattiprolu escreveu:
| > >From 6669ed960a3ee4f9a02790f60b6a73ffc82fd6de Mon Sep 17 00:00:00 2001
| > From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
| > Date: Fri, 12 Jun 2015 01:28:36 -0400
| > Subject: [PATCH] perf, tools: Fix crash in perf trace
| >
| > I get following crash on multiple systems and across several releases
| > (at least since v3.18).
|
| Trying it in perf/core I get:
|
Ah, I should have based on perf/core.
| util/evlist.c: In function ‘perf_evlist__mmap_read’:
| util/evlist.c:645:6: error: wrong type argument to unary exclamation
| mark
| if (!md->refcnt)
|
| Trying after changing it to !atomic_read(&md->refcnt)
|
| And it fixes the segfault that I reproduced, but this still looks
| strange, i.e. if it hit zero, then it should not have been used at this
| point anymore... Will look at it again in the weekend. :-\
I think its a small window - where application has started exiting,
and set the PERF_EVENT_STATE_EXIT flag, but has not exited "enough"
to issue a SIGCHLD. (Also we check the 'done' flag once - we could
get SIGCHLD just after the check?)
Anyway, the poll() in this window returns with POLLHUP and we unmap
the region.
Sukadev
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip:perf/core] perf trace: Fix race condition at the end of started workloads
2015-06-12 6:00 [PATCH] perf, tools: Fix crash in 'perf trace' Sukadev Bhattiprolu
2015-06-12 19:35 ` Arnaldo Carvalho de Melo
@ 2015-06-18 8:17 ` tip-bot for Sukadev Bhattiprolu
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot for Sukadev Bhattiprolu @ 2015-06-18 8:17 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, zhlcindy, tglx, jolsa, sukadev, hpa, acme, mingo
Commit-ID: 7951722da2963cc1f1a7831a37aa2311ac927056
Gitweb: http://git.kernel.org/tip/7951722da2963cc1f1a7831a37aa2311ac927056
Author: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
AuthorDate: Fri, 12 Jun 2015 01:28:36 -0400
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 17 Jun 2015 16:38:48 -0300
perf trace: Fix race condition at the end of started workloads
I get following crash on multiple systems and across several releases
(at least since v3.18).
Core was generated by `/tmp/perf trace sleep 0.2 '.
Program terminated with signal SIGSEGV, Segmentation fault.
#0 perf_mmap__read_head (mm=0x3fff9bf30070) at util/evlist.h:195
195 u64 head = ACCESS_ONCE(pc->data_head);
(gdb) bt
#0 perf_mmap__read_head (mm=0x3fff9bf30070) at util/evlist.h:195
#1 perf_evlist__mmap_read (evlist=0x10027f11910, idx=<optimized out>)
at util/evlist.c:637
#2 0x000000001003ce4c in trace__run (argv=<optimized out>,
argc=<optimized out>, trace=0x3fffd7b28288) at builtin-trace.c:2259
#3 cmd_trace (argc=<optimized out>, argv=<optimized out>,
prefix=<optimized out>) at builtin-trace.c:2799
#4 0x00000000100657b8 in run_builtin (p=0x10176798 <commands+480>, argc=3,
argv=0x3fffd7b2b550) at perf.c:370
#5 0x00000000100063e8 in handle_internal_command (argv=0x3fffd7b2b550, argc=3)
at perf.c:429
#6 run_argv (argv=0x3fffd7b2af70, argcp=0x3fffd7b2af7c) at perf.c:473
#7 main (argc=3, argv=0x3fffd7b2b550) at perf.c:588
The problem seems to be a race condition, when the application has just
exited. Some/all fds associated with the perf-events (tracepoints) go
into a POLLHUP/ POLLERR state and the mmap region associated with those
events are unmapped (in perf_evlist__filter_pollfd()).
But we go back and do a perf_evlist__mmap_read() which assumes that the
mmaps are still valid and we hit the crash.
If the mapping for an event is released, its refcnt is 0 (and ->base
is NULL), so ensure we have non-zero refcount before accessing the map.
Note that perf-record has a similar logic but unlike perf-trace, the
record__mmap_read_all() checks the evlist->mmap[i].base before accessing
the map.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Li Zhang <zhlcindy@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/20150612060003.GA19913@us.ibm.com
[ Fixed it up to use atomic_read() ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/evlist.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index dc1dc2c..6b58a47 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -634,11 +634,18 @@ static struct perf_evsel *perf_evlist__event2evsel(struct perf_evlist *evlist,
union perf_event *perf_evlist__mmap_read(struct perf_evlist *evlist, int idx)
{
struct perf_mmap *md = &evlist->mmap[idx];
- u64 head = perf_mmap__read_head(md);
+ u64 head;
u64 old = md->prev;
unsigned char *data = md->base + page_size;
union perf_event *event = NULL;
+ /*
+ * Check if event was unmapped due to a POLLHUP/POLLERR.
+ */
+ if (!atomic_read(&md->refcnt))
+ return NULL;
+
+ head = perf_mmap__read_head(md);
if (evlist->overwrite) {
/*
* If we're further behind than half the buffer, there's a chance
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-06-18 8:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-12 6:00 [PATCH] perf, tools: Fix crash in 'perf trace' Sukadev Bhattiprolu
2015-06-12 19:35 ` Arnaldo Carvalho de Melo
2015-06-13 1:57 ` Sukadev Bhattiprolu
2015-06-18 8:17 ` [tip:perf/core] perf trace: Fix race condition at the end of started workloads tip-bot for Sukadev Bhattiprolu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox