From: Leo Yan <leo.yan@linaro.org> To: Arnaldo Carvalho de Melo <acme@kernel.org>, Mathieu Poirier <mathieu.poirier@linaro.org>, Suzuki K Poulose <suzuki.poulose@arm.com>, Mike Leach <mike.leach@linaro.org>, Jonathan Corbet <corbet@lwn.net>, John Garry <john.garry@huawei.com>, Will Deacon <will@kernel.org>, Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Mark Rutland <mark.rutland@arm.com>, Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>, Daniel Kiss <Daniel.Kiss@arm.com>, Denis Nikitin <denik@chromium.org>, Al Grant <al.grant@arm.com>, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Leo Yan <leo.yan@linaro.org> Subject: [PATCH v3 7/8] perf cs-etm: Detect pid in VMID for kernel running at EL2 Date: Sat, 6 Feb 2021 23:08:32 +0800 [thread overview] Message-ID: <20210206150833.42120-8-leo.yan@linaro.org> (raw) In-Reply-To: <20210206150833.42120-1-leo.yan@linaro.org> From: Suzuki K Poulose <suzuki.poulose@arm.com> The PID of the task could be traced as VMID when the kernel is running at EL2. Teach the decoder to look for VMID when the CONTEXTIDR (Arm32) or CONTEXTIDR_EL1 (Arm64) is invalid but we have a valid VMID. Cc: Mike Leach <mike.leach@linaro.org> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Al Grant <al.grant@arm.com> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> Co-developed-by: Leo Yan <leo.yan@linaro.org> Signed-off-by: Leo Yan <leo.yan@linaro.org> --- .../perf/util/cs-etm-decoder/cs-etm-decoder.c | 38 +++++++++++++++++-- 1 file changed, 34 insertions(+), 4 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 3f4bc4050477..4052c9ce6e2f 100644 --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c @@ -6,6 +6,7 @@ * Author: Mathieu Poirier <mathieu.poirier@linaro.org> */ +#include <linux/coresight-pmu.h> #include <linux/err.h> #include <linux/list.h> #include <linux/zalloc.h> @@ -491,13 +492,42 @@ cs_etm_decoder__set_tid(struct cs_etm_queue *etmq, const ocsd_generic_trace_elem *elem, const uint8_t trace_chan_id) { - pid_t tid; + pid_t tid = -1; + static u64 pid_fmt; + int ret; - /* Ignore PE_CONTEXT packets that don't have a valid contextID */ - if (!elem->context.ctxt_id_valid) + /* + * As all the ETMs run at the same exception level, the system should + * have the same PID format crossing CPUs. So cache the PID format + * and reuse it for sequential decoding. + */ + if (!pid_fmt) { + ret = cs_etm__get_pid_fmt(trace_chan_id, &pid_fmt); + if (ret) + return OCSD_RESP_FATAL_SYS_ERR; + } + + /* + * Process the PE_CONTEXT packets if we have a valid contextID or VMID. + * If the kernel is running at EL2, the PID is traced in CONTEXTIDR_EL2 + * as VMID, Bit ETM_OPT_CTXTID2 is set in this case. + */ + switch (pid_fmt) { + case BIT(ETM_OPT_CTXTID): + if (elem->context.ctxt_id_valid) + tid = elem->context.context_id; + break; + case BIT(ETM_OPT_CTXTID2): + if (elem->context.vmid_valid) + tid = elem->context.vmid; + break; + default: + break; + } + + if (tid == -1) return OCSD_RESP_CONT; - tid = elem->context.context_id; if (cs_etm__etmq_set_tid(etmq, tid, trace_chan_id)) return OCSD_RESP_FATAL_SYS_ERR; -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Leo Yan <leo.yan@linaro.org> To: Arnaldo Carvalho de Melo <acme@kernel.org>, Mathieu Poirier <mathieu.poirier@linaro.org>, Suzuki K Poulose <suzuki.poulose@arm.com>, Mike Leach <mike.leach@linaro.org>, Jonathan Corbet <corbet@lwn.net>, John Garry <john.garry@huawei.com>, Will Deacon <will@kernel.org>, Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Mark Rutland <mark.rutland@arm.com>, Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>, Daniel Kiss <Daniel.Kiss@arm.com>, Denis Nikitin <denik@chromium.org>, Al Grant <al.grant@arm.com>, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Leo Yan <leo.yan@linaro.org> Subject: [PATCH v3 7/8] perf cs-etm: Detect pid in VMID for kernel running at EL2 Date: Sat, 6 Feb 2021 23:08:32 +0800 [thread overview] Message-ID: <20210206150833.42120-8-leo.yan@linaro.org> (raw) In-Reply-To: <20210206150833.42120-1-leo.yan@linaro.org> From: Suzuki K Poulose <suzuki.poulose@arm.com> The PID of the task could be traced as VMID when the kernel is running at EL2. Teach the decoder to look for VMID when the CONTEXTIDR (Arm32) or CONTEXTIDR_EL1 (Arm64) is invalid but we have a valid VMID. Cc: Mike Leach <mike.leach@linaro.org> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Al Grant <al.grant@arm.com> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> Co-developed-by: Leo Yan <leo.yan@linaro.org> Signed-off-by: Leo Yan <leo.yan@linaro.org> --- .../perf/util/cs-etm-decoder/cs-etm-decoder.c | 38 +++++++++++++++++-- 1 file changed, 34 insertions(+), 4 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 3f4bc4050477..4052c9ce6e2f 100644 --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c @@ -6,6 +6,7 @@ * Author: Mathieu Poirier <mathieu.poirier@linaro.org> */ +#include <linux/coresight-pmu.h> #include <linux/err.h> #include <linux/list.h> #include <linux/zalloc.h> @@ -491,13 +492,42 @@ cs_etm_decoder__set_tid(struct cs_etm_queue *etmq, const ocsd_generic_trace_elem *elem, const uint8_t trace_chan_id) { - pid_t tid; + pid_t tid = -1; + static u64 pid_fmt; + int ret; - /* Ignore PE_CONTEXT packets that don't have a valid contextID */ - if (!elem->context.ctxt_id_valid) + /* + * As all the ETMs run at the same exception level, the system should + * have the same PID format crossing CPUs. So cache the PID format + * and reuse it for sequential decoding. + */ + if (!pid_fmt) { + ret = cs_etm__get_pid_fmt(trace_chan_id, &pid_fmt); + if (ret) + return OCSD_RESP_FATAL_SYS_ERR; + } + + /* + * Process the PE_CONTEXT packets if we have a valid contextID or VMID. + * If the kernel is running at EL2, the PID is traced in CONTEXTIDR_EL2 + * as VMID, Bit ETM_OPT_CTXTID2 is set in this case. + */ + switch (pid_fmt) { + case BIT(ETM_OPT_CTXTID): + if (elem->context.ctxt_id_valid) + tid = elem->context.context_id; + break; + case BIT(ETM_OPT_CTXTID2): + if (elem->context.vmid_valid) + tid = elem->context.vmid; + break; + default: + break; + } + + if (tid == -1) return OCSD_RESP_CONT; - tid = elem->context.context_id; if (cs_etm__etmq_set_tid(etmq, tid, trace_chan_id)) return OCSD_RESP_FATAL_SYS_ERR; -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-02-06 15:12 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-06 15:08 [PATCH v3 0/8] coresight: etm-perf: Fix pid tracing with VHE Leo Yan 2021-02-06 15:08 ` Leo Yan 2021-02-06 15:08 ` [PATCH v3 1/8] coresight: etm-perf: Clarify comment on perf options Leo Yan 2021-02-06 15:08 ` Leo Yan 2021-02-06 15:08 ` [PATCH v3 2/8] tools headers UAPI: Update tools' copy of linux/coresight-pmu.h Leo Yan 2021-02-06 15:08 ` Leo Yan 2021-02-08 17:34 ` Mathieu Poirier 2021-02-08 17:34 ` Mathieu Poirier 2021-02-06 15:08 ` [PATCH v3 3/8] coresight: etm-perf: Support PID tracing for kernel at EL2 Leo Yan 2021-02-06 15:08 ` Leo Yan 2021-02-06 15:08 ` [PATCH v3 4/8] perf cs-etm: Fix bitmap for option Leo Yan 2021-02-06 15:08 ` Leo Yan 2021-02-08 20:46 ` Mathieu Poirier 2021-02-08 20:46 ` Mathieu Poirier 2021-02-09 1:58 ` Leo Yan 2021-02-09 1:58 ` Leo Yan 2021-03-05 17:29 ` Arnaldo Carvalho de Melo 2021-03-05 17:29 ` Arnaldo Carvalho de Melo 2021-03-06 3:05 ` Leo Yan 2021-03-06 3:05 ` Leo Yan 2021-02-06 15:08 ` [PATCH v3 5/8] perf cs-etm: Support PID tracing in config Leo Yan 2021-02-06 15:08 ` Leo Yan 2021-02-08 18:55 ` Mathieu Poirier 2021-02-08 18:55 ` Mathieu Poirier 2021-03-05 17:30 ` Arnaldo Carvalho de Melo 2021-03-05 17:30 ` Arnaldo Carvalho de Melo 2021-02-06 15:08 ` [PATCH v3 6/8] perf cs-etm: Add helper cs_etm__get_pid_fmt() Leo Yan 2021-02-06 15:08 ` Leo Yan 2021-02-08 20:32 ` Mathieu Poirier 2021-02-08 20:32 ` Mathieu Poirier 2021-02-11 12:36 ` Suzuki K Poulose 2021-02-11 12:36 ` Suzuki K Poulose 2021-02-06 15:08 ` Leo Yan [this message] 2021-02-06 15:08 ` [PATCH v3 7/8] perf cs-etm: Detect pid in VMID for kernel running at EL2 Leo Yan 2021-02-08 20:33 ` Mathieu Poirier 2021-02-08 20:33 ` Mathieu Poirier 2021-02-06 15:08 ` [PATCH v3 8/8] Documentation: coresight: Add PID tracing description Leo Yan 2021-02-06 15:08 ` Leo Yan 2021-02-08 20:50 ` Mathieu Poirier 2021-02-08 20:50 ` Mathieu Poirier 2021-02-08 21:15 ` Mike Leach 2021-02-08 21:15 ` Mike Leach 2021-02-11 12:38 ` Suzuki K Poulose 2021-02-11 12:38 ` Suzuki K Poulose
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210206150833.42120-8-leo.yan@linaro.org \ --to=leo.yan@linaro.org \ --cc=Daniel.Kiss@arm.com \ --cc=acme@kernel.org \ --cc=al.grant@arm.com \ --cc=corbet@lwn.net \ --cc=coresight@lists.linaro.org \ --cc=denik@chromium.org \ --cc=john.garry@huawei.com \ --cc=jolsa@redhat.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=mathieu.poirier@linaro.org \ --cc=mike.leach@linaro.org \ --cc=mingo@redhat.com \ --cc=namhyung@kernel.org \ --cc=peterz@infradead.org \ --cc=suzuki.poulose@arm.com \ --cc=will@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.