From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932330Ab1AKRX1 (ORCPT ); Tue, 11 Jan 2011 12:23:27 -0500 Received: from casper.infradead.org ([85.118.1.10]:42571 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751320Ab1AKRXZ (ORCPT ); Tue, 11 Jan 2011 12:23:25 -0500 Date: Tue, 11 Jan 2011 15:23:10 -0200 From: Arnaldo Carvalho de Melo To: Kirill Smelkov Cc: Frederic Weisbecker , Ingo Molnar , Mike Galbraith , Paul Mackerras , Peter Zijlstra , Stephane Eranian , Tom Zanussi , linux-kernel@vger.kernel.org Subject: Re: [BUG] perf top -> annotate broken; bisected to 69aad6f1 Message-ID: <20110111172309.GC11968@ghostprotocols.net> References: <20110111163520.GA4554@tugrik.mns.mnsspb.ru> <20110111171124.GB11968@ghostprotocols.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110111171124.GB11968@ghostprotocols.net> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.19 (2009-01-05) X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Tue, Jan 11, 2011 at 03:11:24PM -0200, Arnaldo Carvalho de Melo escreveu: > Em Tue, Jan 11, 2011 at 07:35:20PM +0300, Kirill Smelkov escreveu: > > Hello up there, > > > > Since 69aad6f1ee69546dea8535ab8f3da9f445d57328 (perf tools: Introduce > > event selectors; Jan 3 2011) annotating a symbol in perf top segfaults: > > > > Program received signal SIGSEGV, Segmentation fault. > > [Switching to Thread 0xb714cb90 (LWP 4662)] > > event_name (evsel=0x0) at util/parse-events.c:274 > > 274 return __event_name(type, config); > > (gdb) bt > > #0 event_name (evsel=0x0) at util/parse-events.c:274 > > #1 0x0805f892 in display_thread (arg=0x9422448) at builtin-top.c:359 > > #2 0xb77234c0 in start_thread () from /lib/i686/cmov/libpthread.so.0 > > #3 0xb732b84e in clone () from /lib/i686/cmov/libc.so.6 > > > > > > It used to work... > > Thanks for the report, working on a fix. Done, please test it and I'll add a Tested-by: you tag. Thanks, - Arnaldo commit 347ad46af282994524510d62a4c70455929b6a9d Author: Arnaldo Carvalho de Melo Date: Tue Jan 11 15:16:52 2011 -0200 perf top: Fix annotate segv Before we had sym_counter, it was initialized to zero and we used that as an index in the global attrs variable, now we have a list of evsel entries, and sym_counter became sym_evsel, that remained initialized to zero (NULL): b00m. Fix it by initializing it to the first entry in the evsel list. Bug-introduced: 69aad6f Reported-by: Kirill Smelkov Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Kirill Smelkov Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 4b995ee..568b195 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -1473,6 +1473,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __used) pos->attr.sample_period = default_interval; } + sym_evsel = list_entry(evsel_list.next, struct perf_evsel, node); + symbol_conf.priv_size = (sizeof(struct sym_entry) + (nr_counters + 1) * sizeof(unsigned long));