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=-5.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no 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 418DDC433B4 for ; Tue, 6 Apr 2021 11:05:02 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D168D61055 for ; Tue, 6 Apr 2021 11:05:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D168D61055 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:CC:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=0dTgMPa+SEGtYC5TodeQnys75smPgXo3u7+N3Aha9YY=; b=D+eLh4Si50oT9X5YIvisgK+U4 lCTN3YaQEsDnMTcHZJoDjTrcikFvq6KAKEkL/0nw8H+Ldly9j/Zn3Fv7TXGtq2BqVagkmSVhHEtb7 HfXQijcx7TwRWPIdL+poOrXYPEX+Wmfa7lVmKyTAZnmeHtpXAZY/+yvXXXcq0llODqfEIcXUwPyxY Q26b4Lt4XiDzKPaqTROQ3nFPlIWMFUxEYrShXFBuq5kZCWaE0tvt7XhoMZ4hGg75jmCo9EN8kqNiS wtFdGUx2RYEFj/RX1F2HqQtYJOWs9E5uVw4d9nFBELZnnWXhhqksI0hxzTze7SEWF5wCRpwAQfBbr G1JTjFzpQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lTjU9-002Gis-Fl; Tue, 06 Apr 2021 11:03:05 +0000 Received: from frasgout.his.huawei.com ([185.176.79.56]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lTjU3-002Ghn-Fa for linux-arm-kernel@lists.infradead.org; Tue, 06 Apr 2021 11:03:02 +0000 Received: from fraeml737-chm.china.huawei.com (unknown [172.18.147.226]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4FF4FW0Dffz686J2; Tue, 6 Apr 2021 18:55:59 +0800 (CST) Received: from lhreml724-chm.china.huawei.com (10.201.108.75) by fraeml737-chm.china.huawei.com (10.206.15.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 6 Apr 2021 13:02:56 +0200 Received: from [10.210.166.136] (10.210.166.136) by lhreml724-chm.china.huawei.com (10.201.108.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 6 Apr 2021 12:02:55 +0100 Subject: Re: [PATCH v2 2/6] perf test: Handle metric reuse in pmu-events parsing test To: Jiri Olsa CC: , , , , , , , , , , , , , , , , References: <1616668398-144648-1-git-send-email-john.garry@huawei.com> <1616668398-144648-3-git-send-email-john.garry@huawei.com> From: John Garry Message-ID: Date: Tue, 6 Apr 2021 12:00:27 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.1.2 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Originating-IP: [10.210.166.136] X-ClientProxiedBy: lhreml711-chm.china.huawei.com (10.201.108.62) To lhreml724-chm.china.huawei.com (10.201.108.75) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210406_120259_630465_FEC0A96B X-CRM114-Status: GOOD ( 17.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 01/04/2021 14:49, Jiri Olsa wrote: > On Thu, Mar 25, 2021 at 06:33:14PM +0800, John Garry wrote: > > SNIP > >> +struct metric { >> + struct list_head list; >> + struct metric_ref metric_ref; >> +}; >> + >> +static int resolve_metric_simple(struct expr_parse_ctx *pctx, >> + struct list_head *compound_list, >> + struct pmu_events_map *map, >> + const char *metric_name) >> +{ >> + struct hashmap_entry *cur, *cur_tmp; >> + struct metric *metric, *tmp; >> + size_t bkt; >> + bool all; >> + int rc; >> + >> + do { >> + all = true; >> + hashmap__for_each_entry_safe((&pctx->ids), cur, cur_tmp, bkt) { >> + struct metric_ref *ref; >> + struct pmu_event *pe; >> + >> + pe = metrcgroup_find_metric(cur->key, map); * >> + if (!pe) >> + continue; >> + >> + if (!strcmp(metric_name, (char *)cur->key)) { >> + pr_warning("Recursion detected for metric %s\n", metric_name); >> + rc = -1; >> + goto out_err; >> + } >> + >> + all = false; >> + >> + /* The metric key itself needs to go out.. */ >> + expr__del_id(pctx, cur->key); >> + >> + metric = malloc(sizeof(*metric)); >> + if (!metric) { >> + rc = -ENOMEM; >> + goto out_err; >> + } >> + >> + ref = &metric->metric_ref; >> + ref->metric_name = pe->metric_name; >> + ref->metric_expr = pe->metric_expr; >> + list_add_tail(&metric->list, compound_list); >> + >> + rc = expr__find_other(pe->metric_expr, NULL, pctx, 0); > Hi Jirka, > so this might add new items to pctx->ids, I think you need > to restart the iteration as we do it in __resolve_metric > otherwise you could miss some new keys I thought that I was doing this. Indeed, this code is very much like __resolve_metric() ;) So expr__find_other() may add a new item to pctx->ids, and we always iterate again, and try to lookup any pmu_events, *, above. If none exist, then we have broken down pctx into primitive events aliases and unresolvable metrics, and stop iterating. And then unresolvable metrics would be found in check_parse_cpu(). As an example, we can deal with metric test1, below, which references 2x other metrics: { "MetricExpr": "IDQ_UOPS_NOT_DELIVERED.CORE / (4 * (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) )))", "MetricName": "Frontend_Bound", }, { "MetricExpr": "( UOPS_ISSUED.ANY - UOPS_RETIRED.RETIRE_SLOTS + 4 * INT_MISC.RECOVERY_CYCLES ) / (4 * cycles)", "MetricName": "Bad_Speculation", }, { "MetricExpr": "Bad_Speculation + Frontend_Bound", "MetricName": "test1", }, Does that satisfy your concern, or have I missed something? Thanks, John > > jirka > >> + if (rc) >> + goto out_err; >> + } >> + } while (!all); >> + >> + return 0; >> + >> +out_err: >> + list_for_each_entry_safe(metric, tmp, compound_list, list) >> + free(metric); >> + >> + return rc; >> + >> +} > > SNIP > > . > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel