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=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 BD315C33CB1 for ; Fri, 17 Jan 2020 13:34:16 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 9444C206B7 for ; Fri, 17 Jan 2020 13:34:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="MMBN8Xwt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9444C206B7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-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=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ePlDWC4gbxCY6UIMfAEL7aovXGAgdfVKb0Z9f4c3TC0=; b=MMBN8XwtfgTrL6 cK+We4wXYOC1V09vfYJYuNyxAY4r1poy/ah0NprzV7W2S9Q5LCYY34odo5q8DRkwXI/St3KO4WZL1 9oDbRNr4B8JuwD4wsZbBpA+AIezKUXdqLXafPYbQbldYaan36YUK561tsDudqhXbavYkzU5BtCYKG Ve95AWdJDH9oW6GAo1TjkKqJCdm0KrOQfBWBMuj/8NcH0Po4EqAWISSqVs7BsiebVXLLeJyrRDtRl tXdCwRwMFXyKwZrSBMnVEqd8OSfgEfzet2ssE0fZj3zabaKOpfcBMyNyf4SgdTKmmk82IFKa6DriE QvlPdqsuFap9g7lEKm9w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1isRlQ-0003NC-6B; Fri, 17 Jan 2020 13:34:16 +0000 Received: from [179.97.37.151] (helo=sandy.ghostprotocols.net) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1isRlN-0003Mu-JD; Fri, 17 Jan 2020 13:34:14 +0000 Received: by sandy.ghostprotocols.net (Postfix, from userid 1000) id 3ABB611E4; Fri, 17 Jan 2020 10:34:09 -0300 (BRT) Date: Fri, 17 Jan 2020 10:34:09 -0300 From: Arnaldo Carvalho de Melo To: Leo Yan Subject: Re: [PATCH v6 2/2] perf parse: Copy string to perf_evsel_config_term Message-ID: <20200117133409.GB3323@redhat.com> References: <20200117055251.24058-1-leo.yan@linaro.org> <20200117055251.24058-2-leo.yan@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200117055251.24058-2-leo.yan@linaro.org> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.20 (2009-12-10) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Ian Rogers , Andi Kleen , Mathieu Poirier , Suzuki K Poulose , Peter Zijlstra , Adrian Hunter , linux-kernel@vger.kernel.org, Alexander Shishkin , Ingo Molnar , Jiri Olsa , Namhyung Kim , linux-arm-kernel@lists.infradead.org, Mike Leach Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Em Fri, Jan 17, 2020 at 01:52:51PM +0800, Leo Yan escreveu: > perf with CoreSight fails to record trace data with command: > > perf record -e cs_etm/@tmc_etr0/u --per-thread ls > failed to set sink "" on event cs_etm/@tmc_etr0/u with 21 (Is a > directory)/perf/ > > This failure is root caused with the commit 1dc925568f01 ("perf > parse: Add a deep delete for parse event terms"). > > The log shows, cs_etm fails to parse the sink attribution; cs_etm event > relies on the event configuration to pass sink name, but the event > specific configuration data cannot be passed properly with flow: > > get_config_terms() > ADD_CONFIG_TERM(DRV_CFG, term->val.str); > __t->val.str = term->val.str; > `> __t->val.str is assigned to term->val.str; > > parse_events_terms__purge() > parse_events_term__delete() > zfree(&term->val.str); > `> term->val.str is freed and assigned to NULL pointer; > > cs_etm_set_sink_attr() > sink = __t->val.str; > `> sink string has been freed. > > To fix this issue, in the function get_config_terms(), this patch > changes to use strdup() for allocation a new duplicate string rather > than directly assignment string pointer. > > This patch addes a new field 'free_str' in the data structure > perf_evsel_config_term; 'free_str' is set to true when the union is used > as a string pointer; thus it can tell perf_evsel__free_config_terms() to > free the string. > > Fixes: 1dc925568f01 ("perf parse: Add a deep delete for parse event terms") > Suggested-by: Jiri Olsa > Signed-off-by: Leo Yan > Acked-by: Jiri Olsa > --- > tools/perf/util/evsel.c | 2 ++ > tools/perf/util/evsel_config.h | 1 + > tools/perf/util/parse-events.c | 7 ++++++- > 3 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c > index 549abd43816f..6fe9e28180e5 100644 > --- a/tools/perf/util/evsel.c > +++ b/tools/perf/util/evsel.c > @@ -1265,6 +1265,8 @@ static void perf_evsel__free_config_terms(struct evsel *evsel) > > list_for_each_entry_safe(term, h, &evsel->config_terms, list) { > list_del_init(&term->list); > + if (term->free_str) > + free(term->val.str); I'm replacing this with zfree, so that we can catch possible bugs where term gets used after freed, just like you do below, in ADD_CONFIG_TERM_STR() Thanks, > free(term); > } > } > diff --git a/tools/perf/util/evsel_config.h b/tools/perf/util/evsel_config.h > index b4a65201e4f7..e026ab67b008 100644 > --- a/tools/perf/util/evsel_config.h > +++ b/tools/perf/util/evsel_config.h > @@ -32,6 +32,7 @@ enum evsel_term_type { > struct perf_evsel_config_term { > struct list_head list; > enum evsel_term_type type; > + bool free_str; > union { > u64 period; > u64 freq; > diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c > index f59f3c8da473..c01ba6f8fdad 100644 > --- a/tools/perf/util/parse-events.c > +++ b/tools/perf/util/parse-events.c > @@ -1240,7 +1240,12 @@ do { \ > #define ADD_CONFIG_TERM_STR(__type, __val) \ > do { \ > ADD_CONFIG_TERM(__type); \ > - __t->val.str = __val; \ > + __t->val.str = strdup(__val); \ > + if (!__t->val.str) { \ > + zfree(&__t); \ > + return -ENOMEM; \ > + } \ > + __t->free_str = true; \ > } while (0) > > struct parse_events_term *term; > -- > 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel