Re: [PATCH v3 14/16] powerpc/32: implement fast entry for syscalls on BOOKE

[Christophe Leroy]

Le 23/05/2019 Ã 09:00, Christophe Leroy a ÃcritÂ:

[...]


> > arch/powerpc/kernel/head_fsl_booke.o: In function `SystemCall':
> > arch/powerpc/kernel/head_fsl_booke.S:416: undefined reference to 
> > `kvmppc_handler_BOOKE_INTERRUPT_SYSCALL_SPRN_SRR1'
> > Makefile:1052: recipe for target 'vmlinux' failed
> >
> > > +.macro SYSCALL_ENTRY trapno intno
> > > +ÂÂÂ mfsprÂÂÂ r10, SPRN_SPRG_THREAD
> > > +#ifdef CONFIG_KVM_BOOKE_HV
> > > +BEGIN_FTR_SECTION
> > > +ÂÂÂ mtsprÂÂÂ SPRN_SPRG_WSCRATCH0, r10
> > > +ÂÂÂ stwÂÂÂ r11, THREAD_NORMSAVE(0)(r10)
> > > +ÂÂÂ stwÂÂÂ r13, THREAD_NORMSAVE(2)(r10)
> > > +ÂÂÂ mfcrÂÂÂ r13ÂÂÂÂÂÂÂÂÂÂÂ /* save CR in r13 for nowÂÂÂÂÂÂ */
> > > +ÂÂÂ mfsprÂÂÂ r11, SPRN_SRR1
> > > +ÂÂÂ mtocrfÂÂÂ 0x80, r11ÂÂÂ /* check MSR[GS] without clobbering reg */
> > > +ÂÂÂ bfÂÂÂ 3, 1975f
> > > +ÂÂÂ bÂÂÂ kvmppc_handler_BOOKE_INTERRUPT_\intno\()_SPRN_SRR1
> >
> > It seems to me that the "_SPRN_SRR1" on the end of this line
> > isn't meant to be there... However, it still fails to link with that
> > removed.

It looks like I missed the macro expansion.

The called function should be kvmppc_handler_8_0x01B

Seems like kisskb doesn't build any config like this.

Christophe

> This SYSCALL_ENTRY macro is a slimmed version of NORMAL_EXCEPTION_PROLOG()
>
> In NORMAL_EXCEPTION_PROLOG(), we have:
>  ÂÂÂÂDO_KVMÂÂÂ BOOKE_INTERRUPT_##intno SPRN_SRR1;
>
> The _SPRN_SRR1 comes from there
>
>
> Then in /arch/powerpc/include/asm/kvm_booke_hv_asm.h:
>
> .macro DO_KVM intno srr1
> #ifdef CONFIG_KVM_BOOKE_HV
> BEGIN_FTR_SECTION
>  ÂÂÂÂmtocrfÂÂÂ 0x80, r11ÂÂÂ /* check MSR[GS] without clobbering reg */
>  ÂÂÂÂbfÂÂÂ 3, 1975f
>  ÂÂÂÂbÂÂÂ kvmppc_handler_\intno\()_\srr1
> 1975:
> END_FTR_SECTION_IFSET(CPU_FTR_EMB_HV)
> #endif
> .endm
>
>
> Christophe