* [PATCH V4 01/10] perf: Add irq and exception return branch types
2022-03-15 5:35 [PATCH V4 00/10] perf: Expand perf_branch_entry Anshuman Khandual
@ 2022-03-15 5:35 ` Anshuman Khandual
2022-03-15 5:35 ` [PATCH V4 02/10] perf: Add system error and not in transaction " Anshuman Khandual
` (8 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Anshuman Khandual @ 2022-03-15 5:35 UTC (permalink / raw)
To: linux-kernel, linux-perf-users, peterz, acme
Cc: Anshuman Khandual, Robin Murphy, Suzuki Poulose, James Clark,
Ingo Molnar, Mark Rutland, Alexander Shishkin, Jiri Olsa,
Namhyung Kim, Thomas Gleixner, Will Deacon, linux-arm-kernel
This expands generic branch type classification by adding two more entries
there in i.e irq and exception return. Also updates the x86 implementation
to process X86_BR_IRET and X86_BR_IRQ records as appropriate. This changes
branch types reported to user space on x86 platform but it should not be a
problem. The possible scenarios and impacts are enumerated here.
--------------------------------------------------------------------------
| kernel | perf tool | Impact |
--------------------------------------------------------------------------
| old | old | Works as before |
--------------------------------------------------------------------------
| old | new | PERF_BR_UNKNOWN is processed |
--------------------------------------------------------------------------
| new | old | PERF_BR_ERET/IRQ are blocked via old PERF_BR_MAX |
--------------------------------------------------------------------------
| new | new | PERF_BR_ERET/IRQ are recognized |
--------------------------------------------------------------------------
When PERF_BR_ERET/IRQ are blocked via old PERF_BR_MAX (new kernel with old
perf tool) the user space might throw up an warning complaining about some
unrecognized branch types being reported, but it is expected. PERF_BR_ERET
and PERF_BR_IRQ branch types will be used for BRBE implementation on arm64
platform.
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: Thomas Gleixner <tglx@linutronix.de>
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
Reviewed-by: James Clark <james.clark@arm.com>
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
arch/x86/events/intel/lbr.c | 4 ++--
include/uapi/linux/perf_event.h | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c
index 669c2be14784..fe1742c4ca49 100644
--- a/arch/x86/events/intel/lbr.c
+++ b/arch/x86/events/intel/lbr.c
@@ -1329,10 +1329,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_ERET, /* 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/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 82858b697c05..d37629dbad72 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -251,6 +251,8 @@ 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_ERET = 11, /* exception return */
+ PERF_BR_IRQ = 12, /* irq */
PERF_BR_MAX,
};
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH V4 02/10] perf: Add system error and not in transaction branch types
2022-03-15 5:35 [PATCH V4 00/10] perf: Expand perf_branch_entry Anshuman Khandual
2022-03-15 5:35 ` [PATCH V4 01/10] perf: Add irq and exception return branch types Anshuman Khandual
@ 2022-03-15 5:35 ` Anshuman Khandual
2022-03-15 5:35 ` [PATCH V4 03/10] perf: Extend branch type classification Anshuman Khandual
` (7 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Anshuman Khandual @ 2022-03-15 5:35 UTC (permalink / raw)
To: linux-kernel, linux-perf-users, peterz, acme
Cc: Anshuman Khandual, Robin Murphy, Suzuki Poulose, James Clark,
Ingo Molnar, Mark Rutland, Alexander Shishkin, Jiri Olsa,
Namhyung Kim, Thomas Gleixner, Will Deacon, linux-arm-kernel
This expands generic branch type classification by adding two more entries
there in i.e system error and not in transaction. This also updates the x86
implementation to process X86_BR_NO_TX records as appropriate. This changes
branch types reported to user space on x86 platform but it should not be a
problem. The possible scenarios and impacts are enumerated here.
--------------------------------------------------------------------------
| kernel | perf tool | Impact |
--------------------------------------------------------------------------
| old | old | Works as before |
--------------------------------------------------------------------------
| old | new | PERF_BR_UNKNOWN is processed |
--------------------------------------------------------------------------
| new | old | PERF_BR_NO_TX are blocked via old PERF_BR_MAX |
--------------------------------------------------------------------------
| new | new | NO_TX are recognized |
--------------------------------------------------------------------------
When PERF_BR_NO_TX is blocked via old PERF_BR_MAX (new kernel with old perf
tool) the user space might throw up an warning complaining about an
unrecognized branch types being reported, but it's expected. PERF_BR_SERROR
& PERF_BR_NO_TX branch types will be used for BRBE implementation on arm64
platform.
PERF_BR_NO_TX complements 'abort' and 'in_tx' elements in perf_branch_entry
which represent other transaction states for a given branch record. Because
this completes the transaction state classification.
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: Thomas Gleixner <tglx@linutronix.de>
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 | 2 +-
include/uapi/linux/perf_event.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c
index fe1742c4ca49..30dcd18936d5 100644
--- a/arch/x86/events/intel/lbr.c
+++ b/arch/x86/events/intel/lbr.c
@@ -1336,7 +1336,7 @@ static int branch_map[X86_BR_TYPE_MAP_MAX] = {
PERF_BR_IND_CALL, /* X86_BR_IND_CALL */
PERF_BR_UNKNOWN, /* X86_BR_ABORT */
PERF_BR_UNKNOWN, /* X86_BR_IN_TX */
- PERF_BR_UNKNOWN, /* X86_BR_NO_TX */
+ PERF_BR_NO_TX, /* X86_BR_NO_TX */
PERF_BR_CALL, /* X86_BR_ZERO_CALL */
PERF_BR_UNKNOWN, /* X86_BR_CALL_STACK */
PERF_BR_IND, /* X86_BR_IND_JMP */
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index d37629dbad72..26d8f0b5ac0d 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -253,6 +253,8 @@ enum {
PERF_BR_COND_RET = 10, /* conditional function return */
PERF_BR_ERET = 11, /* exception return */
PERF_BR_IRQ = 12, /* irq */
+ PERF_BR_SERROR = 13, /* system error */
+ PERF_BR_NO_TX = 14, /* not in transaction */
PERF_BR_MAX,
};
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH V4 03/10] perf: Extend branch type classification
2022-03-15 5:35 [PATCH V4 00/10] perf: Expand perf_branch_entry Anshuman Khandual
2022-03-15 5:35 ` [PATCH V4 01/10] perf: Add irq and exception return branch types Anshuman Khandual
2022-03-15 5:35 ` [PATCH V4 02/10] perf: Add system error and not in transaction " Anshuman Khandual
@ 2022-03-15 5:35 ` Anshuman Khandual
2022-03-15 11:22 ` Peter Zijlstra
2022-03-15 5:35 ` [PATCH V4 04/10] perf: Capture branch privilege information Anshuman Khandual
` (6 subsequent siblings)
9 siblings, 1 reply; 16+ messages in thread
From: Anshuman Khandual @ 2022-03-15 5:35 UTC (permalink / raw)
To: linux-kernel, linux-perf-users, peterz, acme
Cc: Anshuman Khandual, Robin Murphy, Suzuki Poulose, James Clark,
Ingo Molnar, Mark Rutland, Alexander Shishkin, Jiri Olsa,
Namhyung Kim, Thomas Gleixner, Will Deacon, linux-arm-kernel
branch_entry.type now has ran out of space to accommodate more branch types
classification. This will prevent perf branch stack implementation on arm64
(via BRBE) to capture all available branch types. Extending this bit field
i.e branch_entry.type [4 bits] is not an option as it will break user space
ABI both for little and big endian perf tools.
Extend branch classification with a new field branch_entry.new_type via a
new branch type PERF_BR_EXTEND_ABI in branch_entry.type. Perf tools which
could decode PERF_BR_EXTEND_ABI, will then parse branch_entry.new_type as
well.
branch_entry.new_type is a 4 bit field which can hold upto 16 branch types.
The first three branch types will hold various generic page faults followed
by five architecture specific branch types, which can be overridden by the
platform for specific use cases. These architecture specific branch types
gets overridden on arm64 platform for BRBE implementation.
New generic branch types
- PERF_BR_NEW_FAULT_ALGN
- PERF_BR_NEW_FAULT_DATA
- PERF_BR_NEW_FAULT_INST
New arch specific branch types
- PERF_BR_NEW_ARCH_1
- PERF_BR_NEW_ARCH_2
- PERF_BR_NEW_ARCH_3
- PERF_BR_NEW_ARCH_4
- PERF_BR_NEW_ARCH_5
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: Thomas Gleixner <tglx@linutronix.de>
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>
---
include/uapi/linux/perf_event.h | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 26d8f0b5ac0d..d29280adc3c4 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -255,9 +255,22 @@ enum {
PERF_BR_IRQ = 12, /* irq */
PERF_BR_SERROR = 13, /* system error */
PERF_BR_NO_TX = 14, /* not in transaction */
+ PERF_BR_EXTEND_ABI = 15, /* extend ABI */
PERF_BR_MAX,
};
+enum {
+ PERF_BR_NEW_FAULT_ALGN = 0, /* Alignment fault */
+ PERF_BR_NEW_FAULT_DATA = 1, /* Data fault */
+ PERF_BR_NEW_FAULT_INST = 2, /* Inst fault */
+ PERF_BR_NEW_ARCH_1 = 3, /* Architecture specific */
+ PERF_BR_NEW_ARCH_2 = 4, /* Architecture specific */
+ PERF_BR_NEW_ARCH_3 = 5, /* Architecture specific */
+ PERF_BR_NEW_ARCH_4 = 6, /* Architecture specific */
+ PERF_BR_NEW_ARCH_5 = 7, /* Architecture specific */
+ PERF_BR_NEW_MAX,
+};
+
#define PERF_SAMPLE_BRANCH_PLM_ALL \
(PERF_SAMPLE_BRANCH_USER|\
PERF_SAMPLE_BRANCH_KERNEL|\
@@ -1372,7 +1385,8 @@ struct perf_branch_entry {
abort:1, /* transaction abort */
cycles:16, /* cycle count to last branch */
type:4, /* branch type */
- reserved:40;
+ new_type:4, /* additional branch type */
+ reserved:36;
};
union perf_sample_weight {
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH V4 03/10] perf: Extend branch type classification
2022-03-15 5:35 ` [PATCH V4 03/10] perf: Extend branch type classification Anshuman Khandual
@ 2022-03-15 11:22 ` Peter Zijlstra
2022-03-15 13:06 ` Robin Murphy
0 siblings, 1 reply; 16+ messages in thread
From: Peter Zijlstra @ 2022-03-15 11:22 UTC (permalink / raw)
To: Anshuman Khandual
Cc: linux-kernel, linux-perf-users, acme, Robin Murphy,
Suzuki Poulose, James Clark, Ingo Molnar, Mark Rutland,
Alexander Shishkin, Jiri Olsa, Namhyung Kim, Thomas Gleixner,
Will Deacon, linux-arm-kernel
On Tue, Mar 15, 2022 at 11:05:09AM +0530, Anshuman Khandual wrote:
> branch_entry.type now has ran out of space to accommodate more branch types
> classification. This will prevent perf branch stack implementation on arm64
> (via BRBE) to capture all available branch types. Extending this bit field
> i.e branch_entry.type [4 bits] is not an option as it will break user space
> ABI both for little and big endian perf tools.
>
> Extend branch classification with a new field branch_entry.new_type via a
> new branch type PERF_BR_EXTEND_ABI in branch_entry.type. Perf tools which
> could decode PERF_BR_EXTEND_ABI, will then parse branch_entry.new_type as
> well.
>
> branch_entry.new_type is a 4 bit field which can hold upto 16 branch types.
> The first three branch types will hold various generic page faults followed
> by five architecture specific branch types, which can be overridden by the
> platform for specific use cases. These architecture specific branch types
> gets overridden on arm64 platform for BRBE implementation.
> diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
> index 26d8f0b5ac0d..d29280adc3c4 100644
> --- a/include/uapi/linux/perf_event.h
> +++ b/include/uapi/linux/perf_event.h
> @@ -255,9 +255,22 @@ enum {
> PERF_BR_IRQ = 12, /* irq */
> PERF_BR_SERROR = 13, /* system error */
> PERF_BR_NO_TX = 14, /* not in transaction */
> + PERF_BR_EXTEND_ABI = 15, /* extend ABI */
> PERF_BR_MAX,
> };
> #define PERF_SAMPLE_BRANCH_PLM_ALL \
> (PERF_SAMPLE_BRANCH_USER|\
> PERF_SAMPLE_BRANCH_KERNEL|\
> @@ -1372,7 +1385,8 @@ struct perf_branch_entry {
> abort:1, /* transaction abort */
> cycles:16, /* cycle count to last branch */
> type:4, /* branch type */
> - reserved:40;
> + new_type:4, /* additional branch type */
> + reserved:36;
> };
Hurmpf... this will effectively give us 5 bits of space for the cost of
8, that seems... unfortunate.
Would something like:
type:4,
ext_type:4,
reserved:36;
and have all software do:
type = pbe->type | (pbe->ext_type << 4);
Then old software will only know about the old types. New software on
old kernels will add 4 0's, which is harmless, while new software on new
kernels will get 8 bytes of type.
Would that work?
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH V4 03/10] perf: Extend branch type classification
2022-03-15 11:22 ` Peter Zijlstra
@ 2022-03-15 13:06 ` Robin Murphy
2022-03-16 12:20 ` Peter Zijlstra
0 siblings, 1 reply; 16+ messages in thread
From: Robin Murphy @ 2022-03-15 13:06 UTC (permalink / raw)
To: Peter Zijlstra, Anshuman Khandual
Cc: linux-kernel, linux-perf-users, acme, Suzuki Poulose,
James Clark, Ingo Molnar, Mark Rutland, Alexander Shishkin,
Jiri Olsa, Namhyung Kim, Thomas Gleixner, Will Deacon,
linux-arm-kernel
On 2022-03-15 11:22, Peter Zijlstra wrote:
> On Tue, Mar 15, 2022 at 11:05:09AM +0530, Anshuman Khandual wrote:
>> branch_entry.type now has ran out of space to accommodate more branch types
>> classification. This will prevent perf branch stack implementation on arm64
>> (via BRBE) to capture all available branch types. Extending this bit field
>> i.e branch_entry.type [4 bits] is not an option as it will break user space
>> ABI both for little and big endian perf tools.
>>
>> Extend branch classification with a new field branch_entry.new_type via a
>> new branch type PERF_BR_EXTEND_ABI in branch_entry.type. Perf tools which
>> could decode PERF_BR_EXTEND_ABI, will then parse branch_entry.new_type as
>> well.
>>
>> branch_entry.new_type is a 4 bit field which can hold upto 16 branch types.
>> The first three branch types will hold various generic page faults followed
>> by five architecture specific branch types, which can be overridden by the
>> platform for specific use cases. These architecture specific branch types
>> gets overridden on arm64 platform for BRBE implementation.
>
>> diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
>> index 26d8f0b5ac0d..d29280adc3c4 100644
>> --- a/include/uapi/linux/perf_event.h
>> +++ b/include/uapi/linux/perf_event.h
>> @@ -255,9 +255,22 @@ enum {
>> PERF_BR_IRQ = 12, /* irq */
>> PERF_BR_SERROR = 13, /* system error */
>> PERF_BR_NO_TX = 14, /* not in transaction */
>> + PERF_BR_EXTEND_ABI = 15, /* extend ABI */
>> PERF_BR_MAX,
>> };
>
>
>> #define PERF_SAMPLE_BRANCH_PLM_ALL \
>> (PERF_SAMPLE_BRANCH_USER|\
>> PERF_SAMPLE_BRANCH_KERNEL|\
>> @@ -1372,7 +1385,8 @@ struct perf_branch_entry {
>> abort:1, /* transaction abort */
>> cycles:16, /* cycle count to last branch */
>> type:4, /* branch type */
>> - reserved:40;
>> + new_type:4, /* additional branch type */
>> + reserved:36;
>> };
>
> Hurmpf... this will effectively give us 5 bits of space for the cost of
> 8, that seems... unfortunate.
>
> Would something like:
>
> type:4,
> ext_type:4,
> reserved:36;
>
> and have all software do:
>
> type = pbe->type | (pbe->ext_type << 4);
>
> Then old software will only know about the old types. New software on
> old kernels will add 4 0's, which is harmless, while new software on new
> kernels will get 8 bytes of type.
>
> Would that work?
Depends how bad the effects of aliasing in existing software would be, I
guess - e.g. new kernel outputs type 0x23 which software then interprets
as 0x3 since it doesn't know about the extended bits. I'm guessing
that's more likely "confusing to the user" than "catastrophically
fatal", but it might still matter.
If software had an explicit opt-in to receiving extended types when
requesting branch sampling in the first place we could avoid that worry,
but then we'd need some additional complexity to sanitise records
depending on that option :/
Robin.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH V4 03/10] perf: Extend branch type classification
2022-03-15 13:06 ` Robin Murphy
@ 2022-03-16 12:20 ` Peter Zijlstra
2022-03-17 5:41 ` Anshuman Khandual
0 siblings, 1 reply; 16+ messages in thread
From: Peter Zijlstra @ 2022-03-16 12:20 UTC (permalink / raw)
To: Robin Murphy
Cc: Anshuman Khandual, linux-kernel, linux-perf-users, acme,
Suzuki Poulose, James Clark, Ingo Molnar, Mark Rutland,
Alexander Shishkin, Jiri Olsa, Namhyung Kim, Thomas Gleixner,
Will Deacon, linux-arm-kernel
On Tue, Mar 15, 2022 at 01:06:42PM +0000, Robin Murphy wrote:
> On 2022-03-15 11:22, Peter Zijlstra wrote:
> > On Tue, Mar 15, 2022 at 11:05:09AM +0530, Anshuman Khandual wrote:
> > > branch_entry.type now has ran out of space to accommodate more branch types
> > > classification. This will prevent perf branch stack implementation on arm64
> > > (via BRBE) to capture all available branch types. Extending this bit field
> > > i.e branch_entry.type [4 bits] is not an option as it will break user space
> > > ABI both for little and big endian perf tools.
> > >
> > > Extend branch classification with a new field branch_entry.new_type via a
> > > new branch type PERF_BR_EXTEND_ABI in branch_entry.type. Perf tools which
> > > could decode PERF_BR_EXTEND_ABI, will then parse branch_entry.new_type as
> > > well.
> > >
> > > branch_entry.new_type is a 4 bit field which can hold upto 16 branch types.
> > > The first three branch types will hold various generic page faults followed
> > > by five architecture specific branch types, which can be overridden by the
> > > platform for specific use cases. These architecture specific branch types
> > > gets overridden on arm64 platform for BRBE implementation.
> >
> > > diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
> > > index 26d8f0b5ac0d..d29280adc3c4 100644
> > > --- a/include/uapi/linux/perf_event.h
> > > +++ b/include/uapi/linux/perf_event.h
> > > @@ -255,9 +255,22 @@ enum {
> > > PERF_BR_IRQ = 12, /* irq */
> > > PERF_BR_SERROR = 13, /* system error */
> > > PERF_BR_NO_TX = 14, /* not in transaction */
> > > + PERF_BR_EXTEND_ABI = 15, /* extend ABI */
> > > PERF_BR_MAX,
> > > };
> >
> >
> > > #define PERF_SAMPLE_BRANCH_PLM_ALL \
> > > (PERF_SAMPLE_BRANCH_USER|\
> > > PERF_SAMPLE_BRANCH_KERNEL|\
> > > @@ -1372,7 +1385,8 @@ struct perf_branch_entry {
> > > abort:1, /* transaction abort */
> > > cycles:16, /* cycle count to last branch */
> > > type:4, /* branch type */
> > > - reserved:40;
> > > + new_type:4, /* additional branch type */
> > > + reserved:36;
> > > };
> >
> > Hurmpf... this will effectively give us 5 bits of space for the cost of
> > 8, that seems... unfortunate.
> >
> > Would something like:
> >
> > type:4,
> > ext_type:4,
> > reserved:36;
> >
> > and have all software do:
> >
> > type = pbe->type | (pbe->ext_type << 4);
> >
> > Then old software will only know about the old types. New software on
> > old kernels will add 4 0's, which is harmless, while new software on new
> > kernels will get 8 bytes of type.
> >
> > Would that work?
>
> Depends how bad the effects of aliasing in existing software would be, I
> guess - e.g. new kernel outputs type 0x23 which software then interprets as
> 0x3 since it doesn't know about the extended bits. I'm guessing that's more
> likely "confusing to the user" than "catastrophically fatal", but it might
> still matter.
>
> If software had an explicit opt-in to receiving extended types when
> requesting branch sampling in the first place we could avoid that worry, but
> then we'd need some additional complexity to sanitise records depending on
> that option :/
Bah.. I see.. One option is PERF_SAMPLE_BRANCH_STACK2, but yes, yuck.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH V4 03/10] perf: Extend branch type classification
2022-03-16 12:20 ` Peter Zijlstra
@ 2022-03-17 5:41 ` Anshuman Khandual
0 siblings, 0 replies; 16+ messages in thread
From: Anshuman Khandual @ 2022-03-17 5:41 UTC (permalink / raw)
To: Peter Zijlstra, Robin Murphy
Cc: linux-kernel, linux-perf-users, acme, Suzuki Poulose,
James Clark, Ingo Molnar, Mark Rutland, Alexander Shishkin,
Jiri Olsa, Namhyung Kim, Thomas Gleixner, Will Deacon,
linux-arm-kernel
On 3/16/22 17:50, Peter Zijlstra wrote:
> On Tue, Mar 15, 2022 at 01:06:42PM +0000, Robin Murphy wrote:
>> On 2022-03-15 11:22, Peter Zijlstra wrote:
>>> On Tue, Mar 15, 2022 at 11:05:09AM +0530, Anshuman Khandual wrote:
>>>> branch_entry.type now has ran out of space to accommodate more branch types
>>>> classification. This will prevent perf branch stack implementation on arm64
>>>> (via BRBE) to capture all available branch types. Extending this bit field
>>>> i.e branch_entry.type [4 bits] is not an option as it will break user space
>>>> ABI both for little and big endian perf tools.
>>>>
>>>> Extend branch classification with a new field branch_entry.new_type via a
>>>> new branch type PERF_BR_EXTEND_ABI in branch_entry.type. Perf tools which
>>>> could decode PERF_BR_EXTEND_ABI, will then parse branch_entry.new_type as
>>>> well.
>>>>
>>>> branch_entry.new_type is a 4 bit field which can hold upto 16 branch types.
>>>> The first three branch types will hold various generic page faults followed
>>>> by five architecture specific branch types, which can be overridden by the
>>>> platform for specific use cases. These architecture specific branch types
>>>> gets overridden on arm64 platform for BRBE implementation.
>>>
>>>> diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
>>>> index 26d8f0b5ac0d..d29280adc3c4 100644
>>>> --- a/include/uapi/linux/perf_event.h
>>>> +++ b/include/uapi/linux/perf_event.h
>>>> @@ -255,9 +255,22 @@ enum {
>>>> PERF_BR_IRQ = 12, /* irq */
>>>> PERF_BR_SERROR = 13, /* system error */
>>>> PERF_BR_NO_TX = 14, /* not in transaction */
>>>> + PERF_BR_EXTEND_ABI = 15, /* extend ABI */
>>>> PERF_BR_MAX,
>>>> };
>>>
>>>
>>>> #define PERF_SAMPLE_BRANCH_PLM_ALL \
>>>> (PERF_SAMPLE_BRANCH_USER|\
>>>> PERF_SAMPLE_BRANCH_KERNEL|\
>>>> @@ -1372,7 +1385,8 @@ struct perf_branch_entry {
>>>> abort:1, /* transaction abort */
>>>> cycles:16, /* cycle count to last branch */
>>>> type:4, /* branch type */
>>>> - reserved:40;
>>>> + new_type:4, /* additional branch type */
>>>> + reserved:36;
>>>> };
>>>
>>> Hurmpf... this will effectively give us 5 bits of space for the cost of
>>> 8, that seems... unfortunate.
>>>
>>> Would something like:
>>>
>>> type:4,
>>> ext_type:4,
>>> reserved:36;
>>>
>>> and have all software do:
>>>
>>> type = pbe->type | (pbe->ext_type << 4);
>>>
>>> Then old software will only know about the old types. New software on
>>> old kernels will add 4 0's, which is harmless, while new software on new
>>> kernels will get 8 bytes of type.
>>>
>>> Would that work?
>>
>> Depends how bad the effects of aliasing in existing software would be, I
>> guess - e.g. new kernel outputs type 0x23 which software then interprets as
>> 0x3 since it doesn't know about the extended bits. I'm guessing that's more
>> likely "confusing to the user" than "catastrophically fatal", but it might
>> still matter.
>>
>> If software had an explicit opt-in to receiving extended types when
>> requesting branch sampling in the first place we could avoid that worry, but
>> then we'd need some additional complexity to sanitise records depending on
>> that option :/
>
> Bah.. I see.. One option is PERF_SAMPLE_BRANCH_STACK2, but yes, yuck.
Could you please elaborate on this ? Are you suggesting to add another perf
sample flag i.e PERF_SAMPLE_BRANCH_STACK2 just to capture and process these
new branch types ?
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH V4 04/10] perf: Capture branch privilege information
2022-03-15 5:35 [PATCH V4 00/10] perf: Expand perf_branch_entry Anshuman Khandual
` (2 preceding siblings ...)
2022-03-15 5:35 ` [PATCH V4 03/10] perf: Extend branch type classification Anshuman Khandual
@ 2022-03-15 5:35 ` Anshuman Khandual
2022-03-16 17:26 ` James Clark
2022-03-15 5:35 ` [PATCH V4 05/10] perf: Add PERF_BR_NEW_ARCH_[N] map for BRBE on arm64 platform Anshuman Khandual
` (5 subsequent siblings)
9 siblings, 1 reply; 16+ messages in thread
From: Anshuman Khandual @ 2022-03-15 5:35 UTC (permalink / raw)
To: linux-kernel, linux-perf-users, peterz, acme
Cc: Anshuman Khandual, Robin Murphy, Suzuki Poulose, James Clark,
Ingo Molnar, Mark Rutland, Alexander Shishkin, Jiri Olsa,
Namhyung Kim, Thomas Gleixner, Will Deacon, linux-arm-kernel
Platforms like arm64 could capture privilege level information for all the
branch records. Hence this adds a new element in the struct branch_entry to
record the privilege level information, which could be requested through a
new event.attr.branch_sample_type based flag PERF_SAMPLE_BRANCH_PRIV_SAVE.
This flag helps user choose whether privilege information is captured.
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: Thomas Gleixner <tglx@linutronix.de>
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>
---
include/uapi/linux/perf_event.h | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index d29280adc3c4..193dba2ecdc1 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -204,6 +204,8 @@ enum perf_branch_sample_type_shift {
PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT = 17, /* save low level index of raw branch records */
+ PERF_SAMPLE_BRANCH_PRIV_SAVE_SHIFT = 18, /* save privilege mode */
+
PERF_SAMPLE_BRANCH_MAX_SHIFT /* non-ABI */
};
@@ -233,6 +235,8 @@ enum perf_branch_sample_type {
PERF_SAMPLE_BRANCH_HW_INDEX = 1U << PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT,
+ PERF_SAMPLE_BRANCH_PRIV_SAVE = 1U << PERF_SAMPLE_BRANCH_PRIV_SAVE_SHIFT,
+
PERF_SAMPLE_BRANCH_MAX = 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT,
};
@@ -271,6 +275,13 @@ enum {
PERF_BR_NEW_MAX,
};
+enum {
+ PERF_BR_PRIV_UNKNOWN = 0,
+ PERF_BR_PRIV_USER = 1,
+ PERF_BR_PRIV_KERNEL = 2,
+ PERF_BR_PRIV_HV = 3,
+};
+
#define PERF_SAMPLE_BRANCH_PLM_ALL \
(PERF_SAMPLE_BRANCH_USER|\
PERF_SAMPLE_BRANCH_KERNEL|\
@@ -1386,7 +1397,8 @@ struct perf_branch_entry {
cycles:16, /* cycle count to last branch */
type:4, /* branch type */
new_type:4, /* additional branch type */
- reserved:36;
+ priv:3, /* privilege level */
+ reserved:33;
};
union perf_sample_weight {
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH V4 04/10] perf: Capture branch privilege information
2022-03-15 5:35 ` [PATCH V4 04/10] perf: Capture branch privilege information Anshuman Khandual
@ 2022-03-16 17:26 ` James Clark
0 siblings, 0 replies; 16+ messages in thread
From: James Clark @ 2022-03-16 17:26 UTC (permalink / raw)
To: Anshuman Khandual, linux-kernel, linux-perf-users, peterz, acme
Cc: Robin Murphy, Suzuki Poulose, Ingo Molnar, Mark Rutland,
Alexander Shishkin, Jiri Olsa, Namhyung Kim, Thomas Gleixner,
Will Deacon, linux-arm-kernel
On 15/03/2022 05:35, Anshuman Khandual wrote:
> Platforms like arm64 could capture privilege level information for all the
> branch records. Hence this adds a new element in the struct branch_entry to
> record the privilege level information, which could be requested through a
> new event.attr.branch_sample_type based flag PERF_SAMPLE_BRANCH_PRIV_SAVE.
> This flag helps user choose whether privilege information is captured.
>
Reviewed-by: James Clark <james.clark@arm.com>
> 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: Thomas Gleixner <tglx@linutronix.de>
> 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>
> ---
> include/uapi/linux/perf_event.h | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
> index d29280adc3c4..193dba2ecdc1 100644
> --- a/include/uapi/linux/perf_event.h
> +++ b/include/uapi/linux/perf_event.h
> @@ -204,6 +204,8 @@ enum perf_branch_sample_type_shift {
>
> PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT = 17, /* save low level index of raw branch records */
>
> + PERF_SAMPLE_BRANCH_PRIV_SAVE_SHIFT = 18, /* save privilege mode */
> +
> PERF_SAMPLE_BRANCH_MAX_SHIFT /* non-ABI */
> };
>
> @@ -233,6 +235,8 @@ enum perf_branch_sample_type {
>
> PERF_SAMPLE_BRANCH_HW_INDEX = 1U << PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT,
>
> + PERF_SAMPLE_BRANCH_PRIV_SAVE = 1U << PERF_SAMPLE_BRANCH_PRIV_SAVE_SHIFT,
> +
> PERF_SAMPLE_BRANCH_MAX = 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT,
> };
>
> @@ -271,6 +275,13 @@ enum {
> PERF_BR_NEW_MAX,
> };
>
> +enum {
> + PERF_BR_PRIV_UNKNOWN = 0,
> + PERF_BR_PRIV_USER = 1,
> + PERF_BR_PRIV_KERNEL = 2,
> + PERF_BR_PRIV_HV = 3,
> +};
> +
> #define PERF_SAMPLE_BRANCH_PLM_ALL \
> (PERF_SAMPLE_BRANCH_USER|\
> PERF_SAMPLE_BRANCH_KERNEL|\
> @@ -1386,7 +1397,8 @@ struct perf_branch_entry {
> cycles:16, /* cycle count to last branch */
> type:4, /* branch type */
> new_type:4, /* additional branch type */
> - reserved:36;
> + priv:3, /* privilege level */
> + reserved:33;
> };
>
> union perf_sample_weight {
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH V4 05/10] perf: Add PERF_BR_NEW_ARCH_[N] map for BRBE on arm64 platform
2022-03-15 5:35 [PATCH V4 00/10] perf: Expand perf_branch_entry Anshuman Khandual
` (3 preceding siblings ...)
2022-03-15 5:35 ` [PATCH V4 04/10] perf: Capture branch privilege information Anshuman Khandual
@ 2022-03-15 5:35 ` Anshuman Khandual
2022-03-15 5:35 ` [PATCH V4 06/10] perf/tools: Add irq and exception return branch types Anshuman Khandual
` (4 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Anshuman Khandual @ 2022-03-15 5:35 UTC (permalink / raw)
To: linux-kernel, linux-perf-users, peterz, acme
Cc: Anshuman Khandual, Robin Murphy, Suzuki Poulose, James Clark,
Ingo Molnar, Mark Rutland, Alexander Shishkin, Jiri Olsa,
Namhyung Kim, Thomas Gleixner, Will Deacon, linux-arm-kernel
BRBE captured branch types will overflow perf_branch_entry.type and generic
branch types in perf_branch_entry.new_type. So override each available arch
specific branch type in the following manner to comprehensively process all
reported branch types in BRBE.
PERF_BR_ARM64_FIQ PERF_BR_NEW_ARCH_1
PERF_BR_ARM64_DEBUG_HALT PERF_BR_NEW_ARCH_2
PERF_BR_ARM64_DEBUG_EXIT PERF_BR_NEW_ARCH_3
PERF_BR_ARM64_DEBUG_INST PERF_BR_NEW_ARCH_4
PERF_BR_ARM64_DEBUG_DATA PERF_BR_NEW_ARCH_5
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
include/uapi/linux/perf_event.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 193dba2ecdc1..4cf1c8e22cab 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -282,6 +282,12 @@ enum {
PERF_BR_PRIV_HV = 3,
};
+#define PERF_BR_ARM64_FIQ PERF_BR_NEW_ARCH_1
+#define PERF_BR_ARM64_DEBUG_HALT PERF_BR_NEW_ARCH_2
+#define PERF_BR_ARM64_DEBUG_EXIT PERF_BR_NEW_ARCH_3
+#define PERF_BR_ARM64_DEBUG_INST PERF_BR_NEW_ARCH_4
+#define PERF_BR_ARM64_DEBUG_DATA PERF_BR_NEW_ARCH_5
+
#define PERF_SAMPLE_BRANCH_PLM_ALL \
(PERF_SAMPLE_BRANCH_USER|\
PERF_SAMPLE_BRANCH_KERNEL|\
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH V4 06/10] perf/tools: Add irq and exception return branch types
2022-03-15 5:35 [PATCH V4 00/10] perf: Expand perf_branch_entry Anshuman Khandual
` (4 preceding siblings ...)
2022-03-15 5:35 ` [PATCH V4 05/10] perf: Add PERF_BR_NEW_ARCH_[N] map for BRBE on arm64 platform Anshuman Khandual
@ 2022-03-15 5:35 ` Anshuman Khandual
2022-03-15 5:35 ` [PATCH V4 07/10] perf/tools: Add system error and not in transaction " Anshuman Khandual
` (3 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Anshuman Khandual @ 2022-03-15 5:35 UTC (permalink / raw)
To: linux-kernel, linux-perf-users, peterz, acme
Cc: Anshuman Khandual, Robin Murphy, Suzuki Poulose, James Clark,
Ingo Molnar, Mark Rutland, Alexander Shishkin, Jiri Olsa,
Namhyung Kim, Thomas Gleixner, Will Deacon, linux-arm-kernel
This updates the perf tool with generic branch type classification with two
new branch types i.e irq (PERF_BR_IRQ) and exception return (PERF_BR_ERET)
which got updated earlier in the kernel. This also updates corresponding
branch type strings in branch_type_name().
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: Thomas Gleixner <tglx@linutronix.de>
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>
---
tools/include/uapi/linux/perf_event.h | 2 ++
tools/perf/util/branch.c | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h
index 82858b697c05..d37629dbad72 100644
--- a/tools/include/uapi/linux/perf_event.h
+++ b/tools/include/uapi/linux/perf_event.h
@@ -251,6 +251,8 @@ 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_ERET = 11, /* exception return */
+ PERF_BR_IRQ = 12, /* irq */
PERF_BR_MAX,
};
diff --git a/tools/perf/util/branch.c b/tools/perf/util/branch.c
index 2285b1eb3128..a9a909db8cc7 100644
--- a/tools/perf/util/branch.c
+++ b/tools/perf/util/branch.c
@@ -49,7 +49,9 @@ const char *branch_type_name(int type)
"SYSCALL",
"SYSRET",
"COND_CALL",
- "COND_RET"
+ "COND_RET",
+ "ERET",
+ "IRQ"
};
if (type >= 0 && type < PERF_BR_MAX)
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH V4 07/10] perf/tools: Add system error and not in transaction branch types
2022-03-15 5:35 [PATCH V4 00/10] perf: Expand perf_branch_entry Anshuman Khandual
` (5 preceding siblings ...)
2022-03-15 5:35 ` [PATCH V4 06/10] perf/tools: Add irq and exception return branch types Anshuman Khandual
@ 2022-03-15 5:35 ` Anshuman Khandual
2022-03-15 5:35 ` [PATCH V4 08/10] perf/tools: Extend branch type classification Anshuman Khandual
` (2 subsequent siblings)
9 siblings, 0 replies; 16+ messages in thread
From: Anshuman Khandual @ 2022-03-15 5:35 UTC (permalink / raw)
To: linux-kernel, linux-perf-users, peterz, acme
Cc: Anshuman Khandual, Robin Murphy, Suzuki Poulose, James Clark,
Ingo Molnar, Mark Rutland, Alexander Shishkin, Jiri Olsa,
Namhyung Kim, Thomas Gleixner, Will Deacon, linux-arm-kernel
This updates the perf tool with generic branch type classification with two
new branch types i.e system error (PERF_BR_SERROR) and not in transaction
(PERF_BR_NO_TX) which got updated earlier in the kernel. This also updates
corresponding branch type strings in branch_type_name().
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: Thomas Gleixner <tglx@linutronix.de>
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>
---
tools/include/uapi/linux/perf_event.h | 2 ++
tools/perf/util/branch.c | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h
index d37629dbad72..26d8f0b5ac0d 100644
--- a/tools/include/uapi/linux/perf_event.h
+++ b/tools/include/uapi/linux/perf_event.h
@@ -253,6 +253,8 @@ enum {
PERF_BR_COND_RET = 10, /* conditional function return */
PERF_BR_ERET = 11, /* exception return */
PERF_BR_IRQ = 12, /* irq */
+ PERF_BR_SERROR = 13, /* system error */
+ PERF_BR_NO_TX = 14, /* not in transaction */
PERF_BR_MAX,
};
diff --git a/tools/perf/util/branch.c b/tools/perf/util/branch.c
index a9a909db8cc7..abc673347bee 100644
--- a/tools/perf/util/branch.c
+++ b/tools/perf/util/branch.c
@@ -51,7 +51,9 @@ const char *branch_type_name(int type)
"COND_CALL",
"COND_RET",
"ERET",
- "IRQ"
+ "IRQ",
+ "SERROR",
+ "NO_TX"
};
if (type >= 0 && type < PERF_BR_MAX)
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH V4 08/10] perf/tools: Extend branch type classification
2022-03-15 5:35 [PATCH V4 00/10] perf: Expand perf_branch_entry Anshuman Khandual
` (6 preceding siblings ...)
2022-03-15 5:35 ` [PATCH V4 07/10] perf/tools: Add system error and not in transaction " Anshuman Khandual
@ 2022-03-15 5:35 ` Anshuman Khandual
2022-03-15 5:35 ` [PATCH V4 09/10] perf/tools: Add branch privilege information request flag Anshuman Khandual
2022-03-15 5:35 ` [PATCH V4 10/10] perf/tools: Add PERF_BR_NEW_ARCH_[N] map for BRBE on arm64 platform Anshuman Khandual
9 siblings, 0 replies; 16+ messages in thread
From: Anshuman Khandual @ 2022-03-15 5:35 UTC (permalink / raw)
To: linux-kernel, linux-perf-users, peterz, acme
Cc: Anshuman Khandual, Robin Murphy, Suzuki Poulose, James Clark,
Ingo Molnar, Mark Rutland, Alexander Shishkin, Jiri Olsa,
Namhyung Kim, Thomas Gleixner, Will Deacon, linux-arm-kernel
This updates the perf tool with generic branch type classification with new
ABI extender place holder i.e PERF_BR_EXTEND_ABI, the new 4 bit branch type
field i.e perf_branch_entry.new_type, new generic page fault related branch
types and some arch specific branch types as added earlier in the kernel.
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: Thomas Gleixner <tglx@linutronix.de>
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>
---
tools/include/uapi/linux/perf_event.h | 16 +++++++++++++++-
tools/perf/util/branch.c | 3 ++-
tools/perf/util/branch.h | 3 ++-
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h
index 26d8f0b5ac0d..d29280adc3c4 100644
--- a/tools/include/uapi/linux/perf_event.h
+++ b/tools/include/uapi/linux/perf_event.h
@@ -255,9 +255,22 @@ enum {
PERF_BR_IRQ = 12, /* irq */
PERF_BR_SERROR = 13, /* system error */
PERF_BR_NO_TX = 14, /* not in transaction */
+ PERF_BR_EXTEND_ABI = 15, /* extend ABI */
PERF_BR_MAX,
};
+enum {
+ PERF_BR_NEW_FAULT_ALGN = 0, /* Alignment fault */
+ PERF_BR_NEW_FAULT_DATA = 1, /* Data fault */
+ PERF_BR_NEW_FAULT_INST = 2, /* Inst fault */
+ PERF_BR_NEW_ARCH_1 = 3, /* Architecture specific */
+ PERF_BR_NEW_ARCH_2 = 4, /* Architecture specific */
+ PERF_BR_NEW_ARCH_3 = 5, /* Architecture specific */
+ PERF_BR_NEW_ARCH_4 = 6, /* Architecture specific */
+ PERF_BR_NEW_ARCH_5 = 7, /* Architecture specific */
+ PERF_BR_NEW_MAX,
+};
+
#define PERF_SAMPLE_BRANCH_PLM_ALL \
(PERF_SAMPLE_BRANCH_USER|\
PERF_SAMPLE_BRANCH_KERNEL|\
@@ -1372,7 +1385,8 @@ struct perf_branch_entry {
abort:1, /* transaction abort */
cycles:16, /* cycle count to last branch */
type:4, /* branch type */
- reserved:40;
+ new_type:4, /* additional branch type */
+ reserved:36;
};
union perf_sample_weight {
diff --git a/tools/perf/util/branch.c b/tools/perf/util/branch.c
index abc673347bee..4bd52de0527c 100644
--- a/tools/perf/util/branch.c
+++ b/tools/perf/util/branch.c
@@ -53,7 +53,8 @@ const char *branch_type_name(int type)
"ERET",
"IRQ",
"SERROR",
- "NO_TX"
+ "NO_TX",
+ "EXTEND_ABI"
};
if (type >= 0 && type < PERF_BR_MAX)
diff --git a/tools/perf/util/branch.h b/tools/perf/util/branch.h
index 17b2ccc61094..37b6ed546c46 100644
--- a/tools/perf/util/branch.h
+++ b/tools/perf/util/branch.h
@@ -24,7 +24,8 @@ struct branch_flags {
u64 abort:1;
u64 cycles:16;
u64 type:4;
- u64 reserved:40;
+ u64 new_type:4;
+ u64 reserved:36;
};
};
};
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH V4 09/10] perf/tools: Add branch privilege information request flag
2022-03-15 5:35 [PATCH V4 00/10] perf: Expand perf_branch_entry Anshuman Khandual
` (7 preceding siblings ...)
2022-03-15 5:35 ` [PATCH V4 08/10] perf/tools: Extend branch type classification Anshuman Khandual
@ 2022-03-15 5:35 ` Anshuman Khandual
2022-03-15 5:35 ` [PATCH V4 10/10] perf/tools: Add PERF_BR_NEW_ARCH_[N] map for BRBE on arm64 platform Anshuman Khandual
9 siblings, 0 replies; 16+ messages in thread
From: Anshuman Khandual @ 2022-03-15 5:35 UTC (permalink / raw)
To: linux-kernel, linux-perf-users, peterz, acme
Cc: Anshuman Khandual, Robin Murphy, Suzuki Poulose, James Clark,
Ingo Molnar, Mark Rutland, Alexander Shishkin, Jiri Olsa,
Namhyung Kim, Thomas Gleixner, Will Deacon, linux-arm-kernel
This updates the perf tools with branch privilege information request flag
i.e PERF_SAMPLE_BRANCH_PRIV_SAVE that has been added earlier in the kernel.
This also updates 'perf record' documentation, branch_modes[], and generic
branch privilege level enumeration as added earlier in the kernel.
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: Thomas Gleixner <tglx@linutronix.de>
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>
---
tools/include/uapi/linux/perf_event.h | 14 +++++++++++++-
tools/perf/Documentation/perf-record.txt | 1 +
tools/perf/util/branch.h | 3 ++-
tools/perf/util/parse-branch-options.c | 1 +
tools/perf/util/perf_event_attr_fprintf.c | 2 +-
5 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h
index d29280adc3c4..193dba2ecdc1 100644
--- a/tools/include/uapi/linux/perf_event.h
+++ b/tools/include/uapi/linux/perf_event.h
@@ -204,6 +204,8 @@ enum perf_branch_sample_type_shift {
PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT = 17, /* save low level index of raw branch records */
+ PERF_SAMPLE_BRANCH_PRIV_SAVE_SHIFT = 18, /* save privilege mode */
+
PERF_SAMPLE_BRANCH_MAX_SHIFT /* non-ABI */
};
@@ -233,6 +235,8 @@ enum perf_branch_sample_type {
PERF_SAMPLE_BRANCH_HW_INDEX = 1U << PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT,
+ PERF_SAMPLE_BRANCH_PRIV_SAVE = 1U << PERF_SAMPLE_BRANCH_PRIV_SAVE_SHIFT,
+
PERF_SAMPLE_BRANCH_MAX = 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT,
};
@@ -271,6 +275,13 @@ enum {
PERF_BR_NEW_MAX,
};
+enum {
+ PERF_BR_PRIV_UNKNOWN = 0,
+ PERF_BR_PRIV_USER = 1,
+ PERF_BR_PRIV_KERNEL = 2,
+ PERF_BR_PRIV_HV = 3,
+};
+
#define PERF_SAMPLE_BRANCH_PLM_ALL \
(PERF_SAMPLE_BRANCH_USER|\
PERF_SAMPLE_BRANCH_KERNEL|\
@@ -1386,7 +1397,8 @@ struct perf_branch_entry {
cycles:16, /* cycle count to last branch */
type:4, /* branch type */
new_type:4, /* additional branch type */
- reserved:36;
+ priv:3, /* privilege level */
+ reserved:33;
};
union perf_sample_weight {
diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt
index 9ccc75935bc5..3e33686977a1 100644
--- a/tools/perf/Documentation/perf-record.txt
+++ b/tools/perf/Documentation/perf-record.txt
@@ -387,6 +387,7 @@ following filters are defined:
- abort_tx: only when the target is a hardware transaction abort
- cond: conditional branches
- save_type: save branch type during sampling in case binary is not available later
+ - priv: save privilege state during sampling in case binary is not available later
+
The option requires at least one branch type among any, any_call, any_ret, ind_call, cond.
diff --git a/tools/perf/util/branch.h b/tools/perf/util/branch.h
index 37b6ed546c46..68453a4e8943 100644
--- a/tools/perf/util/branch.h
+++ b/tools/perf/util/branch.h
@@ -25,7 +25,8 @@ struct branch_flags {
u64 cycles:16;
u64 type:4;
u64 new_type:4;
- u64 reserved:36;
+ u64 priv:3;
+ u64 reserved:33;
};
};
};
diff --git a/tools/perf/util/parse-branch-options.c b/tools/perf/util/parse-branch-options.c
index bb4aa88c50a8..00588b9db474 100644
--- a/tools/perf/util/parse-branch-options.c
+++ b/tools/perf/util/parse-branch-options.c
@@ -32,6 +32,7 @@ static const struct branch_mode branch_modes[] = {
BRANCH_OPT("call", PERF_SAMPLE_BRANCH_CALL),
BRANCH_OPT("save_type", PERF_SAMPLE_BRANCH_TYPE_SAVE),
BRANCH_OPT("stack", PERF_SAMPLE_BRANCH_CALL_STACK),
+ BRANCH_OPT("priv", PERF_SAMPLE_BRANCH_PRIV_SAVE),
BRANCH_END
};
diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c
index 98af3fa4ea35..4b0db27b7199 100644
--- a/tools/perf/util/perf_event_attr_fprintf.c
+++ b/tools/perf/util/perf_event_attr_fprintf.c
@@ -52,7 +52,7 @@ static void __p_branch_sample_type(char *buf, size_t size, u64 value)
bit_name(ABORT_TX), bit_name(IN_TX), bit_name(NO_TX),
bit_name(COND), bit_name(CALL_STACK), bit_name(IND_JUMP),
bit_name(CALL), bit_name(NO_FLAGS), bit_name(NO_CYCLES),
- bit_name(TYPE_SAVE), bit_name(HW_INDEX),
+ bit_name(TYPE_SAVE), bit_name(HW_INDEX), bit_name(PRIV_SAVE),
{ .name = NULL, }
};
#undef bit_name
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH V4 10/10] perf/tools: Add PERF_BR_NEW_ARCH_[N] map for BRBE on arm64 platform
2022-03-15 5:35 [PATCH V4 00/10] perf: Expand perf_branch_entry Anshuman Khandual
` (8 preceding siblings ...)
2022-03-15 5:35 ` [PATCH V4 09/10] perf/tools: Add branch privilege information request flag Anshuman Khandual
@ 2022-03-15 5:35 ` Anshuman Khandual
9 siblings, 0 replies; 16+ messages in thread
From: Anshuman Khandual @ 2022-03-15 5:35 UTC (permalink / raw)
To: linux-kernel, linux-perf-users, peterz, acme
Cc: Anshuman Khandual, Robin Murphy, Suzuki Poulose, James Clark,
Ingo Molnar, Mark Rutland, Alexander Shishkin, Jiri Olsa,
Namhyung Kim, Thomas Gleixner, Will Deacon, linux-arm-kernel
This updates the perf tool with arch specific branch type classification
used for BRBE on arm64 platform as added in the kernel earlier.
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
tools/include/uapi/linux/perf_event.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h
index 193dba2ecdc1..4cf1c8e22cab 100644
--- a/tools/include/uapi/linux/perf_event.h
+++ b/tools/include/uapi/linux/perf_event.h
@@ -282,6 +282,12 @@ enum {
PERF_BR_PRIV_HV = 3,
};
+#define PERF_BR_ARM64_FIQ PERF_BR_NEW_ARCH_1
+#define PERF_BR_ARM64_DEBUG_HALT PERF_BR_NEW_ARCH_2
+#define PERF_BR_ARM64_DEBUG_EXIT PERF_BR_NEW_ARCH_3
+#define PERF_BR_ARM64_DEBUG_INST PERF_BR_NEW_ARCH_4
+#define PERF_BR_ARM64_DEBUG_DATA PERF_BR_NEW_ARCH_5
+
#define PERF_SAMPLE_BRANCH_PLM_ALL \
(PERF_SAMPLE_BRANCH_USER|\
PERF_SAMPLE_BRANCH_KERNEL|\
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 16+ messages in thread