Messages in this thread Patch in this message | | | Date | Sun, 24 May 2009 07:02:29 GMT | From | tip-bot for Mike Galbraith <> | Subject | [tip:perfcounters/core] perf top: fix segfault |
| |
Commit-ID: c2990a2a582d73562d4dcf2502c39892a19a691d Gitweb: http://git.kernel.org/tip/c2990a2a582d73562d4dcf2502c39892a19a691d Author: Mike Galbraith <efault@gmx.de> AuthorDate: Sun, 24 May 2009 08:35:49 +0200 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Sun, 24 May 2009 08:57:08 +0200
perf top: fix segfault
c6eb13 increased stack usage such that perf-top now croaks on startup.
Take event_array and mmap_array off the stack to prevent segfault on boxen with smallish ulimit -s setting.
Signed-off-by: Mike Galbraith <efault@gmx.de> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: John Kacur <jkacur@redhat.com> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu>
--- Documentation/perf_counter/builtin-top.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/perf_counter/builtin-top.c b/Documentation/perf_counter/builtin-top.c index a3216a6..74021ac 100644 --- a/Documentation/perf_counter/builtin-top.c +++ b/Documentation/perf_counter/builtin-top.c @@ -1035,10 +1035,11 @@ static void mmap_read(struct mmap_data *md) md->prev = old; } +static struct pollfd event_array[MAX_NR_CPUS * MAX_COUNTERS]; +static struct mmap_data mmap_array[MAX_NR_CPUS][MAX_COUNTERS]; + int cmd_top(int argc, char **argv, const char *prefix) { - struct pollfd event_array[MAX_NR_CPUS * MAX_COUNTERS]; - struct mmap_data mmap_array[MAX_NR_CPUS][MAX_COUNTERS]; struct perf_counter_hw_event hw_event; pthread_t thread; int i, counter, group_fd, nr_poll = 0;
| |