From: Leo Yan <leo.yan@linaro.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>,
James Clark <james.clark@arm.com>, Will Deacon <will@kernel.org>,
Al Grant <Al.Grant@arm.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Wei Li <liwei391@huawei.com>,
linux-kernel@vger.kernel.org,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Mike Leach <mike.leach@linaro.org>
Cc: Leo Yan <leo.yan@linaro.org>
Subject: [PATCH RESEND v1 11/13] perf arm-spe: Refactor operation packet handling
Date: Mon, 17 Aug 2020 15:53:46 +0100 [thread overview]
Message-ID: <20200817145348.14461-12-leo.yan@linaro.org> (raw)
In-Reply-To: <20200817145348.14461-1-leo.yan@linaro.org>
Defines macros for operation packet header and formats (support sub
classes for 'other', 'branch', 'load and store', etc). Uses these
macros for operation packet decoding and dumping.
This patch checks the return value from snprintf(), will bail out if
detects any failure for operation packet handling.
Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
.../arm-spe-decoder/arm-spe-pkt-decoder.c | 65 ++++++++++++-------
.../arm-spe-decoder/arm-spe-pkt-decoder.h | 36 ++++++++++
2 files changed, 76 insertions(+), 25 deletions(-)
diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
index 121414e4ae23..ab966885e892 100644
--- a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
+++ b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
@@ -141,7 +141,7 @@ static int arm_spe_get_op_type(const unsigned char *buf, size_t len,
struct arm_spe_pkt *packet)
{
packet->type = ARM_SPE_OP_TYPE;
- packet->index = buf[0] & 0x3;
+ packet->index = buf[0] & SPE_OP_PKT_HDR_CLASS_MASK;
return arm_spe_get_payload(buf, len, 0, packet);
}
@@ -251,6 +251,7 @@ int arm_spe_pkt_desc(const struct arm_spe_pkt *packet, char *buf,
int ret, ns, el, idx = packet->index;
unsigned long long payload = packet->payload;
const char *name = arm_spe_pkt_name(packet->type);
+ size_t blen;
switch (packet->type) {
case ARM_SPE_BAD:
@@ -258,7 +259,7 @@ int arm_spe_pkt_desc(const struct arm_spe_pkt *packet, char *buf,
case ARM_SPE_END:
return snprintf(buf, buf_len, "%s", name);
case ARM_SPE_EVENTS: {
- size_t blen = buf_len;
+ blen = buf_len;
ret = 0;
ret = snprintf(buf, buf_len, "EV");
@@ -349,65 +350,79 @@ int arm_spe_pkt_desc(const struct arm_spe_pkt *packet, char *buf,
}
case ARM_SPE_OP_TYPE:
switch (idx) {
- case 0: return snprintf(buf, buf_len, "%s", payload & 0x1 ?
+ case SPE_OP_PKT_HDR_CLASS_OTHER:
+ return snprintf(buf, buf_len, "%s",
+ payload & SPE_OP_PKT_OTHER_SUBCLASS_COND ?
"COND-SELECT" : "INSN-OTHER");
- case 1: {
- size_t blen = buf_len;
+ case SPE_OP_PKT_HDR_CLASS_LD_ST_ATOMIC:
+ blen = buf_len;
- if (payload & 0x1)
+ if (payload & SPE_OP_PKT_LDST)
ret = snprintf(buf, buf_len, "ST");
else
ret = snprintf(buf, buf_len, "LD");
+ if (ret < 0)
+ return ret;
buf += ret;
blen -= ret;
- if (payload & 0x2) {
- if (payload & 0x4) {
+ if ((payload & SPE_OP_PKT_LDST_SUBCLASS_ATOMIC_MASK) ==
+ SPE_OP_PKT_LDST_SUBCLASS_ATOMIC) {
+ if (payload & SPE_OP_PKT_AT) {
ret = snprintf(buf, buf_len, " AT");
+ if (ret < 0)
+ return ret;
buf += ret;
blen -= ret;
}
- if (payload & 0x8) {
+ if (payload & SPE_OP_PKT_EXCL) {
ret = snprintf(buf, buf_len, " EXCL");
+ if (ret < 0)
+ return ret;
buf += ret;
blen -= ret;
}
- if (payload & 0x10) {
+ if (payload & SPE_OP_PKT_AR) {
ret = snprintf(buf, buf_len, " AR");
+ if (ret < 0)
+ return ret;
buf += ret;
blen -= ret;
}
- } else if (payload & 0x4) {
+ } else if ((payload & SPE_OP_PKT_LDST_SUBCLASS_MASK) ==
+ SPE_OP_PKT_LDST_SUBCLASS_SIMD_FP) {
ret = snprintf(buf, buf_len, " SIMD-FP");
+ if (ret < 0)
+ return ret;
buf += ret;
blen -= ret;
}
- if (ret < 0)
- return ret;
- blen -= ret;
return buf_len - blen;
- }
- case 2: {
- size_t blen = buf_len;
+ case SPE_OP_PKT_HDR_CLASS_BR_ERET:
+ blen = buf_len;
ret = snprintf(buf, buf_len, "B");
+ if (ret < 0)
+ return ret;
buf += ret;
blen -= ret;
- if (payload & 0x1) {
+ if (payload & SPE_OP_PKT_BRANCH_SUBCLASS_COND) {
ret = snprintf(buf, buf_len, " COND");
+ if (ret < 0)
+ return ret;
buf += ret;
blen -= ret;
}
- if (payload & 0x2) {
+ if ((payload & SPE_OP_PKT_BRANCH_SUBCLASS_MASK) ==
+ SPE_OP_PKT_BRANCH_SUBCLASS_INDIRECT) {
ret = snprintf(buf, buf_len, " IND");
+ if (ret < 0)
+ return ret;
buf += ret;
blen -= ret;
}
- if (ret < 0)
- return ret;
- blen -= ret;
return buf_len - blen;
- }
- default: return 0;
+ default:
+ return 0;
}
case ARM_SPE_DATA_SOURCE:
case ARM_SPE_TIMESTAMP:
@@ -436,7 +451,7 @@ int arm_spe_pkt_desc(const struct arm_spe_pkt *packet, char *buf,
return snprintf(buf, buf_len, "%s 0x%lx el%d", name,
(unsigned long)payload, idx + 1);
case ARM_SPE_COUNTER: {
- size_t blen = buf_len;
+ blen = buf_len;
ret = snprintf(buf, buf_len, "%s %d ", name,
(unsigned short)payload);
diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h
index 16687abffab7..295ff8779ce4 100644
--- a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h
+++ b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h
@@ -109,6 +109,42 @@ struct arm_spe_pkt {
#define SPE_EVT_PKT_ARCH_RETIRED BIT(1)
#define SPE_EVT_PKT_GEN_EXCEPTION BIT(0)
+/* Operation packet header */
+#define SPE_OP_PKT_HDR_CLASS_MASK (0x7)
+#define SPE_OP_PKT_HDR_CLASS_OTHER (0x0)
+#define SPE_OP_PKT_HDR_CLASS_LD_ST_ATOMIC (0x1)
+#define SPE_OP_PKT_HDR_CLASS_BR_ERET (0x2)
+
+#define SPE_OP_PKT_OTHER_SUBCLASS_MASK (0xfe)
+#define SPE_OP_PKT_OTHER_SUBCLASS_OTHER_OP (0x0)
+#define SPE_OP_PKT_OTHER_SVE_SUBCLASS_MASK (0x89)
+#define SPE_OP_PKT_OTHER_SUBCLASS_SVG_OP (0x8)
+
+#define SPE_OP_PKT_OTHER_SUBCLASS_COND BIT(0)
+
+#define SPE_OP_PKT_BRANCH_SUBCLASS_MASK (0xfe)
+#define SPE_OP_PKT_BRANCH_SUBCLASS_DIRECT (0x0)
+#define SPE_OP_PKT_BRANCH_SUBCLASS_INDIRECT (0x2)
+
+#define SPE_OP_PKT_BRANCH_SUBCLASS_COND BIT(0)
+
+#define SPE_OP_PKT_LDST_SUBCLASS_MASK (0xfe)
+#define SPE_OP_PKT_LDST_SUBCLASS_GP_REG (0x0)
+#define SPE_OP_PKT_LDST_SUBCLASS_SIMD_FP (0x4)
+#define SPE_OP_PKT_LDST_SUBCLASS_UNSPEC_REG (0x10)
+#define SPE_OP_PKT_LDST_SUBCLASS_MRS_MSR (0x30)
+
+#define SPE_OP_PKT_LDST_SUBCLASS_ATOMIC_MASK (0xe2)
+#define SPE_OP_PKT_LDST_SUBCLASS_ATOMIC (0x2)
+
+#define SPE_OP_PKT_LDST_SUBCLASS_SVE_MASK (0xa)
+#define SPE_OP_PKT_LDST_SUBCLASS_SVE (0x8)
+
+#define SPE_OP_PKT_AR BIT(4)
+#define SPE_OP_PKT_EXCL BIT(3)
+#define SPE_OP_PKT_AT BIT(2)
+#define SPE_OP_PKT_LDST BIT(0)
+
const char *arm_spe_pkt_name(enum arm_spe_pkt_type);
int arm_spe_get_packet(const unsigned char *buf, size_t len,
--
2.17.1
next prev parent reply other threads:[~2020-08-17 14:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-17 14:53 [PATCH RESEND v1 00/13] perf arm-spe: Refactor decoding & dumping flow Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 01/13] perf arm-spe: Include bitops.h for BIT() macro Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 02/13] perf arm-spe: Fix a typo in comment Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 03/13] perf arm-spe: Refactor payload length calculation Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 04/13] perf arm-spe: Fix packet length handling Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 05/13] perf arm-spe: Refactor packet header parsing Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 06/13] perf arm-spe: Refactor address packet handling Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 07/13] perf arm-spe: Refactor context " Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 08/13] perf arm-spe: Refactor counter " Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 09/13] perf arm-spe: Refactor event type handling Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 10/13] perf arm-spe: Detect failure for snprintf() Leo Yan
2020-08-17 14:53 ` Leo Yan [this message]
2020-08-17 14:53 ` [PATCH RESEND v1 12/13] perf arm-spe: Add more sub classes for operation packet Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 13/13] perf arm-spe: Add support for ARMv8.3-SPE Leo Yan
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=20200817145348.14461-12-leo.yan@linaro.org \
--to=leo.yan@linaro.org \
--cc=Al.Grant@arm.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=james.clark@arm.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=liwei391@huawei.com \
--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=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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).