From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx4/6IeBhZ0EgN7HZku3/Ome4eDs0wooxg2P1tL9euUWB5zdQFUnIuOh8Loq8gk0X4JNi674o ARC-Seal: i=1; a=rsa-sha256; t=1523399360; cv=none; d=google.com; s=arc-20160816; b=Ql56nC8vVrQ2eYNErIMjweNozDfv72IRCcHkCMirooZXY58dw3sUNrwKMUbxY9PwOy 6LrZAjhmjOP/xJdAZQbiLVksBaM9FgZ4R9XH7sRZHvl8fYW558xDDJnax/gXNLS4hI8C 6BBEQVbnrNOQJFRfLAy2QVfm6EUlN1q54NkNMihidIfYD+Bjame4boQFP/l7VZbny0j4 vPUQcuNlRV9Z2hAWb+Zmhl4OVinrhHM2gM+fDWrkqed31R8v2vuCBlf32seTjLh8DMCf XmmiGzd+0vsgP8FpcbI4bk9lrgoPnyistVtdF1/ueMkf2K+ENHN6+YdcvXvurtwQsw/E 740w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=BwSt9SR7ToDX7nJOztAuuIQ3i99jSq52obRkzZ/dCWs=; b=vp2rs37yMks5H/C4ZBnJEKHuys2B9Pu5OrnCmhW7aRgMijJeK8qxubRag/yQnfrlbY vbp/ej+/RcIN+U1YHM7w55oKTGBVwr89wwtD1nu6KqbNdBUN1Gess/SR5GVp/+e5B8X2 F8jKwCSmcLw6aWLIzT3pd0aOtKWuj4PQciyhlvzkcaXxLX+9nUOgygtZgnnLPGPAsmIp 5jjEB7qynjvLLKJuVpcRoJVRVCjBSP8oxZjXKhmQTC/+GmVUCSuuh/OZd4BxdHp/G0MQ UhosWQNFH9rL32uKFOdsySFBu+TbZ+PlaDu8u+GZlUpqVYOJ2JlUkfs73/iS6/nuOFUW isfQ== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jin Yao , Arnaldo Carvalho de Melo , Alexander Shishkin , Andi Kleen , Jiri Olsa , Kan Liang , Peter Zijlstra , Sasha Levin Subject: [PATCH 4.15 061/168] perf report: Fix a no annotate browser displayed issue Date: Wed, 11 Apr 2018 00:23:23 +0200 Message-Id: <20180410212802.798227844@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180410212800.144079021@linuxfoundation.org> References: <20180410212800.144079021@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1597400008123802873?= X-GMAIL-MSGID: =?utf-8?q?1597400008123802873?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jin Yao [ Upstream commit 40c39e3046411f84bab82f66783ff3593e2bcd9b ] When enabling '-b' option in perf record, for example, perf record -b ... perf report and then browsing the annotate browser from perf report (press 'A'), it would fail (annotate browser can't be displayed). It's because the '.add_entry_cb' op of struct report is overwritten by hist_iter__branch_callback() in builtin-report.c. But this function doesn't do something like mapping symbols and sources. So next, do_annotate() will return directly. notes = symbol__annotation(act->ms.sym); if (!notes->src) return 0; This patch adds the lost code to hist_iter__branch_callback (refer to hist_iter__report_callback). v2: Fix a crash bug when perform 'perf report --stdio'. The reason is that we init the symbol annotation only in browser mode, it doesn't allocate/init resources for stdio mode. So now in hist_iter__branch_callback(), it will return directly if it's not in browser mode. Signed-off-by: Jin Yao Tested-by: Arnaldo Carvalho de Melo Cc: Alexander Shishkin Cc: Andi Kleen Cc: Jiri Olsa Cc: Kan Liang Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1514284963-18587-1-git-send-email-yao.jin@linux.intel.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- tools/perf/builtin-report.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -162,12 +162,28 @@ static int hist_iter__branch_callback(st struct hist_entry *he = iter->he; struct report *rep = arg; struct branch_info *bi; + struct perf_sample *sample = iter->sample; + struct perf_evsel *evsel = iter->evsel; + int err; + + if (!ui__has_annotation()) + return 0; + + hist__account_cycles(sample->branch_stack, al, sample, + rep->nonany_branch_mode); bi = he->branch_info; + err = addr_map_symbol__inc_samples(&bi->from, sample, evsel->idx); + if (err) + goto out; + + err = addr_map_symbol__inc_samples(&bi->to, sample, evsel->idx); + branch_type_count(&rep->brtype_stat, &bi->flags, bi->from.addr, bi->to.addr); - return 0; +out: + return err; } static int process_sample_event(struct perf_tool *tool,