From patchwork Tue Dec 11 07:38:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 153399 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp324824ljp; Mon, 10 Dec 2018 23:40:51 -0800 (PST) X-Google-Smtp-Source: AFSGD/VQWWm/NFXUTfCeLdr/yqxOn7n1xwHOYXdQx+J7Mo2cm7eDlP+UyIosPHAYBoQSiXf1hZZy X-Received: by 2002:a17:902:b03:: with SMTP id 3mr15022421plq.91.1544514051275; Mon, 10 Dec 2018 23:40:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544514051; cv=none; d=google.com; s=arc-20160816; b=hDXgVk4OrCOEYv6Pnxp1rzMAIy2q5boJKhAWdH62SDglFhk03rXy33K2tYFk64k2X/ EZEFE6vxofFLRZGjeAGlQGFu2IEgusksvbP3N1NLeZo2hy7vriJaIco0Lv4iQKvhd37b AfJtWCUeJEed/X15W/KSi80B/GrqljQ46l5aZPzrHVrW2jQVynCjcOU9QAB6/EytSksr 0lbFQchAxAg6U3KO4TUbzmZR0nYOhqu5ndg0IcS4+uw9bU7W/aXaEiBMsiXLmcx4G4xM JFYQSVAg5InSIGONDxNpR2+qE/y1F5LXRh/zKOePN0+eTgMub7YL9OIFQvPeT7tHLlfO sUDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=8QxeFRHi4qMd6sFFXgNwZ7/cePOdaHaHqRD9zBqmzN0=; b=NuaxFCKKPtjkzxG527aCVLoohpJl2HOprVlQmuP8Lu1F2gdBQ8LMyVTskajMEib9Zi 122bqB9wKf/Wt2kQ8F+69/RLekLyLDqpquw50Ari0KOMLIKRViyH2OUmjbIUm3S3Av67 +893t16DpchN0vPt6u5CdHjubZnDrp7KlVDPajxECJ/jo2EzBRPHENFwG9O9sIKKM9V6 t70SJOBPVUjKgCIRz/tCy3MeRsWkmYNP7HvqjdGk5xK2LP0EtHLSE1eUYfyp0wSNcpdY uI+mdue02/kpNoMK13rRI2t2f5flnnF+TmhSnNm0cgFYC4sxBf0lXZT0cNO4K7UxTffT 4W4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PM3xYxmR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h36si10843508pgm.200.2018.12.10.23.40.51; Mon, 10 Dec 2018 23:40:51 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PM3xYxmR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726279AbeLKHku (ORCPT + 31 others); Tue, 11 Dec 2018 02:40:50 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:35481 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725993AbeLKHks (ORCPT ); Tue, 11 Dec 2018 02:40:48 -0500 Received: by mail-wm1-f67.google.com with SMTP id c126so1096814wmh.0 for ; Mon, 10 Dec 2018 23:40:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8QxeFRHi4qMd6sFFXgNwZ7/cePOdaHaHqRD9zBqmzN0=; b=PM3xYxmRvN7QFw/ApSK0f06969XEiMhna7Uv/Jkq2k11tmt8+LvU9ZXYgOc6wBQV3w aVjr4v+dCjLpMjEdFy/3zVB5ocLwNsTODs0yUKijLmQFNzdLu0i1493yErLraGO5E5DE 5OyuM+U8w0K60gn+K/R54JuWbGABvZCA3kpmY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8QxeFRHi4qMd6sFFXgNwZ7/cePOdaHaHqRD9zBqmzN0=; b=hlTlttDjSXEh20SGC3NziwZ2UldVmNm17VvISMlwGNqjDHFDbl2pYaHXkx3BBVWlHV nrmoseHzmFctgXI8h7sLW6DlWSRYdvSx+o59ugYqF/pBP1bIiR+BOoa71vbgPrHjOSUA klZdwwWMPwztrsUCNE7kL0XebqbROMFRLjFAhz0c7F7PIc8eNQpjaXwZ0z+cmAY76gyg jnKOf3FPsiXRLQUj/y5fOO0/SIJtFYHM/w9OaJJ55ysFtVoR+oRCyN+KyqzXowqmWlWP 3Ieici9ZLK/S41HmUlKkl6f8ZnrR6nhalKf/WtyP7c/QEf84tMJLFuq9jv2bnXjmwttV gu3A== X-Gm-Message-State: AA+aEWZTmTBLolHfNfhWXYYnxPf3cCoJlMnidR0bILfsmPQStBdhF5Pz JaWi/MkHMojdUnbAaxpmfOilbQ== X-Received: by 2002:a7b:cb0a:: with SMTP id u10mr1354069wmj.0.1544514047002; Mon, 10 Dec 2018 23:40:47 -0800 (PST) Received: from localhost.localdomain ([209.250.228.18]) by smtp.gmail.com with ESMTPSA id k7sm14186961wrl.51.2018.12.10.23.40.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Dec 2018 23:40:46 -0800 (PST) From: Leo Yan To: Arnaldo Carvalho de Melo , Mathieu Poirier , Alexander Shishkin , Jiri Olsa , Namhyung Kim , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Coresight ML Cc: Leo Yan , Mike Leach , Robert Walker Subject: [PATCH v3 5/8] perf cs-etm: Rename CS_ETM_TRACE_ON to CS_ETM_DISCONTINUITY Date: Tue, 11 Dec 2018 15:38:25 +0800 Message-Id: <1544513908-16805-6-git-send-email-leo.yan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1544513908-16805-1-git-send-email-leo.yan@linaro.org> References: <1544513908-16805-1-git-send-email-leo.yan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org TRACE_ON element is used at the beginning of trace, it also can be appeared in the middle of trace data to indicate discontinuity; for example, it's possible to see multiple TRACE_ON elements in the trace stream if the trace is being limited by address range filtering. Furthermore, except TRACE_ON element is for discontinuity, NO_SYNC and EO_TRACE also can be used to indicate discontinuity, though they are used for different scenarios for trace is interrupted. This patch is to rename sample type CS_ETM_TRACE_ON to CS_ETM_DISCONTINUITY, firstly the new name describes more closely the purpose of the packet; secondly this is a preparation for other output elements which also cause the trace discontinuity thus they can share the same one packet type. Signed-off-by: Leo Yan Reviewed-by: Mathieu Poirier Cc: Mike Leach Cc: Robert Walker --- tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 10 +++++----- tools/perf/util/cs-etm-decoder/cs-etm-decoder.h | 2 +- tools/perf/util/cs-etm.c | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) -- 2.7.4 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 97b39b1..1039f364 100644 --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c @@ -390,11 +390,11 @@ cs_etm_decoder__buffer_range(struct cs_etm_decoder *decoder, } static ocsd_datapath_resp_t -cs_etm_decoder__buffer_trace_on(struct cs_etm_decoder *decoder, - const uint8_t trace_chan_id) +cs_etm_decoder__buffer_discontinuity(struct cs_etm_decoder *decoder, + const uint8_t trace_chan_id) { return cs_etm_decoder__buffer_packet(decoder, trace_chan_id, - CS_ETM_TRACE_ON); + CS_ETM_DISCONTINUITY); } static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer( @@ -412,8 +412,8 @@ static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer( case OCSD_GEN_TRC_ELEM_NO_SYNC: break; case OCSD_GEN_TRC_ELEM_TRACE_ON: - resp = cs_etm_decoder__buffer_trace_on(decoder, - trace_chan_id); + resp = cs_etm_decoder__buffer_discontinuity(decoder, + trace_chan_id); break; case OCSD_GEN_TRC_ELEM_INSTR_RANGE: resp = cs_etm_decoder__buffer_range(decoder, elem, diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.h b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.h index 3819a04..a272317 100644 --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.h +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.h @@ -25,7 +25,7 @@ struct cs_etm_buffer { enum cs_etm_sample_type { CS_ETM_EMPTY, CS_ETM_RANGE, - CS_ETM_TRACE_ON, + CS_ETM_DISCONTINUITY, }; enum cs_etm_isa { diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index ffc4fe5..cea3158 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -562,8 +562,8 @@ static inline int cs_etm__t32_instr_size(struct cs_etm_queue *etmq, static inline u64 cs_etm__first_executed_instr(struct cs_etm_packet *packet) { - /* Returns 0 for the CS_ETM_TRACE_ON packet */ - if (packet->sample_type == CS_ETM_TRACE_ON) + /* Returns 0 for the CS_ETM_DISCONTINUITY packet */ + if (packet->sample_type == CS_ETM_DISCONTINUITY) return 0; return packet->start_addr; @@ -572,8 +572,8 @@ static inline u64 cs_etm__first_executed_instr(struct cs_etm_packet *packet) static inline u64 cs_etm__last_executed_instr(const struct cs_etm_packet *packet) { - /* Returns 0 for the CS_ETM_TRACE_ON packet */ - if (packet->sample_type == CS_ETM_TRACE_ON) + /* Returns 0 for the CS_ETM_DISCONTINUITY packet */ + if (packet->sample_type == CS_ETM_DISCONTINUITY) return 0; return packet->end_addr - packet->last_instr_size; @@ -972,7 +972,7 @@ static int cs_etm__sample(struct cs_etm_queue *etmq) bool generate_sample = false; /* Generate sample for tracing on packet */ - if (etmq->prev_packet->sample_type == CS_ETM_TRACE_ON) + if (etmq->prev_packet->sample_type == CS_ETM_DISCONTINUITY) generate_sample = true; /* Generate sample for branch taken packet */ @@ -1148,7 +1148,7 @@ static int cs_etm__run_decoder(struct cs_etm_queue *etmq) */ cs_etm__sample(etmq); break; - case CS_ETM_TRACE_ON: + case CS_ETM_DISCONTINUITY: /* * Discontinuity in trace, flush * previous branch stack