On Fri, 12 Sep 2025 18:11:11 +0800
Jinchao Wang <wangjinchao...@gmail.com> wrote:
> Consolidate breakpoint management to reduce code duplication.
> The diffstat was misleading, so the stripped code size is compared instead.
> After refactoring, it is reduced from 11976 bytes to 11448 bytes on my
> x86_64 system built with clang.
>
> This also makes it easier to introduce arch_reinstall_hw_breakpoint().
>
> In addition, including linux/types.h to fix a missing build dependency.
>
Looks good to me.
Reviewed-by: Masami Hiramatsu (Google) <mhira...@kernel.org>
Thanks,
> Signed-off-by: Jinchao Wang <wangjinchao...@gmail.com>
> ---
> arch/x86/include/asm/hw_breakpoint.h | 6 ++
> arch/x86/kernel/hw_breakpoint.c | 141 +++++++++++++++------------
> 2 files changed, 84 insertions(+), 63 deletions(-)
>
> diff --git a/arch/x86/include/asm/hw_breakpoint.h
> b/arch/x86/include/asm/hw_breakpoint.h
> index 0bc931cd0698..aa6adac6c3a2 100644
> --- a/arch/x86/include/asm/hw_breakpoint.h
> +++ b/arch/x86/include/asm/hw_breakpoint.h
> @@ -5,6 +5,7 @@
> #include <uapi/asm/hw_breakpoint.h>
>
> #define __ARCH_HW_BREAKPOINT_H
> +#include <linux/types.h>
>
> /*
> * The name should probably be something dealt in
> @@ -18,6 +19,11 @@ struct arch_hw_breakpoint {
> u8 type;
> };
>
> +enum bp_slot_action {
> + BP_SLOT_ACTION_INSTALL,
> + BP_SLOT_ACTION_UNINSTALL,
> +};
> +
> #include <linux/kdebug.h>
> #include <linux/percpu.h>
> #include <linux/list.h>
> diff --git a/arch/x86/kernel/hw_breakpoint.c b/arch/x86/kernel/hw_breakpoint.c
> index b01644c949b2..3658ace4bd8d 100644
> --- a/arch/x86/kernel/hw_breakpoint.c
> +++ b/arch/x86/kernel/hw_breakpoint.c
> @@ -48,7 +48,6 @@ static DEFINE_PER_CPU(unsigned long, cpu_debugreg[HBP_NUM]);
> */
> static DEFINE_PER_CPU(struct perf_event *, bp_per_reg[HBP_NUM]);
>
> -
> static inline unsigned long
> __encode_dr7(int drnum, unsigned int len, unsigned int type)
> {
> @@ -85,96 +84,112 @@ int decode_dr7(unsigned long dr7, int bpnum, unsigned
> *len, unsigned *type)
> }
>
> /*
> - * Install a perf counter breakpoint.
> - *
> - * We seek a free debug address register and use it for this
> - * breakpoint. Eventually we enable it in the debug control register.
> - *
> - * Atomic: we hold the counter->ctx->lock and we only handle variables
> - * and registers local to this cpu.
> + * We seek a slot and change it or keep it based on the action.
> + * Returns slot number on success, negative error on failure.
> + * Must be called with IRQs disabled.
> */
> -int arch_install_hw_breakpoint(struct perf_event *bp)
> +static int manage_bp_slot(struct perf_event *bp, enum bp_slot_action action)
> {
> - struct arch_hw_breakpoint *info = counter_arch_bp(bp);
> - unsigned long *dr7;
> - int i;
> -
> - lockdep_assert_irqs_disabled();
> + struct perf_event *old_bp;
> + struct perf_event *new_bp;
> + int slot;
> +
> + switch (action) {
> + case BP_SLOT_ACTION_INSTALL:
> + old_bp = NULL;
> + new_bp = bp;
> + break;
> + case BP_SLOT_ACTION_UNINSTALL:
> + old_bp = bp;
> + new_bp = NULL;
> + break;
> + default:
> + return -EINVAL;
> + }
>
> - for (i = 0; i < HBP_NUM; i++) {
> - struct perf_event **slot = this_cpu_ptr(&bp_per_reg[i]);
> + for (slot = 0; slot < HBP_NUM; slot++) {
> + struct perf_event **curr = this_cpu_ptr(&bp_per_reg[slot]);
>
> - if (!*slot) {
> - *slot = bp;
> - break;
> + if (*curr == old_bp) {
> + *curr = new_bp;
> + return slot;
> }
> }
>
> - if (WARN_ONCE(i == HBP_NUM, "Can't find any breakpoint slot"))
> - return -EBUSY;
> + if (old_bp) {
> + WARN_ONCE(1, "Can't find matching breakpoint slot");
> + return -EINVAL;
> + }
> +
> + WARN_ONCE(1, "No free breakpoint slots");
> + return -EBUSY;
> +}
> +
> +static void setup_hwbp(struct arch_hw_breakpoint *info, int slot, bool
> enable)
> +{
> + unsigned long dr7;
>
> - set_debugreg(info->address, i);
> - __this_cpu_write(cpu_debugreg[i], info->address);
> + set_debugreg(info->address, slot);
> + __this_cpu_write(cpu_debugreg[slot], info->address);
>
> - dr7 = this_cpu_ptr(&cpu_dr7);
> - *dr7 |= encode_dr7(i, info->len, info->type);
> + dr7 = this_cpu_read(cpu_dr7);
> + if (enable)
> + dr7 |= encode_dr7(slot, info->len, info->type);
> + else
> + dr7 &= ~__encode_dr7(slot, info->len, info->type);
>
> /*
> - * Ensure we first write cpu_dr7 before we set the DR7 register.
> - * This ensures an NMI never see cpu_dr7 0 when DR7 is not.
> + * Enabling:
> + * Ensure we first write cpu_dr7 before we set the DR7 register.
> + * This ensures an NMI never see cpu_dr7 0 when DR7 is not.
> */
> + if (enable)
> + this_cpu_write(cpu_dr7, dr7);
> +
> barrier();
>
> - set_debugreg(*dr7, 7);
> + set_debugreg(dr7, 7);
> +
> if (info->mask)
> - amd_set_dr_addr_mask(info->mask, i);
> + amd_set_dr_addr_mask(enable ? info->mask : 0, slot);
>
> - return 0;
> + /*
> + * Disabling:
> + * Ensure the write to cpu_dr7 is after we've set the DR7 register.
> + * This ensures an NMI never see cpu_dr7 0 when DR7 is not.
> + */
> + if (!enable)
> + this_cpu_write(cpu_dr7, dr7);
> }
>
> /*
> - * Uninstall the breakpoint contained in the given counter.
> - *
> - * First we search the debug address register it uses and then we disable
> - * it.
> - *
> - * Atomic: we hold the counter->ctx->lock and we only handle variables
> - * and registers local to this cpu.
> + * find suitable breakpoint slot and set it up based on the action
> */
> -void arch_uninstall_hw_breakpoint(struct perf_event *bp)
> +static int arch_manage_bp(struct perf_event *bp, enum bp_slot_action action)
> {
> - struct arch_hw_breakpoint *info = counter_arch_bp(bp);
> - unsigned long dr7;
> - int i;
> + struct arch_hw_breakpoint *info;
> + int slot;
>
> lockdep_assert_irqs_disabled();
>
> - for (i = 0; i < HBP_NUM; i++) {
> - struct perf_event **slot = this_cpu_ptr(&bp_per_reg[i]);
> -
> - if (*slot == bp) {
> - *slot = NULL;
> - break;
> - }
> - }
> -
> - if (WARN_ONCE(i == HBP_NUM, "Can't find any breakpoint slot"))
> - return;
> + slot = manage_bp_slot(bp, action);
> + if (slot < 0)
> + return slot;
>
> - dr7 = this_cpu_read(cpu_dr7);
> - dr7 &= ~__encode_dr7(i, info->len, info->type);
> + info = counter_arch_bp(bp);
> + setup_hwbp(info, slot, action != BP_SLOT_ACTION_UNINSTALL);
>
> - set_debugreg(dr7, 7);
> - if (info->mask)
> - amd_set_dr_addr_mask(0, i);
> + return 0;
> +}
>
> - /*
> - * Ensure the write to cpu_dr7 is after we've set the DR7 register.
> - * This ensures an NMI never see cpu_dr7 0 when DR7 is not.
> - */
> - barrier();
> +int arch_install_hw_breakpoint(struct perf_event *bp)
> +{
> + return arch_manage_bp(bp, BP_SLOT_ACTION_INSTALL);
> +}
>
> - this_cpu_write(cpu_dr7, dr7);
> +void arch_uninstall_hw_breakpoint(struct perf_event *bp)
> +{
> + arch_manage_bp(bp, BP_SLOT_ACTION_UNINSTALL);
> }
>
> static int arch_bp_generic_len(int x86_len)
> --
> 2.43.0
>
>
--
Masami Hiramatsu (Google) <mhira...@kernel.org>
