From: Anshuman Khandual <anshuman.khandual@arm.com>
To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: Anshuman Khandual <anshuman.khandual@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
linux-perf-users@vger.kernel.org,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>
Subject: [RFC V1 09/11] perf: Add more generic branch types
Date: Mon, 24 Jan 2022 10:00:51 +0530 [thread overview]
Message-ID: <1642998653-21377-10-git-send-email-anshuman.khandual@arm.com> (raw)
In-Reply-To: <1642998653-21377-1-git-send-email-anshuman.khandual@arm.com>
This expands generic branch type classification by adding some more entries
, that can still be represented with the existing 4 bit 'type' field. While
here this also updates the x86 implementation with these new branch types.
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-perf-users@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
arch/x86/events/intel/lbr.c | 4 ++--
drivers/perf/arm_pmu_brbe.c | 11 +++++++----
include/uapi/linux/perf_event.h | 5 +++++
tools/include/uapi/linux/perf_event.h | 5 +++++
tools/perf/util/branch.c | 7 ++++++-
5 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c
index 8043213b75a5..9f86fac8c6a5 100644
--- a/arch/x86/events/intel/lbr.c
+++ b/arch/x86/events/intel/lbr.c
@@ -1336,10 +1336,10 @@ static int branch_map[X86_BR_TYPE_MAP_MAX] = {
PERF_BR_SYSCALL, /* X86_BR_SYSCALL */
PERF_BR_SYSRET, /* X86_BR_SYSRET */
PERF_BR_UNKNOWN, /* X86_BR_INT */
- PERF_BR_UNKNOWN, /* X86_BR_IRET */
+ PERF_BR_EXPT_RET, /* X86_BR_IRET */
PERF_BR_COND, /* X86_BR_JCC */
PERF_BR_UNCOND, /* X86_BR_JMP */
- PERF_BR_UNKNOWN, /* X86_BR_IRQ */
+ PERF_BR_IRQ, /* X86_BR_IRQ */
PERF_BR_IND_CALL, /* X86_BR_IND_CALL */
PERF_BR_UNKNOWN, /* X86_BR_ABORT */
PERF_BR_UNKNOWN, /* X86_BR_IN_TX */
diff --git a/drivers/perf/arm_pmu_brbe.c b/drivers/perf/arm_pmu_brbe.c
index 8144514b9997..8d27ad868359 100644
--- a/drivers/perf/arm_pmu_brbe.c
+++ b/drivers/perf/arm_pmu_brbe.c
@@ -243,18 +243,21 @@ static int brbe_fetch_perf_type(u64 brbinf)
case BRBINF_TYPE_TRAP:
return PERF_BR_SYSCALL;
case BRBINF_TYPE_RET_EXCPT:
- return PERF_BR_UNKNOWN;
+ return PERF_BR_EXPT_RET;
case BRBINF_TYPE_IRQ:
- return PERF_BR_UNKNOWN;
+ return PERF_BR_IRQ;
+ case BRBINF_TYPE_FIQ:
+ return PERF_BR_FIQ;
case BRBINF_TYPE_DEBUG_HALT:
+ return PERF_BR_DEBUG_HALT;
+ case BRBINF_TYPE_DEBUG_EXIT:
+ return PERF_BR_DEBUG_EXIT;
case BRBINF_TYPE_SERROR:
case BRBINF_TYPE_INST_DEBUG:
case BRBINF_TYPE_DATA_DEBUG:
case BRBINF_TYPE_ALGN_FAULT:
case BRBINF_TYPE_INST_FAULT:
case BRBINF_TYPE_DATA_FAULT:
- case BRBINF_TYPE_FIQ:
- case BRBINF_TYPE_DEBUG_EXIT:
return PERF_BR_UNKNOWN;
default:
pr_warn("unknown branch type captured\n");
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 1b65042ab1db..b91d0f575d0c 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -251,6 +251,11 @@ enum {
PERF_BR_SYSRET = 8, /* syscall return */
PERF_BR_COND_CALL = 9, /* conditional function call */
PERF_BR_COND_RET = 10, /* conditional function return */
+ PERF_BR_EXPT_RET = 11, /* exception return */
+ PERF_BR_IRQ = 12, /* irq */
+ PERF_BR_FIQ = 13, /* fiq */
+ PERF_BR_DEBUG_HALT = 14, /* debug halt */
+ PERF_BR_DEBUG_EXIT = 15, /* debug exit */
PERF_BR_MAX,
};
diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h
index 4cd39aaccbe7..1882054e8684 100644
--- a/tools/include/uapi/linux/perf_event.h
+++ b/tools/include/uapi/linux/perf_event.h
@@ -251,6 +251,11 @@ enum {
PERF_BR_SYSRET = 8, /* syscall return */
PERF_BR_COND_CALL = 9, /* conditional function call */
PERF_BR_COND_RET = 10, /* conditional function return */
+ PERF_BR_EXPT_RET = 11, /* exception return */
+ PERF_BR_IRQ = 12, /* irq */
+ PERF_BR_FIQ = 13, /* fiq */
+ PERF_BR_DEBUG_HALT = 14, /* debug halt */
+ PERF_BR_DEBUG_EXIT = 15, /* debug exit */
PERF_BR_MAX,
};
diff --git a/tools/perf/util/branch.c b/tools/perf/util/branch.c
index 2285b1eb3128..74e5e67b1779 100644
--- a/tools/perf/util/branch.c
+++ b/tools/perf/util/branch.c
@@ -49,7 +49,12 @@ const char *branch_type_name(int type)
"SYSCALL",
"SYSRET",
"COND_CALL",
- "COND_RET"
+ "COND_RET",
+ "EXPT_RET",
+ "IRQ",
+ "FIQ",
+ "DEBUG_HALT",
+ "DEBUG_EXIT"
};
if (type >= 0 && type < PERF_BR_MAX)
--
2.25.1
next prev parent reply other threads:[~2022-01-24 4:32 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-24 4:30 [RFC V1 00/11] arm64/perf: Enable branch stack sampling Anshuman Khandual
2022-01-24 4:30 ` [RFC V1 01/11] perf: Consolidate branch sample filter helpers Anshuman Khandual
2022-01-24 4:30 ` [RFC V1 02/11] arm64/perf: Add register definitions for BRBE Anshuman Khandual
2022-01-24 14:05 ` Marc Zyngier
2022-01-25 5:04 ` Anshuman Khandual
2022-01-24 4:30 ` [RFC V1 03/11] arm64/perf: Update struct arm_pmu " Anshuman Khandual
2022-01-26 16:59 ` Rob Herring
2022-01-28 3:38 ` Anshuman Khandual
2022-01-24 4:30 ` [RFC V1 04/11] arm64/perf: Update struct pmu_hw_events " Anshuman Khandual
2022-01-24 4:30 ` [RFC V1 05/11] arm64/perf: Detect support " Anshuman Khandual
2022-01-26 17:18 ` Rob Herring
2022-01-28 3:27 ` Anshuman Khandual
2022-01-24 4:30 ` [RFC V1 06/11] arm64/perf: Drive BRBE from perf event states Anshuman Khandual
2022-01-26 17:07 ` Rob Herring
2022-01-27 12:20 ` Anshuman Khandual
2022-01-27 14:31 ` Rob Herring
2022-01-24 4:30 ` [RFC V1 07/11] arm64/perf: Add BRBE driver Anshuman Khandual
2022-01-24 18:11 ` James Clark
2022-01-24 18:15 ` James Clark
2022-01-24 4:30 ` [RFC V1 08/11] arm64/perf: Enable branch stack sampling Anshuman Khandual
2022-01-24 18:02 ` James Clark
2022-01-24 4:30 ` Anshuman Khandual [this message]
2022-01-24 4:30 ` [RFC V1 10/11] perf: Expand perf_branch_entry.type Anshuman Khandual
2022-01-25 16:58 ` James Clark
2022-01-28 4:14 ` Anshuman Khandual
2022-01-26 16:47 ` Rob Herring
2022-01-27 10:41 ` Anshuman Khandual
2022-01-24 4:30 ` [RFC V1 11/11] perf: Capture branch privilege information Anshuman Khandual
2022-01-25 15:39 ` James Clark
2022-02-02 11:11 ` Anshuman Khandual
2022-01-26 17:27 ` James Clark
2022-03-14 6:47 ` Anshuman Khandual
2022-01-25 16:25 ` [PATCH 0/1] perf test: Add branch stack sampling tests for ARM64 German Gomez
2022-01-25 16:25 ` [PATCH 1/1] " German Gomez
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=1642998653-21377-10-git-send-email-anshuman.khandual@arm.com \
--to=anshuman.khandual@arm.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=catalin.marinas@arm.com \
--cc=jolsa@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--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).