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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 583B9C433C1 for ; Mon, 22 Mar 2021 10:35:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 28B1A6198E for ; Mon, 22 Mar 2021 10:35:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229879AbhCVKfX (ORCPT ); Mon, 22 Mar 2021 06:35:23 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:13657 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230224AbhCVKe6 (ORCPT ); Mon, 22 Mar 2021 06:34:58 -0400 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4F3rRG3M94zlSZ7; Mon, 22 Mar 2021 18:32:26 +0800 (CST) Received: from [10.67.102.248] (10.67.102.248) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.498.0; Mon, 22 Mar 2021 18:34:51 +0800 Subject: Re: [PATCH v6] perf annotate: Fix sample events lost in stdio mode To: Namhyung Kim CC: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Yao Jin , , , linux-kernel References: <20210317094409.94293-1-yangjihong1@huawei.com> From: Yang Jihong Message-ID: Date: Mon, 22 Mar 2021 18:34:51 +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: Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit 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/18 14:13, Namhyung Kim wrote: > Hello, > > On Wed, Mar 17, 2021 at 6:44 PM Yang Jihong wrote: >> >> In hist__find_annotations function, since different hist_entry may point to 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 remove zfree in hists__find_annotations and >> change sort order to "dso,symbol" to avoid duplicate output when different >> processes correspond to the same symbol. >> >> Signed-off-by: Yang Jihong >> --- >> >> Changes since v5: >> - Add Signed-off-by tag. >> >> Changes since v4: >> - Use the same sort key "dso,symbol" in branch stack mode. >> >> Changes since v3: >> - Modify the first line of comments. >> >> Changes since v2: >> - Remove zfree in hists__find_annotations. >> - Change sort order to avoid duplicate output. >> >> Changes since v1: >> - Change processed flag variable from u8 to bool. >> >> tools/perf/builtin-annotate.c | 13 ++++++------- >> 1 file changed, 6 insertions(+), 7 deletions(-) >> >> diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c >> index a23ba6bb99b6..92c55f292c11 100644 >> --- a/tools/perf/builtin-annotate.c >> +++ b/tools/perf/builtin-annotate.c >> @@ -374,13 +374,6 @@ static void hists__find_annotations(struct hists *hists, >> } else { >> hist_entry__tty_annotate(he, evsel, ann); >> 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); >> } >> } >> } >> @@ -619,6 +612,12 @@ int cmd_annotate(int argc, const char **argv) >> >> setup_browser(true); >> >> + /* >> + * Events of different processes may correspond to the same >> + * symbol, we do not care about the processes in annotate, >> + * set sort order to avoid repeated output. >> + */ >> + sort_order = "dso,symbol"; > > At this point, I think there's not much value having separate > setup_sorting() for branch mode. > I've resubmitted the patch for v7 as suggested below: https://lore.kernel.org/patchwork/patch/1399031/ Is there anything else that needs to be modified? Please take some time to review, thank you for your patience :) Thanks, Yang > Thanks, > Namhyung > > >> if ((use_browser == 1 || annotate.use_stdio2) && annotate.has_br_stack) { >> sort__mode = SORT_MODE__BRANCH; >> if (setup_sorting(annotate.session->evlist) < 0) >> -- >> 2.30.GIT >> > . >