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=-14.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 D91E8C433E2 for ; Tue, 15 Sep 2020 03:19:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 91D28208DB for ; Tue, 15 Sep 2020 03:19:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600139993; bh=FtzoOAjFFRX5CJZJmkahFMMRKxpp4Ud44ShsXlVf+Ws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BdfoLD1nceMnyhb0cbnjFbsIy7F1peMN4tvNZZ4JdeZCjCFkIM5ilCvahQ2KiEjm9 fQ5Ansmk8sLQ6ZgqoCWvGjNDeAEzLGJBj9mxg1X/mT41xsReWC0sRR1Tc+3BrAgTFp AagSpMB/36dK6vb8Dzx0ackXHF3JENChjSACHWV0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726267AbgIODTt (ORCPT ); Mon, 14 Sep 2020 23:19:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726196AbgIODTD (ORCPT ); Mon, 14 Sep 2020 23:19:03 -0400 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4BEEC06178A for ; Mon, 14 Sep 2020 20:19:02 -0700 (PDT) Received: by mail-pj1-x1042.google.com with SMTP id u3so1008814pjr.3 for ; Mon, 14 Sep 2020 20:19:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Bqc2nFfVQoyA+fxwcch9VdXdA8Cn9R6fIwtpNpLjHv0=; b=feJYzK4l0Du/NGZ13gYF7OWIpRFcFlxf+jaRvXSAwVOe7hjEw6k1b2Z4r65QNf+r/Z 6oGhE2IX6OWysBGr00MOEvsqR+syyPNfihbPcYoSSH/AgRPtJzmlHYiq+AUEbqOyxZ4j 8Ij9DWjc4A1Vpb6s0V9CbV3dbK0oipps9V8qp4ohYwv44VjDqdmMlq2YGlJRClI3d5OW RjAYKzWRDHJpDAI2ba3YQPcGAmFZulAdB0FJxveO4je7YxE6lYh67KU5ajelQBURigEE 3dZ7wBHuskZrLegFXvKlkilMzSQqo4AfGGPY2SuP9HATJUYq9ZqGKsIjXzai0bov7R6F 8fVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Bqc2nFfVQoyA+fxwcch9VdXdA8Cn9R6fIwtpNpLjHv0=; b=XqhKyGGXlzxb9j1/wlhwH7CJhovwSqxBGVdrLDF0Dk9ot4K+v00d5WtA74LX2JaEzL fi2RmJlIhWx3rniFgTLydgTvqBYDg/qyzd9YuHwWCGjz4wRF70IBw6TUdXRtALyzOtpF txSPllwBWsesKsCBwqwrf426g2/JV3U5Odp41O3qu5H+d34TJKBrJIzdk704uyENSEMo 9KKpTrfYD4VEecCyJgKNXuqzRHr7U1HE39Yulj+zgbNnyFFi+LvRXKNqGrzLrTDm4NT4 /e3cFlMvvPglqPzRHkgZ/QR1vjaXM7V7WjbHz9pOwGixSLFUQF+vjkbz9Dbjdj/AQaoo vx4A== X-Gm-Message-State: AOAM533k02j8NetWeUtP3yimCM6+04FB+FDStxXdx2Zeog20oLy9+iMf 3rM/UVmbEVy0GfyM8bq67lY= X-Google-Smtp-Source: ABdhPJxVsMwvnNr7dtKQLw67SGl7B0gdLLHYV466neeQof8yNvVqVn3auZSM9lj9oFZg1zimJOjPdQ== X-Received: by 2002:a17:902:6b4c:: with SMTP id g12mr17408754plt.39.1600139942189; Mon, 14 Sep 2020 20:19:02 -0700 (PDT) Received: from balhae.roam.corp.google.com ([101.235.31.111]) by smtp.gmail.com with ESMTPSA id a24sm10584582pju.25.2020.09.14.20.18.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2020 20:19:01 -0700 (PDT) From: Namhyung Kim To: Arnaldo Carvalho de Melo , Jiri Olsa Cc: Ingo Molnar , Peter Zijlstra , Mark Rutland , Alexander Shishkin , Stephane Eranian , LKML , Andi Kleen , Ian Rogers Subject: [PATCH 09/11] perf metric: Do not free metric when failed to resolve Date: Tue, 15 Sep 2020 12:18:17 +0900 Message-Id: <20200915031819.386559-10-namhyung@kernel.org> X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog In-Reply-To: <20200915031819.386559-1-namhyung@kernel.org> References: <20200915031819.386559-1-namhyung@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It's dangerous to free the original metric when it's called from resolve_metric() as it's already in the metric_list and might have other resources too. Instead, it'd better let them bail out and be released properly at the later stage. So add a check when it's called from metricgroup__add_metric() and release it. Also make sure that mp is set properly. Acked-by: Jiri Olsa Fixes: 83de0b7d535de ("perf metric: Collect referenced metrics in struct metric_ref_node") Signed-off-by: Namhyung Kim --- tools/perf/util/metricgroup.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 35bcaa8d11e9..941702cb6a79 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -673,7 +673,6 @@ static int __add_metric(struct list_head *metric_list, m->has_constraint = metric_no_group || metricgroup__has_constraint(pe); INIT_LIST_HEAD(&m->metric_refs); m->metric_refs_cnt = 0; - *mp = m; parent = expr_ids__alloc(ids); if (!parent) { @@ -686,6 +685,7 @@ static int __add_metric(struct list_head *metric_list, free(m); return -ENOMEM; } + *mp = m; } else { /* * We got here for the referenced metric, via the @@ -720,8 +720,11 @@ static int __add_metric(struct list_head *metric_list, * all the metric's IDs and add it to the parent context. */ if (expr__find_other(pe->metric_expr, NULL, &m->pctx, runtime) < 0) { - expr__ctx_clear(&m->pctx); - free(m); + if (m->metric_refs_cnt == 0) { + expr__ctx_clear(&m->pctx); + free(m); + *mp = NULL; + } return -EINVAL; } -- 2.28.0.618.gf4bc123cb7-goog