From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC388C433E0 for ; Thu, 11 Mar 2021 08:49:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A475C64F47 for ; Thu, 11 Mar 2021 08:49:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231697AbhCKIsr (ORCPT ); Thu, 11 Mar 2021 03:48:47 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:12711 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231626AbhCKIsb (ORCPT ); Thu, 11 Mar 2021 03:48:31 -0500 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4Dx2bh1fl8zmVy3; Thu, 11 Mar 2021 16:46:08 +0800 (CST) Received: from [10.67.102.248] (10.67.102.248) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.498.0; Thu, 11 Mar 2021 16:48:17 +0800 Subject: Re: [PATCH] perf annotate: Fix sample events lost in stdio mode To: , , , , , , , , , , CC: References: <20210306082859.179541-1-yangjihong1@huawei.com> From: Yang Jihong Message-ID: <53ff575f-1fcf-6650-76ad-a0304f6bdf15@huawei.com> Date: Thu, 11 Mar 2021 16:48:18 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 In-Reply-To: <20210306082859.179541-1-yangjihong1@huawei.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.67.102.248] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello, On 2021/3/6 16:28, Yang Jihong wrote: > In hist__find_annotations function, since have a hist_entry per IP for the same > symbol, we free notes->src to signal already processed this symbol in stdio mode; > when annotate, entry will skipped if notes->src is NULL to avoid repeated output. > > However, there is a problem, for example, run the following command: > > # perf record -e branch-misses -e branch-instructions -a sleep 1 > > perf.data file contains different types of sample event. > > If the same IP sample event exists in branch-misses and branch-instructions, > this event uses the same symbol. When annotate branch-misses events, notes->src > corresponding to this event is set to null, as a result, when annotate > branch-instructions events, this event is skipped and no annotate is output. > > Solution of this patch is to add a u8 member to struct sym_hist and use a bit to > indicate whether the symbol has been processed. > Because different types of event correspond to different sym_hist, no conflict > occurs. > --- > tools/perf/builtin-annotate.c | 22 ++++++++++++++-------- > tools/perf/util/annotate.h | 4 ++++ > 2 files changed, 18 insertions(+), 8 deletions(-) > > diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c > index a23ba6bb99b6..c8c67892ae82 100644 > --- a/tools/perf/builtin-annotate.c > +++ b/tools/perf/builtin-annotate.c > @@ -372,15 +372,21 @@ static void hists__find_annotations(struct hists *hists, > if (next != NULL) > nd = next; > } else { > - hist_entry__tty_annotate(he, evsel, ann); > + struct sym_hist *h = annotated_source__histogram(notes->src, > + evsel->idx); > + > + if (h->processed == 0) { > + hist_entry__tty_annotate(he, evsel, ann); > + > + /* > + * Since we have a hist_entry per IP for the same > + * symbol, set processed flag of evsel in sym_hist > + * to signal we already processed this symbol. > + */ > + h->processed = 1; > + } > + > nd = rb_next(nd); > - /* > - * Since we have a hist_entry per IP for the same > - * symbol, free he->ms.sym->src to signal we already > - * processed this symbol. > - */ > - zfree(¬es->src->cycles_hist); > - zfree(¬es->src); > } > } > } > diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h > index 096cdaf21b01..89872bfdc958 100644 > --- a/tools/perf/util/annotate.h > +++ b/tools/perf/util/annotate.h > @@ -228,6 +228,10 @@ void symbol__calc_percent(struct symbol *sym, struct evsel *evsel); > struct sym_hist { > u64 nr_samples; > u64 period; > + > + u8 processed : 1, /* whether symbol has been processed, used for annotate */ > + __reserved : 7; > + > struct sym_hist_entry addr[]; > }; > > Please check whether this solution is feasible, look forward to your review. Thanks, Yang