Re: [PATCH 10/11] arm64: entry: fix NMI {user,kernel}->kernel transitions

Will Deacon
2020-11-26T21:02:05Z

On Thu, Nov 26, 2020 at 06:41:59PM +0000, Mark Rutland wrote:
> On Thu, Nov 26, 2020 at 12:36:01PM +0000, Mark Rutland wrote:
> > diff --git a/arch/arm64/include/asm/exception.h b/arch/arm64/include/asm/exception.h
> > index d579b2e6db7a..0756191f44f6 100644
> > --- a/arch/arm64/include/asm/exception.h
> > +++ b/arch/arm64/include/asm/exception.h
>
> > +void arm64_enter_nmi(struct pt_regs *regs);
> > +void arm64_exit_nmi(struct pt_regs *regs);
>
> [...]
>
> > -asmlinkage __kprobes notrace unsigned long
> > +asmlinkage noinstr unsigned long
> > __sdei_handler(struct pt_regs *regs, struct sdei_registered_event *arg)
> > {
> > unsigned long ret;
> >
> > - nmi_enter();
> > + arm64_enter_nmi();
> >
> > ret = _sdei_handler(regs, arg);
> >
> > - nmi_exit();
> > + arm64_exit_nmi();
> >
> > return ret;
> > }
>
> Whoops; I forgot to pass the regs here.
>
> Will, could you please apply the fixup patch below? I've build+boot
> tested with the CKI config atop rc5, and made sure I hadn't done
> likewise in any of the other callers.

Cheers, I've pushed that on top. Let's see how far we get this time...

Will