lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 442/757] powerpc/watchpoint: Add hw_len wherever missing
    Date
    From: Ravi Bangoria <ravi.bangoria@linux.ibm.com>

    [ Upstream commit 58da5984d2ea6d95f3f9d9e8dd9f7e1b0dddfb3c ]

    There are couple of places where we set len but not hw_len. For
    ptrace/perf watchpoints, when CONFIG_HAVE_HW_BREAKPOINT=Y, hw_len
    will be calculated and set internally while parsing watchpoint.
    But when CONFIG_HAVE_HW_BREAKPOINT=N, we need to manually set
    'hw_len'. Similarly for xmon as well, hw_len needs to be set
    directly.

    Fixes: b57aeab811db ("powerpc/watchpoint: Fix length calculation for unaligned target")
    Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/20200902042945.129369-7-ravi.bangoria@linux.ibm.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/kernel/ptrace/ptrace-noadv.c | 1 +
    arch/powerpc/xmon/xmon.c | 1 +
    2 files changed, 2 insertions(+)

    diff --git a/arch/powerpc/kernel/ptrace/ptrace-noadv.c b/arch/powerpc/kernel/ptrace/ptrace-noadv.c
    index 697c7e4b5877f..8bd8d8de5c40b 100644
    --- a/arch/powerpc/kernel/ptrace/ptrace-noadv.c
    +++ b/arch/powerpc/kernel/ptrace/ptrace-noadv.c
    @@ -219,6 +219,7 @@ long ppc_set_hwdebug(struct task_struct *child, struct ppc_hw_breakpoint *bp_inf
    brk.address = ALIGN_DOWN(bp_info->addr, HW_BREAKPOINT_SIZE);
    brk.type = HW_BRK_TYPE_TRANSLATE;
    brk.len = DABR_MAX_LEN;
    + brk.hw_len = DABR_MAX_LEN;
    if (bp_info->trigger_type & PPC_BREAKPOINT_TRIGGER_READ)
    brk.type |= HW_BRK_TYPE_READ;
    if (bp_info->trigger_type & PPC_BREAKPOINT_TRIGGER_WRITE)
    diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
    index df7bca00f5ec9..55c43a6c91112 100644
    --- a/arch/powerpc/xmon/xmon.c
    +++ b/arch/powerpc/xmon/xmon.c
    @@ -969,6 +969,7 @@ static void insert_cpu_bpts(void)
    brk.address = dabr[i].address;
    brk.type = (dabr[i].enabled & HW_BRK_TYPE_DABR) | HW_BRK_TYPE_PRIV_ALL;
    brk.len = 8;
    + brk.hw_len = 8;
    __set_breakpoint(i, &brk);
    }
    }
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:22    [W:2.172 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site