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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 06C1BC433E7 for ; Tue, 13 Oct 2020 08:45:51 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 8865A208D5 for ; Tue, 13 Oct 2020 08:45:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JN1kQFal" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8865A208D5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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=merlin.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=SEwIEL2krsyk31SXR0qwvFyUp9md1pYT3JuS6KP341k=; b=JN1kQFalJHsBjG9y90yUTc3xM inIu86mI8MHC78c6mCQigJRmEfuj7Uk++psVBhRdfGJntGOU6PjhwYUlAzb0QXDWJCLc5KT6frHO1 89ZEqNWWhenkmAgdPn6zsMEOFdsSLzldjlifaZhRcOqnEMSarqItonDEUHShivTCtM9jA2RC/K7rl do04cdNrO4E7qSMrptYVix+r3GXvFqmvpJ4wW6jvgFfxvkqtsCdQ712MaTvqsQPt5A+N8h3VZncky j3G7kW8wHI75PkjGep/0splMY3A80pLxDZLrHVVcfLgPhGFfGK9se4UK8Ismvq+54QgRMqgaUy70Y bra3VQQPQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSFuw-0000eo-QZ; Tue, 13 Oct 2020 08:44:22 +0000 Received: from lhrrgout.huawei.com ([185.176.76.210] helo=huawei.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSFut-0000dp-MX for linux-arm-kernel@lists.infradead.org; Tue, 13 Oct 2020 08:44:21 +0000 Received: from lhreml724-chm.china.huawei.com (unknown [172.18.7.107]) by Forcepoint Email with ESMTP id 4C6FD9BD907B2567ECAD; Tue, 13 Oct 2020 09:44:17 +0100 (IST) Received: from [127.0.0.1] (10.47.6.6) 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; Tue, 13 Oct 2020 09:44:16 +0100 Subject: Re: [PATCH] perf jevents: Fix event code for events referencing std arch events To: Jiri Olsa References: <1602170368-11892-1-git-send-email-john.garry@huawei.com> <20201012105430.GH1099489@krava> <5b0aefe2-e0d5-b5ff-654c-4e93c427050f@huawei.com> <20201012112419.GJ1099489@krava> From: John Garry Message-ID: <9e8e3d2d-d15d-13df-ab97-34df8d81a6a1@huawei.com> Date: Tue, 13 Oct 2020 09:41:08 +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: <20201012112419.GJ1099489@krava> Content-Language: en-US X-Originating-IP: [10.47.6.6] X-ClientProxiedBy: lhreml719-chm.china.huawei.com (10.201.108.70) To lhreml724-chm.china.huawei.com (10.201.108.75) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201013_044419_889790_A41D5248 X-CRM114-Status: GOOD ( 14.52 ) 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@arm.com, irogers@google.com, peterz@infradead.org, kjain@linux.ibm.com, linux-kernel@vger.kernel.org, acme@kernel.org, linuxarm@huawei.com, alexander.shishkin@linux.intel.com, yao.jin@linux.intel.com, mingo@redhat.com, linux-arm-kernel@lists.infradead.org, namhyung@kernel.org, yeyunfeng@huawei.com Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 12/10/2020 12:24, Jiri Olsa wrote: > On Mon, Oct 12, 2020 at 12:15:04PM +0100, John Garry wrote: >> 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. > > right, thanks > > Acked-by: Jiri Olsa > > jirka > > . > "PMU events" testcase was still passing as it does not cover this scenario, so I'll look to expand the test to catch such problems. Thanks, John _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel