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=-4.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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 CBF53C433E7 for ; Wed, 14 Oct 2020 16:49:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 78F022173E for ; Wed, 14 Oct 2020 16:49:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602694149; bh=A1Yn3Qg5twHpUa/tSTQXbs9X+Wj34iy7VYyYuzWtF+g=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=1bBUcpZhCds+HNKsKqeDvywQ6NpezqmFZKQK1OPGOpbduidYTSdZzGRCKvQ796JRl DBNbFRRbDtQDNqEwcQSoVRGaxUHWFZGZoTB2PnlsNI5eFdSVpsUgXGFmfHjKIc0GNy TN0eoLqM1umQUTqvJhC8qqht8mckT2ulpxKVbsAM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731282AbgJNQtI (ORCPT ); Wed, 14 Oct 2020 12:49:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:37778 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727440AbgJNQtI (ORCPT ); Wed, 14 Oct 2020 12:49:08 -0400 Received: from quaco.ghostprotocols.net (unknown [179.97.37.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 13DCC214D8; Wed, 14 Oct 2020 16:49:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602694147; bh=A1Yn3Qg5twHpUa/tSTQXbs9X+Wj34iy7VYyYuzWtF+g=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=BOfnVLnTlPv33ozlwOpjP7OtxYZi1UQo6HVB9kYfdd4GkPv4K6z4sOypEn6mXAUiU aDNHVOSeTHhrjCrE2CRHwURhnILwTFJn2kFileyndw/16Ot+ve1cYv8K5aRMYVvx0h fLl/23cSc9DFSUEyaTqWMhmdDHkAeQPyMytTjdjw= Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 16F2C4047F; Wed, 14 Oct 2020 13:49:05 -0300 (-03) Date: Wed, 14 Oct 2020 13:49:05 -0300 From: Arnaldo Carvalho de Melo To: Jiri Olsa Cc: John Garry , peterz@infradead.org, mingo@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, namhyung@kernel.org, kjain@linux.ibm.com, irogers@google.com, yao.jin@linux.intel.com, yeyunfeng@huawei.com, linux-kernel@vger.kernel.org, linuxarm@huawei.com, =linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] perf jevents: Fix event code for events referencing std arch events Message-ID: <20201014164905.GN3100363@kernel.org> References: <1602170368-11892-1-git-send-email-john.garry@huawei.com> <20201012105430.GH1099489@krava> <5b0aefe2-e0d5-b5ff-654c-4e93c427050f@huawei.com> <20201012112419.GJ1099489@krava> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201012112419.GJ1099489@krava> X-Url: http://acmel.wordpress.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Mon, Oct 12, 2020 at 01:24:19PM +0200, Jiri Olsa escreveu: > 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 Ok, applied, please consider adding a Fixes tag next time. - Arnaldo