| Message ID | 20200514111741.97993-1-ravi.bangoria@linux.ibm.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | powerpc/watchpoint: Preparation for more than one watchpoint | expand |
On Thu, 14 May 2020 16:47:25 +0530, Ravi Bangoria wrote: > So far, powerpc Book3S code has been written with an assumption of > only one watchpoint. But Power10[1] is introducing second watchpoint > register (DAWR). Even though this patchset does not enable 2nd DAWR, > it makes the infrastructure ready so that enabling 2nd DAWR should > just be a matter of changing count. > > Existing functionality works fine with the patchset. I've tested it > with perf, ptrace(gdb), xmon. All hw-breakpoint selftests are passing > as well. And I've build tested for 8xx and 'AMCC 44x, 46x or 47x'. > > [...] Applied to powerpc/next. [01/16] powerpc/watchpoint: Rename current DAWR macros https://git.kernel.org/powerpc/c/09f82b063aa9c248a3ef919aeec361054e7b044a [02/16] powerpc/watchpoint: Add SPRN macros for second DAWR https://git.kernel.org/powerpc/c/4a4ec2289a5d748cb64ff67ca8d74535a76a8436 [03/16] powerpc/watchpoint: Introduce function to get nr watchpoints dynamically https://git.kernel.org/powerpc/c/a6ba44e8799230e36c8ab06fda7f77f421e9e795 [04/16] powerpc/watchpoint/ptrace: Return actual num of available watchpoints https://git.kernel.org/powerpc/c/45093b382e0ac25c206b4dcd210c6be1f5e56e60 [05/16] powerpc/watchpoint: Provide DAWR number to set_dawr https://git.kernel.org/powerpc/c/a18b834625d345bfa89c4e2754dd6cbb0133c4d7 [06/16] powerpc/watchpoint: Provide DAWR number to __set_breakpoint https://git.kernel.org/powerpc/c/4a8a9379f2af4c9928529b3959bc2d8f7023c6bc [07/16] powerpc/watchpoint: Get watchpoint count dynamically while disabling them https://git.kernel.org/powerpc/c/c2919132734f29a7a33e1339bef8a67b11f322eb [08/16] powerpc/watchpoint: Disable all available watchpoints when !dawr_force_enable https://git.kernel.org/powerpc/c/22a214e461c5cc9428b86915d9cfcf84c6e11ad7 [09/16] powerpc/watchpoint: Convert thread_struct->hw_brk to an array https://git.kernel.org/powerpc/c/303e6a9ddcdc168e92253c78cdb4bbe1e10d78b3 [10/16] powerpc/watchpoint: Use loop for thread_struct->ptrace_bps https://git.kernel.org/powerpc/c/6b424efa119d5ea06b15ff240dddc3b4b9f9cdfb [11/16] powerpc/watchpoint: Introduce is_ptrace_bp() function https://git.kernel.org/powerpc/c/c9e82aeb197df2d93b1b4234bc0c80943fa594e8 [12/16] powerpc/watchpoint: Use builtin ALIGN*() macros https://git.kernel.org/powerpc/c/e68ef121c1f4c38edf87a3354661ceb99d522729 [13/16] powerpc/watchpoint: Prepare handler to handle more than one watchpoint https://git.kernel.org/powerpc/c/74c6881019b7d56c327fffc268d97adb5eb1b4f9 [14/16] powerpc/watchpoint: Don't allow concurrent perf and ptrace events https://git.kernel.org/powerpc/c/29da4f91c0c1fbda12b8a31be0d564930208c92e [15/16] powerpc/watchpoint/xmon: Don't allow breakpoint overwriting https://git.kernel.org/powerpc/c/514db915e7b33e7eaf8e40192b93380f79b319b5 [16/16] powerpc/watchpoint/xmon: Support 2nd DAWR https://git.kernel.org/powerpc/c/30df74d67d48949da87e3a5b57c381763e8fd526 cheers
So far, powerpc Book3S code has been written with an assumption of only one watchpoint. But Power10[1] is introducing second watchpoint register (DAWR). Even though this patchset does not enable 2nd DAWR, it makes the infrastructure ready so that enabling 2nd DAWR should just be a matter of changing count. Existing functionality works fine with the patchset. I've tested it with perf, ptrace(gdb), xmon. All hw-breakpoint selftests are passing as well. And I've build tested for 8xx and 'AMCC 44x, 46x or 47x'. Note: kvm or PowerVM guest is not enabled yet. v5: https://lore.kernel.org/linuxppc-dev/20200511025911.212827-1-ravi.bangoria@linux.ibm.com v5->v6: - Rebased to powerpc/next-test which has prefix-instruction support - Adopt 'struct ppc_inst' in hw-breakpoint code as well [1]: https://www-355.ibm.com/systems/power/openpower/ Ravi Bangoria (16): powerpc/watchpoint: Rename current DAWR macros powerpc/watchpoint: Add SPRN macros for second DAWR powerpc/watchpoint: Introduce function to get nr watchpoints dynamically powerpc/watchpoint/ptrace: Return actual num of available watchpoints powerpc/watchpoint: Provide DAWR number to set_dawr powerpc/watchpoint: Provide DAWR number to __set_breakpoint powerpc/watchpoint: Get watchpoint count dynamically while disabling them powerpc/watchpoint: Disable all available watchpoints when !dawr_force_enable powerpc/watchpoint: Convert thread_struct->hw_brk to an array powerpc/watchpoint: Use loop for thread_struct->ptrace_bps powerpc/watchpoint: Introduce is_ptrace_bp() function powerpc/watchpoint: Use builtin ALIGN*() macros powerpc/watchpoint: Prepare handler to handle more than one watcnhpoint powerpc/watchpoint: Don't allow concurrent perf and ptrace events powerpc/watchpoint/xmon: Don't allow breakpoint overwriting powerpc/watchpoint/xmon: Support 2nd DAWR arch/powerpc/include/asm/cputable.h | 6 +- arch/powerpc/include/asm/debug.h | 2 +- arch/powerpc/include/asm/hw_breakpoint.h | 32 +- arch/powerpc/include/asm/processor.h | 6 +- arch/powerpc/include/asm/reg.h | 6 +- arch/powerpc/include/asm/sstep.h | 2 + arch/powerpc/kernel/dawr.c | 23 +- arch/powerpc/kernel/hw_breakpoint.c | 642 ++++++++++++++++++---- arch/powerpc/kernel/process.c | 85 +-- arch/powerpc/kernel/ptrace/ptrace-noadv.c | 72 ++- arch/powerpc/kernel/ptrace/ptrace32.c | 4 +- arch/powerpc/kernel/signal.c | 13 +- arch/powerpc/kvm/book3s_hv.c | 12 +- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 18 +- arch/powerpc/xmon/xmon.c | 99 +++- kernel/events/hw_breakpoint.c | 16 + 16 files changed, 811 insertions(+), 227 deletions(-)