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=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 49C88C5DF65 for ; Wed, 6 Nov 2019 14:25:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0B430217F5 for ; Wed, 6 Nov 2019 14:25:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Rohg3/+N" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732006AbfKFOZQ (ORCPT ); Wed, 6 Nov 2019 09:25:16 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:31472 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731998AbfKFOZP (ORCPT ); Wed, 6 Nov 2019 09:25:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573050314; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h5pPZVTREMq4qu46ZNU6BI6SD31ir0ObDVVlebbDEPg=; b=Rohg3/+N1/xhvW8xjTvBauEgcbMW5pEmLCrvbGsgp4yr8tp9QcjPdFROe04Ew35DA1kw52 UaQx5YMPqog68Ej3N92MIfBP1F0uKzfY1+7IssG4/h90sDFA6Jnvyrq7N2OJoVE8z1+nUv C/EYarZJA5Xu99duFv348KZXEo9VfQ8= 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-223-otur01r4OniW7ijTIICpDQ-1; Wed, 06 Nov 2019 09:25:10 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2D6058017E0; Wed, 6 Nov 2019 14:25:08 +0000 (UTC) Received: from krava (unknown [10.43.17.48]) by smtp.corp.redhat.com (Postfix) with SMTP id 5AD1C5C3F8; Wed, 6 Nov 2019 14:25:04 +0000 (UTC) Date: Wed, 6 Nov 2019 15:25:03 +0100 From: Jiri Olsa To: Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Namhyung Kim , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , Andi Kleen , Jin Yao , Adrian Hunter , Kan Liang , John Garry , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, clang-built-linux@googlegroups.com, Stephane Eranian Subject: Re: [PATCH v5 05/10] perf tools: ensure config and str in terms are unique Message-ID: <20191106142503.GK30214@krava> References: <20191025180827.191916-1-irogers@google.com> <20191030223448.12930-1-irogers@google.com> <20191030223448.12930-6-irogers@google.com> MIME-Version: 1.0 In-Reply-To: <20191030223448.12930-6-irogers@google.com> User-Agent: Mutt/1.12.1 (2019-06-15) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: otur01r4OniW7ijTIICpDQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Wed, Oct 30, 2019 at 03:34:43PM -0700, Ian Rogers wrote: > Make it easier to release memory associated with parse event terms by > duplicating the string for the config name and ensuring the val string > is a duplicate. >=20 > Currently the parser may memory leak terms and this is addressed in a > later patch. >=20 > Signed-off-by: Ian Rogers Acked-by: Jiri Olsa thanks, jirka > --- > tools/perf/util/parse-events.c | 51 ++++++++++++++++++++++++++++------ > tools/perf/util/parse-events.y | 4 ++- > 2 files changed, 45 insertions(+), 10 deletions(-) >=20 > diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-event= s.c > index 03e54a2d8685..578288c94d2a 100644 > --- a/tools/perf/util/parse-events.c > +++ b/tools/perf/util/parse-events.c > @@ -1412,7 +1412,6 @@ int parse_events_add_pmu(struct parse_events_state = *parse_state, > int parse_events_multi_pmu_add(struct parse_events_state *parse_state, > =09=09=09 char *str, struct list_head **listp) > { > -=09struct list_head *head; > =09struct parse_events_term *term; > =09struct list_head *list; > =09struct perf_pmu *pmu =3D NULL; > @@ -1429,19 +1428,30 @@ int parse_events_multi_pmu_add(struct parse_event= s_state *parse_state, > =20 > =09=09list_for_each_entry(alias, &pmu->aliases, list) { > =09=09=09if (!strcasecmp(alias->name, str)) { > +=09=09=09=09struct list_head *head; > +=09=09=09=09char *config; > + > =09=09=09=09head =3D malloc(sizeof(struct list_head)); > =09=09=09=09if (!head) > =09=09=09=09=09return -1; > =09=09=09=09INIT_LIST_HEAD(head); > -=09=09=09=09if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_US= ER, > -=09=09=09=09=09=09=09 str, 1, false, &str, NULL) < 0) > +=09=09=09=09config =3D strdup(str); > +=09=09=09=09if (!config) > +=09=09=09=09=09return -1; > +=09=09=09=09if (parse_events_term__num(&term, > +=09=09=09=09=09=09 PARSE_EVENTS__TERM_TYPE_USER, > +=09=09=09=09=09=09 config, 1, false, &config, > +=09=09=09=09=09=09 NULL) < 0) { > +=09=09=09=09=09free(list); > +=09=09=09=09=09free(config); > =09=09=09=09=09return -1; > +=09=09=09=09} > =09=09=09=09list_add_tail(&term->list, head); > =20 > =09=09=09=09if (!parse_events_add_pmu(parse_state, list, > =09=09=09=09=09=09=09 pmu->name, head, > =09=09=09=09=09=09=09 true, true)) { > -=09=09=09=09=09pr_debug("%s -> %s/%s/\n", str, > +=09=09=09=09=09pr_debug("%s -> %s/%s/\n", config, > =09=09=09=09=09=09 pmu->name, alias->str); > =09=09=09=09=09ok++; > =09=09=09=09} > @@ -1450,8 +1460,10 @@ int parse_events_multi_pmu_add(struct parse_events= _state *parse_state, > =09=09=09} > =09=09} > =09} > -=09if (!ok) > +=09if (!ok) { > +=09=09free(list); > =09=09return -1; > +=09} > =09*listp =3D list; > =09return 0; > } > @@ -2746,30 +2758,51 @@ int parse_events_term__sym_hw(struct parse_events= _term **term, > =09=09=09 char *config, unsigned idx) > { > =09struct event_symbol *sym; > +=09char *str; > =09struct parse_events_term temp =3D { > =09=09.type_val =3D PARSE_EVENTS__TERM_TYPE_STR, > =09=09.type_term =3D PARSE_EVENTS__TERM_TYPE_USER, > -=09=09.config =3D config ?: (char *) "event", > +=09=09.config =3D config, > =09}; > =20 > +=09if (!temp.config) { > +=09=09temp.config =3D strdup("event"); > +=09=09if (!temp.config) > +=09=09=09return -ENOMEM; > +=09} > =09BUG_ON(idx >=3D PERF_COUNT_HW_MAX); > =09sym =3D &event_symbols_hw[idx]; > =20 > -=09return new_term(term, &temp, (char *) sym->symbol, 0); > +=09str =3D strdup(sym->symbol); > +=09if (!str) > +=09=09return -ENOMEM; > +=09return new_term(term, &temp, str, 0); > } > =20 > int parse_events_term__clone(struct parse_events_term **new, > =09=09=09 struct parse_events_term *term) > { > +=09char *str; > =09struct parse_events_term temp =3D { > =09=09.type_val =3D term->type_val, > =09=09.type_term =3D term->type_term, > -=09=09.config =3D term->config, > +=09=09.config =3D NULL, > =09=09.err_term =3D term->err_term, > =09=09.err_val =3D term->err_val, > =09}; > =20 > -=09return new_term(new, &temp, term->val.str, term->val.num); > +=09if (term->config) { > +=09=09temp.config =3D strdup(term->config); > +=09=09if (!temp.config) > +=09=09=09return -ENOMEM; > +=09} > +=09if (term->type_val =3D=3D PARSE_EVENTS__TERM_TYPE_NUM) > +=09=09return new_term(new, &temp, NULL, term->val.num); > + > +=09str =3D strdup(term->val.str); > +=09if (!str) > +=09=09return -ENOMEM; > +=09return new_term(new, &temp, str, 0); > } > =20 > int parse_events_copy_term_list(struct list_head *old, > diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-event= s.y > index ffa1a1b63796..545ab7cefc20 100644 > --- a/tools/perf/util/parse-events.y > +++ b/tools/perf/util/parse-events.y > @@ -665,9 +665,11 @@ PE_NAME array '=3D' PE_VALUE > PE_DRV_CFG_TERM > { > =09struct parse_events_term *term; > +=09char *config =3D strdup($1); > =20 > +=09ABORT_ON(!config); > =09ABORT_ON(parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CF= G, > -=09=09=09=09=09$1, $1, &@1, NULL)); > +=09=09=09=09=09config, $1, &@1, NULL)); > =09$$ =3D term; > } > =20 > --=20 > 2.24.0.rc1.363.gb1bccd3e3d-goog >=20