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=-14.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 D16C1C4338F for ; Sat, 31 Jul 2021 05:50:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 9B0186103B for ; Sat, 31 Jul 2021 05:50:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9B0186103B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=FaqUtzHdvT1tf9j6u9oBaXrqy4rbmpHhhMRnNx2NKj4=; b=cscUERqggHI4Yg 6CGTskyKrfHTqZoyLOEdjw9ViiDoSmLPvHgOTwm2v8tKDUPN2MZgob7xIeOYojiPpy8KebhXW2A4Y SMte9La6xBin6VxnMCUP4ZSrwJALV7NiccseuPntpMFe+47ZMNTBu4y4gfaynsUTVpPyd3pr38gfC L7/xmqaNXX2gD0DMZG32iQCviGI74Prj1UDKKUSf46bppyDTQo+Onh3+L0lF8Km8FMM5c1vmnU2ff wMaAXpuHRBzKE0lgu8N+2Q3BjkUTYAwC9LDEtCFWSvdYvDRhQBl/swgegvneELSv4Kc3kB+MLEpBS Jm7dxSbzi73DhoBVvfTQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m9hrT-00AzJl-Vc; Sat, 31 Jul 2021 05:48:40 +0000 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m9hrQ-00AzJR-CB for linux-arm-kernel@lists.infradead.org; Sat, 31 Jul 2021 05:48:38 +0000 Received: by mail-pj1-x1030.google.com with SMTP id ca5so18188332pjb.5 for ; Fri, 30 Jul 2021 22:48:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=a3dNkIIp38nvkTRD/9A8BOia4PgC9NHj5E0SHTp1uJs=; b=ex/2YtFohxbozZZsAdn2AsScrqJMX3YTgSe2VfRzS1yNfL61V1ta1tGpLqPE9F0Nv2 DAeFvc4FWGO1HVTCsM+dJV+XWvyVBRLKDYhhXXwGl/fcDjbNc7IeLbkpgkOWdqzny0eE JGG784LgzKen3+HrEWDOBbPi0ya8tb19JKmiITUCNT9j9tyQv6f0uTRUOnUtr5sB2Fyo 29dAgnCDWdTxNYYRw24Pz/RErSszgAATULdPPEjrp7mjwhsr/DBkexocrySNQf/YCsxg x1vro4VP/8nbYZm9vwXFjSOfGzORLR3Z8wImu3RhtewDayBESxgBkmNnu/iLf6z55WcG B8YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=a3dNkIIp38nvkTRD/9A8BOia4PgC9NHj5E0SHTp1uJs=; b=K+ATAg+HX5RnjySK1m5rlVWd1SL1Nj55UnNV1WUeXNm22oOlIe1zJBe9VU8L8J2aqj BDCXm/G98Jq4fvALcn2kGjjS7jIizHZgYMAipRvWGtTpEy1QTD99oIcbmgYUXDqJXJDM JJ3sODj58F38ziV4FPPF0knJtFWQCiJinHOWXBsBe2J62HomqiawoLJWFFPkAFGU8xXk g3zPJ55Zsf9RIlAduWUc7teYTN1Sd2XB60DCvURC6VMq+KwyhLJ1mO572Mhqo+Dai38W B0e3Hpbq8ztS6lLlS/ZHGIjo1GwX594o1DIRl1mdJZjQrX8Jvsd3eiDCt3JHPOlJscx+ I9xg== X-Gm-Message-State: AOAM531tf4HIx+Y6pBnyS7VwnzA2jTklWiAjSrwcXR/nWsPBtmnsVpNR Cx/k7s2Ve8mj8gouckMR7wBPZQ== X-Google-Smtp-Source: ABdhPJw1w3uBdCqt/BL/+R66U5TcSLB4x3xh6OYqTQqp+wn4oe4R6q8Ixhqc2OgrHwZl03xpsywUKg== X-Received: by 2002:a63:f1b:: with SMTP id e27mr5100355pgl.314.1627710515270; Fri, 30 Jul 2021 22:48:35 -0700 (PDT) Received: from leoy-ThinkPad-X240s ([204.124.181.43]) by smtp.gmail.com with ESMTPSA id l11sm4560840pfd.187.2021.07.30.22.48.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 22:48:34 -0700 (PDT) Date: Sat, 31 Jul 2021 13:48:22 +0800 From: Leo Yan To: James Clark Cc: acme@kernel.org, mathieu.poirier@linaro.org, coresight@lists.linaro.org, al.grant@arm.com, suzuki.poulose@arm.com, anshuman.khandual@arm.com, mike.leach@linaro.org, John Garry , Will Deacon , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: Re: [PATCH 1/6] perf cs-etm: Refactor initialisation of decoder params. Message-ID: <20210731054822.GA7437@leoy-ThinkPad-X240s> References: <20210721090706.21523-1-james.clark@arm.com> <20210721090706.21523-2-james.clark@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210721090706.21523-2-james.clark@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210730_224836_495128_D814017D X-CRM114-Status: GOOD ( 21.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Jul 21, 2021 at 10:07:00AM +0100, James Clark wrote: > The initialisation of the decoder params is duplicated between > creation of the packet printer and packet decoder. Put them both > into one function so that future changes only need to be made in one > place. > > Signed-off-by: James Clark It's good to wait for Mathieu's review, I reviewed this patch and it's good for me: Reviewed-by: Leo Yan > --- > .../perf/util/cs-etm-decoder/cs-etm-decoder.c | 99 +++++-------------- > 1 file changed, 25 insertions(+), 74 deletions(-) > > diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > index ed1f0326f859..30889a9d0165 100644 > --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > @@ -227,55 +227,6 @@ cs_etm_decoder__init_raw_frame_logging( > } > #endif > > -static int cs_etm_decoder__create_packet_printer(struct cs_etm_decoder *decoder, > - const char *decoder_name, > - void *trace_config) > -{ > - u8 csid; > - > - if (ocsd_dt_create_decoder(decoder->dcd_tree, decoder_name, > - OCSD_CREATE_FLG_PACKET_PROC, > - trace_config, &csid)) > - return -1; > - > - if (ocsd_dt_set_pkt_protocol_printer(decoder->dcd_tree, csid, 0)) > - return -1; > - > - return 0; > -} > - > -static int > -cs_etm_decoder__create_etm_packet_printer(struct cs_etm_trace_params *t_params, > - struct cs_etm_decoder *decoder) > -{ > - const char *decoder_name; > - ocsd_etmv3_cfg config_etmv3; > - ocsd_etmv4_cfg trace_config_etmv4; > - void *trace_config; > - > - switch (t_params->protocol) { > - case CS_ETM_PROTO_ETMV3: > - case CS_ETM_PROTO_PTM: > - cs_etm_decoder__gen_etmv3_config(t_params, &config_etmv3); > - decoder_name = (t_params->protocol == CS_ETM_PROTO_ETMV3) ? > - OCSD_BUILTIN_DCD_ETMV3 : > - OCSD_BUILTIN_DCD_PTM; > - trace_config = &config_etmv3; > - break; > - case CS_ETM_PROTO_ETMV4i: > - cs_etm_decoder__gen_etmv4_config(t_params, &trace_config_etmv4); > - decoder_name = OCSD_BUILTIN_DCD_ETMV4I; > - trace_config = &trace_config_etmv4; > - break; > - default: > - return -1; > - } > - > - return cs_etm_decoder__create_packet_printer(decoder, > - decoder_name, > - trace_config); > -} > - > static ocsd_datapath_resp_t > cs_etm_decoder__do_soft_timestamp(struct cs_etm_queue *etmq, > struct cs_etm_packet_queue *packet_queue, > @@ -629,9 +580,10 @@ static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer( > return resp; > } > > -static int cs_etm_decoder__create_etm_packet_decoder( > - struct cs_etm_trace_params *t_params, > - struct cs_etm_decoder *decoder) > +static int > +cs_etm_decoder__create_etm_decoder(struct cs_etm_decoder_params *d_params, > + struct cs_etm_trace_params *t_params, > + struct cs_etm_decoder *decoder) > { > const char *decoder_name; > ocsd_etmv3_cfg config_etmv3; > @@ -657,31 +609,30 @@ static int cs_etm_decoder__create_etm_packet_decoder( > return -1; > } > > - if (ocsd_dt_create_decoder(decoder->dcd_tree, > - decoder_name, > - OCSD_CREATE_FLG_FULL_DECODER, > - trace_config, &csid)) > - return -1; > + if (d_params->operation == CS_ETM_OPERATION_DECODE) { > + if (ocsd_dt_create_decoder(decoder->dcd_tree, > + decoder_name, > + OCSD_CREATE_FLG_FULL_DECODER, > + trace_config, &csid)) > + return -1; > > - if (ocsd_dt_set_gen_elem_outfn(decoder->dcd_tree, > - cs_etm_decoder__gen_trace_elem_printer, > - decoder)) > - return -1; > + if (ocsd_dt_set_gen_elem_outfn(decoder->dcd_tree, > + cs_etm_decoder__gen_trace_elem_printer, > + decoder)) > + return -1; > > - return 0; > -} > + return 0; > + } else if (d_params->operation == CS_ETM_OPERATION_PRINT) { > + if (ocsd_dt_create_decoder(decoder->dcd_tree, decoder_name, > + OCSD_CREATE_FLG_PACKET_PROC, > + trace_config, &csid)) > + return -1; > > -static int > -cs_etm_decoder__create_etm_decoder(struct cs_etm_decoder_params *d_params, > - struct cs_etm_trace_params *t_params, > - struct cs_etm_decoder *decoder) > -{ > - if (d_params->operation == CS_ETM_OPERATION_PRINT) > - return cs_etm_decoder__create_etm_packet_printer(t_params, > - decoder); > - else if (d_params->operation == CS_ETM_OPERATION_DECODE) > - return cs_etm_decoder__create_etm_packet_decoder(t_params, > - decoder); > + if (ocsd_dt_set_pkt_protocol_printer(decoder->dcd_tree, csid, 0)) > + return -1; > + > + return 0; > + } > > return -1; > } > -- > 2.28.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel