lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 28 Jan 2022 11:14:13 +0530 From: Anshuman Khandual <anshuman.khandual@....com> To: linux-kernel@...r.kernel.org, linux-perf-users@...r.kernel.org, linux-arm-kernel@...ts.infradead.org Cc: robh@...nel.org, Anshuman Khandual <anshuman.khandual@....com>, Peter Zijlstra <peterz@...radead.org>, Ingo Molnar <mingo@...hat.com>, Arnaldo Carvalho de Melo <acme@...nel.org>, Mark Rutland <mark.rutland@....com>, Alexander Shishkin <alexander.shishkin@...ux.intel.com>, Jiri Olsa <jolsa@...hat.com>, Namhyung Kim <namhyung@...nel.org>, Will Deacon <will@...nel.org> Subject: [PATCH 2/2] perf: Expand perf_branch_entry.type Current perf_branch_entry.type is a 4 bits field just enough to accommodate 16 generic branch types. This is insufficient to accommodate platforms like arm64 which has much more branch types. Lets just expands this field into a 6 bits one, which can now hold 64 generic branch types. This also adds more generic branch types. Cc: Peter Zijlstra <peterz@...radead.org> Cc: Ingo Molnar <mingo@...hat.com> Cc: Arnaldo Carvalho de Melo <acme@...nel.org> Cc: Mark Rutland <mark.rutland@....com> Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com> Cc: Jiri Olsa <jolsa@...hat.com> Cc: Namhyung Kim <namhyung@...nel.org> Cc: Will Deacon <will@...nel.org> Cc: linux-arm-kernel@...ts.infradead.org Cc: linux-perf-users@...r.kernel.org Cc: linux-kernel@...r.kernel.org Signed-off-by: Anshuman Khandual <anshuman.khandual@....com> --- include/uapi/linux/perf_event.h | 10 ++++++++-- tools/include/uapi/linux/perf_event.h | 10 ++++++++-- tools/perf/util/branch.c | 8 +++++++- tools/perf/util/branch.h | 4 ++-- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index b91d0f575d0c..361fdc6b87a0 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -256,6 +256,12 @@ enum { PERF_BR_FIQ = 13, /* fiq */ PERF_BR_DEBUG_HALT = 14, /* debug halt */ PERF_BR_DEBUG_EXIT = 15, /* debug exit */ + PERF_BR_DEBUG_INST = 16, /* instruciton debug */ + PERF_BR_DEBUG_DATA = 17, /* data debug */ + PERF_BR_FAULT_ALGN = 18, /* alignment fault */ + PERF_BR_FAULT_DATA = 19, /* data fault */ + PERF_BR_FAULT_INST = 20, /* instruction fault */ + PERF_BR_SERROR = 21, /* system error */ PERF_BR_MAX, }; @@ -1370,8 +1376,8 @@ struct perf_branch_entry { in_tx:1, /* in transaction */ abort:1, /* transaction abort */ cycles:16, /* cycle count to last branch */ - type:4, /* branch type */ - reserved:40; + type:6, /* branch type */ + reserved:38; }; union perf_sample_weight { diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h index 1882054e8684..9a82b8aaed93 100644 --- a/tools/include/uapi/linux/perf_event.h +++ b/tools/include/uapi/linux/perf_event.h @@ -256,6 +256,12 @@ enum { PERF_BR_FIQ = 13, /* fiq */ PERF_BR_DEBUG_HALT = 14, /* debug halt */ PERF_BR_DEBUG_EXIT = 15, /* debug exit */ + PERF_BR_DEBUG_INST = 16, /* instruciton debug */ + PERF_BR_DEBUG_DATA = 17, /* data debug */ + PERF_BR_FAULT_ALGN = 18, /* alignment fault */ + PERF_BR_FAULT_DATA = 19, /* data fault */ + PERF_BR_FAULT_INST = 20, /* instruction fault */ + PERF_BR_SERROR = 21, /* system error */ PERF_BR_MAX, }; @@ -1370,8 +1376,8 @@ struct perf_branch_entry { in_tx:1, /* in transaction */ abort:1, /* transaction abort */ cycles:16, /* cycle count to last branch */ - type:4, /* branch type */ - reserved:40; + type:6, /* branch type */ + reserved:38; }; union perf_sample_weight { diff --git a/tools/perf/util/branch.c b/tools/perf/util/branch.c index 74e5e67b1779..1e216ea2e2a8 100644 --- a/tools/perf/util/branch.c +++ b/tools/perf/util/branch.c @@ -54,7 +54,13 @@ const char *branch_type_name(int type) "IRQ", "FIQ", "DEBUG_HALT", - "DEBUG_EXIT" + "DEBUG_EXIT", + "DEBUG_INST", + "DEBUG_DATA", + "FAULT_ALGN", + "FAULT_DATA", + "FAULT_INST", + "SERROR" }; if (type >= 0 && type < PERF_BR_MAX) diff --git a/tools/perf/util/branch.h b/tools/perf/util/branch.h index 17b2ccc61094..875d99abdc36 100644 --- a/tools/perf/util/branch.h +++ b/tools/perf/util/branch.h @@ -23,8 +23,8 @@ struct branch_flags { u64 in_tx:1; u64 abort:1; u64 cycles:16; - u64 type:4; - u64 reserved:40; + u64 type:6; + u64 reserved:38; }; }; }; -- 2.25.1
Powered by blists - more mailing lists