lkml.org 
[lkml]   [2019]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 8/8] arm64: BTI: Decode BYTPE bits when printing PSTATE
    Date
    The current code to print PSTATE symbolically when generating
    backtraces etc., does not include the BYTPE field used by Branch
    Target Identification.

    So, decode BYTPE and print it too.

    In the interests of human-readability, print the classes of BTI
    matched. The symbolic motation, BYTPE (PSTATE[11:10]) and
    permitted classes of subsequent instruction are:

    -- (BTYPE=0b00): any insn
    jc (BTYPE=0b01): BTI jc, BTI j, BTI c, PACIxSP
    -c (BYTPE=0b10): BTI jc, BTI c, PACIxSP
    j- (BTYPE=0b11): BTI jc, BTI j

    Signed-off-by: Dave Martin <Dave.Martin@arm.com>
    ---
    arch/arm64/include/asm/ptrace.h | 4 +++-
    arch/arm64/kernel/process.c | 9 +++++++--
    2 files changed, 10 insertions(+), 3 deletions(-)

    diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h
    index b868ef11..f91e51c 100644
    --- a/arch/arm64/include/asm/ptrace.h
    +++ b/arch/arm64/include/asm/ptrace.h
    @@ -40,8 +40,10 @@
    #define GIC_PRIO_IRQOFF (GIC_PRIO_IRQON & ~0x80)

    /* Additional SPSR bits not exposed in the UABI */
    +#define PSR_BTYPE_SHIFT 10
    +
    #define PSR_IL_BIT (1 << 20)
    -#define PSR_BTYPE_CALL (2 << 10)
    +#define PSR_BTYPE_CALL (2 << PSR_BTYPE_SHIFT)

    /* AArch32-specific ptrace requests */
    #define COMPAT_PTRACE_GETREGS 12
    diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
    index 104b0d8..dde5c40 100644
    --- a/arch/arm64/kernel/process.c
    +++ b/arch/arm64/kernel/process.c
    @@ -236,7 +236,11 @@ static void print_pstate(struct pt_regs *regs)
    pstate & PSR_AA32_I_BIT ? 'I' : 'i',
    pstate & PSR_AA32_F_BIT ? 'F' : 'f');
    } else {
    - printk("pstate: %08llx (%c%c%c%c %c%c%c%c %cPAN %cUAO)\n",
    + static const char *const btypes[] = { "--", "jc", "-c", "j-" };
    + const char *btype_str = btypes[(pstate & PSR_BTYPE_MASK) >>
    + PSR_BTYPE_SHIFT];
    +
    + printk("pstate: %08llx (%c%c%c%c %c%c%c%c %cPAN %cUAO BTYPE=%s)\n",
    pstate,
    pstate & PSR_N_BIT ? 'N' : 'n',
    pstate & PSR_Z_BIT ? 'Z' : 'z',
    @@ -247,7 +251,8 @@ static void print_pstate(struct pt_regs *regs)
    pstate & PSR_I_BIT ? 'I' : 'i',
    pstate & PSR_F_BIT ? 'F' : 'f',
    pstate & PSR_PAN_BIT ? '+' : '-',
    - pstate & PSR_UAO_BIT ? '+' : '-');
    + pstate & PSR_UAO_BIT ? '+' : '-',
    + btype_str);
    }
    }

    --
    2.1.4
    \
     
     \ /
      Last update: 2019-05-24 12:27    [W:4.180 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site