Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1222527 > unrolled thread
| Started by | Wang Nan <wangnan0@huawei.com> |
|---|---|
| First post | 2015-09-11 07:00 +0200 |
| Last post | 2015-09-16 09:30 +0200 |
| Articles | 7 — 5 participants |
Back to article view | Back to linux.kernel
[PATCH] perf tools: Fix segfault in 'perf top' Wang Nan <wangnan0@huawei.com> - 2015-09-11 07:00 +0200
Re: [PATCH] perf tools: Fix segfault in 'perf top' Namhyung Kim <namhyung@kernel.org> - 2015-09-11 18:30 +0200
Re: [PATCH] perf tools: Fix segfault in 'perf top' "Wangnan (F)" <wangnan0@huawei.com> - 2015-09-14 12:20 +0200
[PATCH v2] perf tools: Fix segfault in 'perf top' Wang Nan <wangnan0@huawei.com> - 2015-09-14 12:30 +0200
Re: [PATCH v2] perf tools: Fix segfault in 'perf top' Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-14 20:10 +0200
Re: [PATCH v2] perf tools: Fix segfault in 'perf top' Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-14 20:20 +0200
[tip:perf/core] perf top: Fix segfault pressing -> with no hist entries tip-bot for Wang Nan <tipbot@zytor.com> - 2015-09-16 09:30 +0200
| From | Wang Nan <wangnan0@huawei.com> |
|---|---|
| Date | 2015-09-11 07:00 +0200 |
| Subject | [PATCH] perf tools: Fix segfault in 'perf top' |
| Message-ID | <q7oBj-89G-1@gated-at.bofh.it> |
'perf top' segfaults with following operation: # perf top -e page-faults -p 15173 # 15173 never generate page-fault Then on the resulting empty interface, press right key: # ./perf top -e page-faults -p 11400 perf: Segmentation fault -------- backtrace -------- ./perf[0x535428] /lib64/libc.so.6(+0x3545f)[0x7f0dd360745f] ./perf[0x531d46] ./perf(perf_evlist__tui_browse_hists+0x96)[0x5340d6] ./perf[0x44ba2f] /lib64/libpthread.so.0(+0x81d0)[0x7f0dd49dc1d0] /lib64/libc.so.6(clone+0x6c)[0x7f0dd36b90dc] The bug reside in perf_evsel__hists_browse() that, in the above circumstance browser->selection can be NULL, but code after skip_annotation doesn't consider it. This patch fix it by checing browser->selection before fetching browser->selection->map and browser->selection->sym. Signed-off-by: Wang Nan <wangnan0@huawei.com> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> --- tools/perf/ui/browsers/hists.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index e4fd40f..b00fa92 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -2017,7 +2017,8 @@ skip_annotation: &options[nr_options], dso); nr_options += add_map_opt(browser, &actions[nr_options], &options[nr_options], - browser->selection->map); + browser->selection ? + browser->selection->map : NULL); nr_options += add_socket_opt(browser, &actions[nr_options], &options[nr_options], socket); @@ -2030,7 +2031,10 @@ skip_annotation: nr_options += add_script_opt(browser, &actions[nr_options], &options[nr_options], - NULL, browser->selection->sym); + NULL, + browser->selection ? + browser->selection->sym : + NULL); } nr_options += add_script_opt(browser, &actions[nr_options], &options[nr_options], NULL, NULL); -- 1.8.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Namhyung Kim <namhyung@kernel.org> |
|---|---|
| Date | 2015-09-11 18:30 +0200 |
| Message-ID | <q7zn4-6Xj-29@gated-at.bofh.it> |
| In reply to | #1222527 |
On Fri, Sep 11, 2015 at 04:59:11AM +0000, Wang Nan wrote: > 'perf top' segfaults with following operation: > > # perf top -e page-faults -p 15173 # 15173 never generate page-fault > > Then on the resulting empty interface, press right key: > > # ./perf top -e page-faults -p 11400 > perf: Segmentation fault > -------- backtrace -------- > ./perf[0x535428] > /lib64/libc.so.6(+0x3545f)[0x7f0dd360745f] > ./perf[0x531d46] > ./perf(perf_evlist__tui_browse_hists+0x96)[0x5340d6] > ./perf[0x44ba2f] > /lib64/libpthread.so.0(+0x81d0)[0x7f0dd49dc1d0] > /lib64/libc.so.6(clone+0x6c)[0x7f0dd36b90dc] > > The bug reside in perf_evsel__hists_browse() that, in the above circumstance > browser->selection can be NULL, but code after skip_annotation doesn't consider > it. > > This patch fix it by checing browser->selection before fetching > browser->selection->map and browser->selection->sym. I'm ok with this change, just a nitpick below.. > > Signed-off-by: Wang Nan <wangnan0@huawei.com> > Cc: Arnaldo Carvalho de Melo <acme@kernel.org> > Cc: Namhyung Kim <namhyung@kernel.org> > --- > tools/perf/ui/browsers/hists.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c > index e4fd40f..b00fa92 100644 > --- a/tools/perf/ui/browsers/hists.c > +++ b/tools/perf/ui/browsers/hists.c > @@ -2017,7 +2017,8 @@ skip_annotation: > &options[nr_options], dso); > nr_options += add_map_opt(browser, &actions[nr_options], > &options[nr_options], > - browser->selection->map); > + browser->selection ? > + browser->selection->map : NULL); > nr_options += add_socket_opt(browser, &actions[nr_options], > &options[nr_options], > socket); > @@ -2030,7 +2031,10 @@ skip_annotation: > nr_options += add_script_opt(browser, > &actions[nr_options], > &options[nr_options], > - NULL, browser->selection->sym); > + NULL, > + browser->selection ? > + browser->selection->sym : > + NULL); Is this really needed? IIUC browser->selection is not NULL if browser->he_selection is not NULL. Did you see a case it's NULL? Also passing a NULL thread and a NULL sym is meaningless here since it's a duplication.. Thanks, Namhyung > } > nr_options += add_script_opt(browser, &actions[nr_options], > &options[nr_options], NULL, NULL); > -- > 1.8.3.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | "Wangnan (F)" <wangnan0@huawei.com> |
|---|---|
| Date | 2015-09-14 12:20 +0200 |
| Message-ID | <q8z1F-3fP-23@gated-at.bofh.it> |
| In reply to | #1222954 |
On 2015/9/12 0:22, Namhyung Kim wrote:
> On Fri, Sep 11, 2015 at 04:59:11AM +0000, Wang Nan wrote:
>> 'perf top' segfaults with following operation:
>>
>> # perf top -e page-faults -p 15173 # 15173 never generate page-fault
>>
>> Then on the resulting empty interface, press right key:
>>
>> # ./perf top -e page-faults -p 11400
>> perf: Segmentation fault
>> -------- backtrace --------
>> ./perf[0x535428]
>> /lib64/libc.so.6(+0x3545f)[0x7f0dd360745f]
>> ./perf[0x531d46]
>> ./perf(perf_evlist__tui_browse_hists+0x96)[0x5340d6]
>> ./perf[0x44ba2f]
>> /lib64/libpthread.so.0(+0x81d0)[0x7f0dd49dc1d0]
>> /lib64/libc.so.6(clone+0x6c)[0x7f0dd36b90dc]
>>
>> The bug reside in perf_evsel__hists_browse() that, in the above circumstance
>> browser->selection can be NULL, but code after skip_annotation doesn't consider
>> it.
>>
>> This patch fix it by checing browser->selection before fetching
>> browser->selection->map and browser->selection->sym.
> I'm ok with this change, just a nitpick below..
>
>
>> Signed-off-by: Wang Nan <wangnan0@huawei.com>
>> Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
>> Cc: Namhyung Kim <namhyung@kernel.org>
>> ---
>> tools/perf/ui/browsers/hists.c | 8 ++++++--
>> 1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
>> index e4fd40f..b00fa92 100644
>> --- a/tools/perf/ui/browsers/hists.c
>> +++ b/tools/perf/ui/browsers/hists.c
>> @@ -2017,7 +2017,8 @@ skip_annotation:
>> &options[nr_options], dso);
>> nr_options += add_map_opt(browser, &actions[nr_options],
>> &options[nr_options],
>> - browser->selection->map);
>> + browser->selection ?
>> + browser->selection->map : NULL);
>> nr_options += add_socket_opt(browser, &actions[nr_options],
>> &options[nr_options],
>> socket);
>> @@ -2030,7 +2031,10 @@ skip_annotation:
>> nr_options += add_script_opt(browser,
>> &actions[nr_options],
>> &options[nr_options],
>> - NULL, browser->selection->sym);
>> + NULL,
>> + browser->selection ?
>> + browser->selection->sym :
>> + NULL);
> Is this really needed? IIUC browser->selection is not NULL if
> browser->he_selection is not NULL. Did you see a case it's NULL?
> Also passing a NULL thread and a NULL sym is meaningless here since
> it's a duplication..
Actually I didn't see the case when browser->he_selection is not NULL but
browser->selection is NULL. I add the testing only for safety reason because
we have
if (browser->selection == NULL)
goto skip_annotation;
So I guess we'd better to check browser->selection in the codeblock
leading by
skip_annotation, so if someone breaks the assumption the code still work.
But yes, we can add the checker back when the assumption *does* be broken.
Currently let's add a comment here for code readers.
Please have a look for v2 patch.
Thank you.
> Thanks,
> Namhyung
>
>
>> }
>> nr_options += add_script_opt(browser, &actions[nr_options],
>> &options[nr_options], NULL, NULL);
>> --
>> 1.8.3.4
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Wang Nan <wangnan0@huawei.com> |
|---|---|
| Date | 2015-09-14 12:30 +0200 |
| Subject | [PATCH v2] perf tools: Fix segfault in 'perf top' |
| Message-ID | <q8zbl-3r6-31@gated-at.bofh.it> |
| In reply to | #1222954 |
'perf top' segfaults with following operation: # perf top -e page-faults -p 11400 # 11400 never generates page-fault Then on the resulting empty interface, press right key: # ./perf top -e page-faults -p 11400 perf: Segmentation fault -------- backtrace -------- ./perf[0x535428] /lib64/libc.so.6(+0x3545f)[0x7f0dd360745f] ./perf[0x531d46] ./perf(perf_evlist__tui_browse_hists+0x96)[0x5340d6] ./perf[0x44ba2f] /lib64/libpthread.so.0(+0x81d0)[0x7f0dd49dc1d0] /lib64/libc.so.6(clone+0x6c)[0x7f0dd36b90dc] The bug reside in perf_evsel__hists_browse() that, in the above circumstance browser->selection can be NULL, but code after skip_annotation doesn't consider it. This patch fix it by checking browser->selection before fetching browser->selection->map. Signed-off-by: Wang Nan <wangnan0@huawei.com> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> --- tools/perf/ui/browsers/hists.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index e4fd40f..182b87a 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -2017,7 +2017,8 @@ skip_annotation: &options[nr_options], dso); nr_options += add_map_opt(browser, &actions[nr_options], &options[nr_options], - browser->selection->map); + browser->selection ? + browser->selection->map : NULL); nr_options += add_socket_opt(browser, &actions[nr_options], &options[nr_options], socket); @@ -2027,6 +2028,15 @@ skip_annotation: &actions[nr_options], &options[nr_options], thread, NULL); + /* + * Note that browser->selection != NULL + * when browser->he_selection is not NULL, + * so we don't need to check browser->selection + * before fetching browser->selection->sym like what + * we do before fetching browser->selection->map. + * + * See hist_browser__show_entry. + */ nr_options += add_script_opt(browser, &actions[nr_options], &options[nr_options], -- 1.8.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Date | 2015-09-14 20:10 +0200 |
| Subject | Re: [PATCH v2] perf tools: Fix segfault in 'perf top' |
| Message-ID | <q8Gmu-5nU-21@gated-at.bofh.it> |
| In reply to | #1224012 |
Em Mon, Sep 14, 2015 at 10:23:55AM +0000, Wang Nan escreveu: > 'perf top' segfaults with following operation: > > # perf top -e page-faults -p 11400 # 11400 never generates page-fault > > Then on the resulting empty interface, press right key: So, this happens in perf/urgent, so we need to apply it there first, which this patch doesn't. I am fixing it up this time, thanks for the patch! - Arnaldo > # ./perf top -e page-faults -p 11400 > perf: Segmentation fault > -------- backtrace -------- > ./perf[0x535428] > /lib64/libc.so.6(+0x3545f)[0x7f0dd360745f] > ./perf[0x531d46] > ./perf(perf_evlist__tui_browse_hists+0x96)[0x5340d6] > ./perf[0x44ba2f] > /lib64/libpthread.so.0(+0x81d0)[0x7f0dd49dc1d0] > /lib64/libc.so.6(clone+0x6c)[0x7f0dd36b90dc] > > The bug reside in perf_evsel__hists_browse() that, in the above circumstance > browser->selection can be NULL, but code after skip_annotation doesn't consider > it. > > This patch fix it by checking browser->selection before fetching > browser->selection->map. > > Signed-off-by: Wang Nan <wangnan0@huawei.com> > Cc: Arnaldo Carvalho de Melo <acme@kernel.org> > Cc: Namhyung Kim <namhyung@kernel.org> > --- > tools/perf/ui/browsers/hists.c | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c > index e4fd40f..182b87a 100644 > --- a/tools/perf/ui/browsers/hists.c > +++ b/tools/perf/ui/browsers/hists.c > @@ -2017,7 +2017,8 @@ skip_annotation: > &options[nr_options], dso); > nr_options += add_map_opt(browser, &actions[nr_options], > &options[nr_options], > - browser->selection->map); > + browser->selection ? > + browser->selection->map : NULL); > nr_options += add_socket_opt(browser, &actions[nr_options], > &options[nr_options], > socket); > @@ -2027,6 +2028,15 @@ skip_annotation: > &actions[nr_options], > &options[nr_options], > thread, NULL); > + /* > + * Note that browser->selection != NULL > + * when browser->he_selection is not NULL, > + * so we don't need to check browser->selection > + * before fetching browser->selection->sym like what > + * we do before fetching browser->selection->map. > + * > + * See hist_browser__show_entry. > + */ > nr_options += add_script_opt(browser, > &actions[nr_options], > &options[nr_options], > -- > 1.8.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Date | 2015-09-14 20:20 +0200 |
| Subject | Re: [PATCH v2] perf tools: Fix segfault in 'perf top' |
| Message-ID | <q8Gw9-5zh-3@gated-at.bofh.it> |
| In reply to | #1224385 |
Em Mon, Sep 14, 2015 at 03:07:14PM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Mon, Sep 14, 2015 at 10:23:55AM +0000, Wang Nan escreveu:
> > 'perf top' segfaults with following operation:
> >
> > # perf top -e page-faults -p 11400 # 11400 never generates page-fault
> >
> > Then on the resulting empty interface, press right key:
>
> So, this happens in perf/urgent, so we need to apply it there first,
> which this patch doesn't.
>
> I am fixing it up this time, thanks for the patch!
For reference, below is the resulting patch, pushed to acme/perf/urgent,
now checking if there are more patches to go together with this one...
- Arnaldo
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index cf86f2d3a5e7..c04c60d4863c 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1968,7 +1968,8 @@ skip_annotation:
&options[nr_options], dso);
nr_options += add_map_opt(browser, &actions[nr_options],
&options[nr_options],
- browser->selection->map);
+ browser->selection ?
+ browser->selection->map : NULL);
/* perf script support */
if (browser->he_selection) {
@@ -1976,6 +1977,15 @@ skip_annotation:
&actions[nr_options],
&options[nr_options],
thread, NULL);
+ /*
+ * Note that browser->selection != NULL
+ * when browser->he_selection is not NULL,
+ * so we don't need to check browser->selection
+ * before fetching browser->selection->sym like what
+ * we do before fetching browser->selection->map.
+ *
+ * See hist_browser__show_entry.
+ */
nr_options += add_script_opt(browser,
&actions[nr_options],
&options[nr_options],
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | tip-bot for Wang Nan <tipbot@zytor.com> |
|---|---|
| Date | 2015-09-16 09:30 +0200 |
| Subject | [tip:perf/core] perf top: Fix segfault pressing -> with no hist entries |
| Message-ID | <q9fke-63y-15@gated-at.bofh.it> |
| In reply to | #1224012 |
Commit-ID: bd315aab8a3ab1bc7074774b89a5d8ec7c1ff7ab
Gitweb: http://git.kernel.org/tip/bd315aab8a3ab1bc7074774b89a5d8ec7c1ff7ab
Author: Wang Nan <wangnan0@huawei.com>
AuthorDate: Mon, 14 Sep 2015 10:23:55 +0000
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 14 Sep 2015 15:10:41 -0300
perf top: Fix segfault pressing -> with no hist entries
'perf top' segfaults with following operation:
# perf top -e page-faults -p 11400 # 11400 never generates page-fault
Then on the resulting empty interface, press right key:
# ./perf top -e page-faults -p 11400
perf: Segmentation fault
-------- backtrace --------
./perf[0x535428]
/lib64/libc.so.6(+0x3545f)[0x7f0dd360745f]
./perf[0x531d46]
./perf(perf_evlist__tui_browse_hists+0x96)[0x5340d6]
./perf[0x44ba2f]
/lib64/libpthread.so.0(+0x81d0)[0x7f0dd49dc1d0]
/lib64/libc.so.6(clone+0x6c)[0x7f0dd36b90dc]
The bug resides in perf_evsel__hists_browse() that, in the above
circumstance browser->selection can be NULL, but code after
skip_annotation doesn't consider it.
This patch fix it by checking browser->selection before fetching
browser->selection->map.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1442226235-117265-1-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/ui/browsers/hists.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index cf86f2d..c04c60d 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1968,7 +1968,8 @@ skip_annotation:
&options[nr_options], dso);
nr_options += add_map_opt(browser, &actions[nr_options],
&options[nr_options],
- browser->selection->map);
+ browser->selection ?
+ browser->selection->map : NULL);
/* perf script support */
if (browser->he_selection) {
@@ -1976,6 +1977,15 @@ skip_annotation:
&actions[nr_options],
&options[nr_options],
thread, NULL);
+ /*
+ * Note that browser->selection != NULL
+ * when browser->he_selection is not NULL,
+ * so we don't need to check browser->selection
+ * before fetching browser->selection->sym like what
+ * we do before fetching browser->selection->map.
+ *
+ * See hist_browser__show_entry.
+ */
nr_options += add_script_opt(browser,
&actions[nr_options],
&options[nr_options],
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web