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=-15.2 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 autolearn=ham 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 27B51C07E95 for ; Mon, 19 Jul 2021 19:42:02 +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 DB9886113B for ; Mon, 19 Jul 2021 19:42:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB9886113B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org 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=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=riusi0UJAipVY8I1EtCZeqSDGcnDAhqvEYDXVDcPb8o=; b=wzUnvxajF/iUCh r1OA8UVNyCy5Nrp/axbwNKqP4AGyiFNhxN6+eP6T8aH1V7pp1qVJf9Q1hDpLT5YEEKxcmhHesN2Cu a0WBOnKjhdQqcFPihmbYHCdTE6yVYdH7XTN44J5o13SnSA2ptcr2aB64gShTE8oF9XoHjgEkj18sZ 2iAtoPYAnP6xKlFomIPmBDJRCwTX95CHRUE9ZW3gZxkO721+D8C6qhKawfLUp3RkmH7Lyya7NnxqC K3vr3BSanlTHqsKWnefQGdHnirPDKBvkMamntS1SZ8iGxbhNExBYw1pdiZGbbQmxio3VEniocZw1G zcxT6gkVF/eyi1Di4cGQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m5Z77-00B8FL-R5; Mon, 19 Jul 2021 19:39:43 +0000 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m5Z6S-00B84L-56 for linux-arm-kernel@lists.infradead.org; Mon, 19 Jul 2021 19:39:01 +0000 Received: by mail-pj1-x1036.google.com with SMTP id p14-20020a17090ad30eb02901731c776526so266364pju.4 for ; Mon, 19 Jul 2021 12:38:57 -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=3fQ0/8opxa5eTEpUI81rDdB2xwZHkoVdhIb6AztpE4o=; b=Ez8/M1Y8KoeVMRupkhnhEhqxtXH8Fobthjhr3wkjHPeZTaDyqU9MXjZUblW2CnVe5k rxFWF/uNAcvR/IWviLOUb7K1OlkWcJJ36m+iHElBbqjN7MVi+tJHFKwlZ39jxr1EaaAi 4+8mEyWGmMcfvppmI+YsgIwM/hy+3eaRwbrpPqQ4T+iRTjOwWS5JL/vULaanpH3QxUrJ jV9FdJFl8rohb1n1/d7KGw3qrXXeC2zzAqLt+ihq+F9T3z6FRK1c6BQXELfyRMkeLD4K DeKP7SyO2ZhYEJ+VSnWqRnnON0y8pnYZxd/8d2qvjGB/29LHRLOtLTo+gYyglmvbXWrW AVwA== 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=3fQ0/8opxa5eTEpUI81rDdB2xwZHkoVdhIb6AztpE4o=; b=gHpUMnUy9ivIpVqyeGauIlipX7WdfgUSJagBn7OlWVMTZK2hEmr7lQIgQDzXnQjBNp thnBB6J4IxxoqvrpBdriL38ItxAsELNkNzVaaJVvj0mPCIq3x9kLtNQN/vAYXiP6p42i fJ32LMD3rD11B8mIHL3U5DXvmoHQ0V5l7LqD2SlLKGW0FVEuRKiCxSVVEN4/OFJGbmrD SX2l6dc7cxkSDKGzUW7Bk54Jzcct7iGrgq7DKdWyqo5uWFIc9oS72ZgqZVbMEvOSFw4/ ci60QU+PLSIGpT3DUYsgATRxW7zGosqqDBGl42zt8qc3YPrAbNHMxigGqJvGMKJPem49 ZhtA== X-Gm-Message-State: AOAM5330EVVI/Kmdx8ymipKvLgsOsF+/5aQsyQ1aTx1OQTQzRLRU5T/S wO8E2bwCpeXnnr0BCvBNTpAhbg== X-Google-Smtp-Source: ABdhPJxeDiRxmPFQO7MkbukI7BzskK2Pl8HItF6a69T2Ie5YyAJ71yF2ngNEYNiGBz3GupXPzO5YyQ== X-Received: by 2002:a17:902:bd02:b029:12b:1c90:eb65 with SMTP id p2-20020a170902bd02b029012b1c90eb65mr20457139pls.81.1626723536616; Mon, 19 Jul 2021 12:38:56 -0700 (PDT) Received: from p14s (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id n14sm22080043pfq.177.2021.07.19.12.38.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jul 2021 12:38:55 -0700 (PDT) Date: Mon, 19 Jul 2021 13:38:53 -0600 From: Mathieu Poirier To: James Clark Cc: acme@kernel.org, coresight@lists.linaro.org, leo.yan@linaro.org, al.grant@arm.com, branislav.rankov@arm.com, suzuki.poulose@arm.com, anshuman.khandual@arm.com, Mike Leach , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , John Garry , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/6] perf cs-etm: Only setup queues when they are modified Message-ID: <20210719193853.GD2255168@p14s> References: <20210713154008.29656-1-james.clark@arm.com> <20210713154008.29656-4-james.clark@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210713154008.29656-4-james.clark@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210719_123900_280060_0183F556 X-CRM114-Status: GOOD ( 28.18 ) 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 Tue, Jul 13, 2021 at 04:40:05PM +0100, James Clark wrote: > Continually creating queues in cs_etm__process_event() is unnecessary. > They only need to be created when a buffer for a new CPU or thread is > encountered. This can be in two places, when building the queues in > advance in cs_etm__process_auxtrace_info(), or in > cs_etm__process_auxtrace_event() when data_queued is false and the > index wasn't available (pipe mode). > > This change will allow the 'formatted' decoder setting to applied when > iterating over aux records in a later commit. > > Signed-off-by: James Clark > --- > tools/perf/util/cs-etm.c | 54 +++++++++++----------------------------- > 1 file changed, 14 insertions(+), 40 deletions(-) Reviewed-by: Mathieu Poirier > > diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c > index 426e99c07ca9..2d07e52ffd3c 100644 > --- a/tools/perf/util/cs-etm.c > +++ b/tools/perf/util/cs-etm.c > @@ -96,7 +96,6 @@ struct cs_etm_queue { > /* RB tree for quick conversion between traceID and metadata pointers */ > static struct intlist *traceid_list; > > -static int cs_etm__update_queues(struct cs_etm_auxtrace *etm); > static int cs_etm__process_queues(struct cs_etm_auxtrace *etm); > static int cs_etm__process_timeless_queues(struct cs_etm_auxtrace *etm, > pid_t tid); > @@ -564,7 +563,6 @@ static void cs_etm__dump_event(struct cs_etm_auxtrace *etm, > static int cs_etm__flush_events(struct perf_session *session, > struct perf_tool *tool) > { > - int ret; > struct cs_etm_auxtrace *etm = container_of(session->auxtrace, > struct cs_etm_auxtrace, > auxtrace); > @@ -574,11 +572,6 @@ static int cs_etm__flush_events(struct perf_session *session, > if (!tool->ordered_events) > return -EINVAL; > > - ret = cs_etm__update_queues(etm); > - > - if (ret < 0) > - return ret; > - > if (etm->timeless_decoding) > return cs_etm__process_timeless_queues(etm, -1); > > @@ -898,30 +891,6 @@ static int cs_etm__queue_first_cs_timestamp(struct cs_etm_auxtrace *etm, > return ret; > } > > -static int cs_etm__setup_queues(struct cs_etm_auxtrace *etm) > -{ > - unsigned int i; > - int ret; > - > - for (i = 0; i < etm->queues.nr_queues; i++) { > - ret = cs_etm__setup_queue(etm, &etm->queues.queue_array[i], i); > - if (ret) > - return ret; > - } > - > - return 0; > -} > - > -static int cs_etm__update_queues(struct cs_etm_auxtrace *etm) > -{ > - if (etm->queues.new_data) { > - etm->queues.new_data = false; > - return cs_etm__setup_queues(etm); > - } > - > - return 0; > -} > - > static inline > void cs_etm__copy_last_branch_rb(struct cs_etm_queue *etmq, > struct cs_etm_traceid_queue *tidq) > @@ -2395,7 +2364,6 @@ static int cs_etm__process_event(struct perf_session *session, > struct perf_sample *sample, > struct perf_tool *tool) > { > - int err = 0; > u64 sample_kernel_timestamp; > struct cs_etm_auxtrace *etm = container_of(session->auxtrace, > struct cs_etm_auxtrace, > @@ -2414,12 +2382,6 @@ static int cs_etm__process_event(struct perf_session *session, > else > sample_kernel_timestamp = 0; > > - if (sample_kernel_timestamp || etm->timeless_decoding) { > - err = cs_etm__update_queues(etm); > - if (err) > - return err; > - } > - > /* > * Don't wait for cs_etm__flush_events() in per-thread/timeless mode to start the decode. We > * need the tid of the PERF_RECORD_EXIT event to assign to the synthesised samples because > @@ -2476,6 +2438,7 @@ static int cs_etm__process_auxtrace_event(struct perf_session *session, > int fd = perf_data__fd(session->data); > bool is_pipe = perf_data__is_pipe(session->data); > int err; > + int idx = event->auxtrace.idx; > > if (is_pipe) > data_offset = 0; > @@ -2490,6 +2453,11 @@ static int cs_etm__process_auxtrace_event(struct perf_session *session, > if (err) > return err; > > + err = cs_etm__setup_queue(etm, &etm->queues.queue_array[idx], > + idx); > + if (err) > + return err; > + > if (dump_trace) > if (auxtrace_buffer__get_data(buffer, fd)) { > cs_etm__dump_event(etm, buffer); > @@ -2732,6 +2700,7 @@ static int cs_etm__queue_aux_fragment(struct perf_session *session, off_t file_o > struct perf_record_auxtrace *auxtrace_event; > union perf_event auxtrace_fragment; > __u64 aux_offset, aux_size; > + __u32 idx; > > struct cs_etm_auxtrace *etm = container_of(session->auxtrace, > struct cs_etm_auxtrace, > @@ -2793,8 +2762,13 @@ static int cs_etm__queue_aux_fragment(struct perf_session *session, off_t file_o > > pr_debug3("CS ETM: Queue buffer size: %#"PRI_lx64" offset: %#"PRI_lx64 > " tid: %d cpu: %d\n", aux_size, aux_offset, sample->tid, sample->cpu); > - return auxtrace_queues__add_event(&etm->queues, session, &auxtrace_fragment, > - file_offset, NULL); > + err = auxtrace_queues__add_event(&etm->queues, session, &auxtrace_fragment, > + file_offset, NULL); > + if (err) > + return err; > + > + idx = auxtrace_event->idx; > + return cs_etm__setup_queue(etm, &etm->queues.queue_array[idx], idx); > } > > /* Wasn't inside this buffer, but there were no parse errors. 1 == 'not found' */ > -- > 2.28.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel