Hi,
On Mon, May 11, 2020 at 7:59 AM Will Deacon <will@xxxxxxxxxx> wrote:
>
> Hi Doug,
>
> On Tue, Apr 28, 2020 at 02:13:45PM -0700, Douglas Anderson wrote:
> > diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c
> > index 48222a4760c2..59c353dfc8e9 100644
> > --- a/arch/arm64/kernel/debug-monitors.c
> > +++ b/arch/arm64/kernel/debug-monitors.c
> > @@ -297,7 +297,7 @@ void unregister_kernel_break_hook(struct break_hook *hook)
> > unregister_debug_hook(&hook->node);
> > }
> >
> > -static int call_break_hook(struct pt_regs *regs, unsigned int esr)
> > +int call_break_hook(struct pt_regs *regs, unsigned int esr)
> > {
> > struct break_hook *hook;
> > struct list_head *list;
> > diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
> > index cf402be5c573..a8173f0c1774 100644
> > --- a/arch/arm64/kernel/traps.c
> > +++ b/arch/arm64/kernel/traps.c
> > @@ -1044,6 +1044,9 @@ int __init early_brk64(unsigned long addr, unsigned int esr,
> > if ((comment & ~KASAN_BRK_MASK) == KASAN_BRK_IMM)
> > return kasan_handler(regs, esr) != DBG_HOOK_HANDLED;
> > #endif
> > + if (call_break_hook(regs, esr) == DBG_HOOK_HANDLED)
> > + return 0;
>
> I think this just means we're not running debug_traps_init() early enough,
> and actually the KASAN early handler is unnecessary too.
>
> If we call debug_traps_init() directly from setup_arch() and drop the
> arch_initcall(), can we then drop early_brk64 entirely?
It seems to work in my testing. ...but the worry I have is the
comment right before trap_init(). It says:
/* This registration must happen early, before debug_traps_init(). */
By moving debug_traps_init() early we're violating that comment. Do I
just remove that comment, or was there a good reason for it? ...or am
I reading it wrong and I should have read it as if it said:
/* NOTE: this registration happens early, before debug_traps_init(). */
...then removing it is fine. Maybe that's right?
I coded this up and put it on the Chrome OS gerrit at
<https://crrev.com/c/2195061>. I'm happy to post this on the list as
a loner patch to replace this one or spin the whole series depending
on what people want.
-Doug
