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, 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 BE25EC433DF for ; Mon, 12 Oct 2020 11:18:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7AF2A2076E for ; Mon, 12 Oct 2020 11:18:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387986AbgJLLSQ (ORCPT ); Mon, 12 Oct 2020 07:18:16 -0400 Received: from lhrrgout.huawei.com ([185.176.76.210]:2969 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2387681AbgJLLSO (ORCPT ); Mon, 12 Oct 2020 07:18:14 -0400 Received: from lhreml724-chm.china.huawei.com (unknown [172.18.7.108]) by Forcepoint Email with ESMTP id DACD698E2956841DAB43; Mon, 12 Oct 2020 12:18:12 +0100 (IST) Received: from [127.0.0.1] (10.47.8.38) 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.1913.5; Mon, 12 Oct 2020 12:18:11 +0100 Subject: Re: [PATCH] perf jevents: Fix event code for events referencing std arch events To: Jiri Olsa CC: , , , , , , , , , , , , <=linux-arm-kernel@lists.infradead.org> References: <1602170368-11892-1-git-send-email-john.garry@huawei.com> <20201012105430.GH1099489@krava> From: John Garry Message-ID: <5b0aefe2-e0d5-b5ff-654c-4e93c427050f@huawei.com> Date: Mon, 12 Oct 2020 12:15:04 +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: <20201012105430.GH1099489@krava> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.47.8.38] 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/10/2020 11:54, Jiri Olsa wrote: >> ff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c >> index 99df41a9543d..e47644cab3fa 100644 >> --- a/tools/perf/pmu-events/jevents.c >> +++ b/tools/perf/pmu-events/jevents.c >> @@ -505,20 +505,15 @@ static char *real_event(const char *name, char *event) >> } >> >> static int >> -try_fixup(const char *fn, char *arch_std, unsigned long long eventcode, >> - struct json_event *je) >> +try_fixup(const char *fn, char *arch_std, struct json_event *je, char **event) >> { >> /* try to find matching event from arch standard values */ >> struct event_struct *es; >> >> list_for_each_entry(es, &arch_std_events, list) { >> if (!strcmp(arch_std, es->name)) { >> - if (!eventcode && es->event) { >> - /* allow EventCode to be overridden */ >> - free(je->event); >> - je->event = NULL; >> - } >> FOR_ALL_EVENT_STRUCT_FIELDS(TRY_FIXUP_FIELD); >> + *event = je->event; > I'm bit rusty on this code, > but isn't je->event NULL at this point? je->event should be now assigned from es->event because of FOR_ALL_EVENT_STRUCT_FIELDS(TRY_FIXUP_FIELD): #define TRY_FIXUP_FIELD(field) do { if (es->field && !*field) {\ *field = strdup(es->field); \ if (!*field) \ return -ENOMEM; \ } } while (0) And es->event should be set. Thanks, John