Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc/watchpoint: Add hw_len wherever missing

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

authored by

Ravi Bangoria and committed by
Michael Ellerman
58da5984 5b905d77

+2
+1
arch/powerpc/kernel/ptrace/ptrace-noadv.c
··· 219 219 brk.address = ALIGN_DOWN(bp_info->addr, HW_BREAKPOINT_SIZE); 220 220 brk.type = HW_BRK_TYPE_TRANSLATE | HW_BRK_TYPE_PRIV_ALL; 221 221 brk.len = DABR_MAX_LEN; 222 + brk.hw_len = DABR_MAX_LEN; 222 223 if (bp_info->trigger_type & PPC_BREAKPOINT_TRIGGER_READ) 223 224 brk.type |= HW_BRK_TYPE_READ; 224 225 if (bp_info->trigger_type & PPC_BREAKPOINT_TRIGGER_WRITE)
+1
arch/powerpc/xmon/xmon.c
··· 969 969 brk.address = dabr[i].address; 970 970 brk.type = (dabr[i].enabled & HW_BRK_TYPE_DABR) | HW_BRK_TYPE_PRIV_ALL; 971 971 brk.len = 8; 972 + brk.hw_len = 8; 972 973 __set_breakpoint(i, &brk); 973 974 } 974 975 }