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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 1B1D2C33C8C for ; Mon, 6 Jan 2020 15:12:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E22ED207FF for ; Mon, 6 Jan 2020 15:12:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="MSzgPqQ7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726561AbgAFPMx (ORCPT ); Mon, 6 Jan 2020 10:12:53 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:29823 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726427AbgAFPMw (ORCPT ); Mon, 6 Jan 2020 10:12:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578323572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=sRFCdsObUhwaYBpkEAtlHrLB769AChMtfb4QXMyJqBo=; b=MSzgPqQ72paworZz/IBNz2UVcrC4czTRW5hqUXk15+aR5v6lQB+ZapZR3wP9KgI5gNC4pO 8Rkq41mqqIbffaHoTp/UnCMDZ++MaMX5QgbhWibs6j6bzjOgWatnphzLd9UHVlVofuR4BW T8MpbmFpN3QzVZxsUC2XnEcsOHJm9GQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-141-CZ-0qcgYOaqkoxM9JKkG4g-1; Mon, 06 Jan 2020 10:12:48 -0500 X-MC-Unique: CZ-0qcgYOaqkoxM9JKkG4g-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5F67D92430; Mon, 6 Jan 2020 15:12:46 +0000 (UTC) Received: from krava (unknown [10.43.17.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8DBB985EF5; Mon, 6 Jan 2020 15:12:43 +0000 (UTC) Date: Mon, 6 Jan 2020 16:12:41 +0100 From: Jiri Olsa To: Leo Yan Cc: Arnaldo Carvalho de Melo , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Andi Kleen , linux-kernel@vger.kernel.org Subject: Re: [PATCH] perf parse: Copy string to perf_evsel_config_term Message-ID: <20200106151241.GA236146@krava> References: <20200102151326.31342-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200102151326.31342-1-leo.yan@linaro.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jan 02, 2020 at 11:13:26PM +0800, Leo Yan wrote: > 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, drv_cfg, term->val.str); > __t->val.drv_cfg = term->val.str; > `> __t->val.drv_cfg 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.drv_cfg; > `> sink string has been freed. > > To fix this issue, in the function get_config_terms(), this patch > changes from directly assignment pointer value for the strings to > use strdup() for allocation a new duplicate string for the cases: > > perf_evsel_config_term::val.callgraph > perf_evsel_config_term::val.branch > perf_evsel_config_term::val.drv_cfg. > > Fixes: 1dc925568f01 ("perf parse: Add a deep delete for parse event terms") > Signed-off-by: Leo Yan > --- > tools/perf/util/parse-events.c | 49 ++++++++++++++++++++-------------- > 1 file changed, 29 insertions(+), 20 deletions(-) > > diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c > index ed7c008b9c8b..5972acdd40d6 100644 > --- a/tools/perf/util/parse-events.c > +++ b/tools/perf/util/parse-events.c > @@ -1220,7 +1220,6 @@ static int get_config_terms(struct list_head *head_config, > struct list_head *head_terms __maybe_unused) > { > #define ADD_CONFIG_TERM(__type, __name, __val) \ > -do { \ > struct perf_evsel_config_term *__t; \ > \ > __t = zalloc(sizeof(*__t)); \ > @@ -1229,9 +1228,19 @@ do { \ > \ > INIT_LIST_HEAD(&__t->list); \ > __t->type = PERF_EVSEL__CONFIG_TERM_ ## __type; \ > - __t->val.__name = __val; \ > __t->weak = term->weak; \ > - list_add_tail(&__t->list, head_terms); \ > + list_add_tail(&__t->list, head_terms) > + > +#define ADD_CONFIG_TERM_VAL(__type, __name, __val) \ > +do { \ > + ADD_CONFIG_TERM(__type, __name, __val); \ > + __t->val.__name = __val; \ > +} while (0) > + > +#define ADD_CONFIG_TERM_STR(__type, __name, __val) \ > +do { \ > + ADD_CONFIG_TERM(__type, __name, __val); \ > + __t->val.__name = strdup(__val); \ ok, I understand now.. we move the pointer to the perf_evsel_config_term, but release it after in parse_events_terms__purge the change seems ok, but please check on the strdup return value and cleanup and return -ENOMEM if it fails in here thanks, jirka