Messages in this thread | | | Date | Tue, 6 Jun 2023 09:57:08 +0530 | Subject | Re: [PATCH V11 02/10] arm64/perf: Add BRBE registers and fields | From | Anshuman Khandual <> |
| |
On 6/5/23 13:25, Mark Rutland wrote: > Hi ANshuman,
Hello Mark,
> > This looks good to me, with some minor nits on enum value naming and field > formatting.
Okay
> > On Wed, May 31, 2023 at 09:34:20AM +0530, Anshuman Khandual wrote: >> This adds BRBE related register definitions and various other related field >> macros there in. These will be used subsequently in a BRBE driver which is >> being added later on. >> >> Cc: Catalin Marinas <catalin.marinas@arm.com> >> Cc: Will Deacon <will@kernel.org> >> Cc: Marc Zyngier <maz@kernel.org> >> Cc: Mark Rutland <mark.rutland@arm.com> >> Cc: linux-arm-kernel@lists.infradead.org >> Cc: linux-kernel@vger.kernel.org >> Tested-by: James Clark <james.clark@arm.com> >> Reviewed-by: Mark Brown <broonie@kernel.org> >> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> >> --- >> arch/arm64/include/asm/sysreg.h | 103 +++++++++++++++++++++ >> arch/arm64/tools/sysreg | 159 ++++++++++++++++++++++++++++++++ >> 2 files changed, 262 insertions(+) >> >> diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h >> index e72d9aaab6b1..12419c55d3b7 100644 >> --- a/arch/arm64/include/asm/sysreg.h >> +++ b/arch/arm64/include/asm/sysreg.h >> @@ -165,6 +165,109 @@ >> #define SYS_DBGDTRTX_EL0 sys_reg(2, 3, 0, 5, 0) >> #define SYS_DBGVCR32_EL2 sys_reg(2, 4, 0, 7, 0) >> >> +#define __SYS_BRBINFO(n) sys_reg(2, 1, 8, ((n) & 0xf), ((((n) & 0x10)) >> 2 + 0)) >> +#define __SYS_BRBSRC(n) sys_reg(2, 1, 8, ((n) & 0xf), ((((n) & 0x10)) >> 2 + 1)) >> +#define __SYS_BRBTGT(n) sys_reg(2, 1, 8, ((n) & 0xf), ((((n) & 0x10)) >> 2 + 2)) > > These look correct to me per ARM DDI 0487J.a > >> diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg >> index c9a0d1fa3209..44745f42262f 100644 >> --- a/arch/arm64/tools/sysreg >> +++ b/arch/arm64/tools/sysreg >> @@ -947,6 +947,165 @@ UnsignedEnum 3:0 BT >> EndEnum >> EndSysreg >> >> + >> +SysregFields BRBINFx_EL1 >> +Res0 63:47 >> +Field 46 CCU >> +Field 45:32 CC >> +Res0 31:18 >> +Field 17 LASTFAILED >> +Field 16 T >> +Res0 15:14 >> +Enum 13:8 TYPE >> + 0b000000 UNCOND_DIR >> + 0b000001 INDIR >> + 0b000010 DIR_LINK >> + 0b000011 INDIR_LINK > > For clarity, I'd prefer that we use "DIRECT" and "INDIRECT" in full for each of > these, i.e. > > 0b000000 UNCOND_DIRECT > 0b000001 INDIRECT > 0b000010 DIRECT_LINK > 0b000011 INDIRECT_LINK
Okay, will change these as required.
> >> + 0b000101 RET_SUB >> + 0b000111 RET_EXCPT > > Similarly, I'm not keen on the suffixes here. > > I think these would be clearer as "RET" and "ERET", as those are short and > unambiguous, and I think the alternative of spelling out "RET_SUBROUTINE" and > "RET_EXCEPTION" is overly verbose.
Sure, will change as RET and ERET.
> >> + 0b001000 COND_DIR > > As with above, I'd prefer "COND_DIRECT" here.
Okay, will change this as required.
> >> + 0b100001 DEBUG_HALT >> + 0b100010 CALL >> + 0b100011 TRAP >> + 0b100100 SERROR >> + 0b100110 INST_DEBUG > > We generally use 'insn' rather than 'inst', so I'd prefer s/INST/INSN/ here. > >> + 0b100111 DATA_DEBUG >> + 0b101010 ALGN_FAULT > > s/ALGN/ALIGN/ > >> + 0b101011 INST_FAULT > > As above, I'd prefer "INSN_FAULT" here, though I'm confused that the > architecture doesn't use "abort" naming for this.
Sure, will change as required but please note that INST/ALGN suffixes have also been used to define the generic ABI. Although it should not be a problem as such.
include/uapi/linux/perf_event.h
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, };
> >> + 0b101100 DATA_FAULT >> + 0b101110 IRQ >> + 0b101111 FIQ >> + 0b111001 DEBUG_EXIT >> +EndEnum > > [...] > > +Sysreg BRBCR_EL1 2 1 9 0 0 >> +Res0 63:24 >> +Field 23 EXCEPTION >> +Field 22 ERTN >> +Res0 21:9 >> +Field 8 FZP >> +Res0 7 >> +Enum 6:5 TS >> + 0b01 VIRTUAL >> + 0b10 GST_PHYSICAL > > s/GST/GUEST/
Okay
> >> + 0b11 PHYSICAL >> +EndEnum >> +Field 4 MPRED >> +Field 3 CC >> +Res0 2 >> +Field 1 E1BRE >> +Field 0 E0BRE >> +EndSysreg > > [...] > >> +Sysreg BRBINFINJ_EL1 2 1 9 1 0 >> +Res0 63:47 >> +Field 46 CCU >> +Field 45:32 CC >> +Res0 31:18 >> +Field 17 LASTFAILED >> +Field 16 T >> +Res0 15:14 >> +Enum 13:8 TYPE >> + 0b000000 UNCOND_DIR >> + 0b000001 INDIR >> + 0b000010 DIR_LINK >> + 0b000011 INDIR_LINK >> + 0b000100 RET_SUB >> + 0b000100 RET_SUB >> + 0b000111 RET_EXCPT >> + 0b001000 COND_DIR >> + 0b100001 DEBUG_HALT >> + 0b100010 CALL >> + 0b100011 TRAP >> + 0b100100 SERROR >> + 0b100110 INST_DEBUG >> + 0b100111 DATA_DEBUG >> + 0b101010 ALGN_FAULT >> + 0b101011 INST_FAULT >> + 0b101100 DATA_FAULT >> + 0b101110 IRQ >> + 0b101111 FIQ >> + 0b111001 DEBUG_EXIT >> +EndEnum > > Same comments as for BRBINFx_EL1.TYPE
Done.
> >> +Enum 7:0 NUMREC >> + 0b1000 8 >> + 0b10000 16 >> + 0b100000 32 >> + 0b1000000 64 > > Could we please pad these to the same width, i.e. have > > 0b0001000 8 > 0b0010000 16 > 0b0100000 32 > 0b1000000 64 > > That way it's much easier to see how these compare to one another, and it > matches the usual style.
Sure, will add the padding.
> > Otherwise, I see the ARM ARM lists these in hex, and using that would also be > fine, e.g. > > 0x08 8 > 0x10 16 > 0x20 32 > 0x40 64 > >> +EndEnum >> +EndSysreg > > Thanks, > Mark.
| |