* [PATCH v3 03/21] powerpc/8xx: exception InstructionAccess does not exist on MPC8xx @ 2014-09-17 16:36 Christophe Leroy 2014-09-18 15:15 ` Joakim Tjernlund 0 siblings, 1 reply; 9+ messages in thread From: Christophe Leroy @ 2014-09-17 16:36 UTC (permalink / raw) To: Benjamin Herrenschmidt, Paul Mackerras Cc: scottwood, linuxppc-dev, linux-kernel Exception InstructionAccess does not exist on MPC8xx. No need to branch there from somewhere else. Handling can be done directly in InstructionTLBError Exception. Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- Changes in v2: - None Changes in v3: - arch/powerpc/mm/fault.c uses the vector number, so make sure it understand the new ones. arch/powerpc/kernel/head_8xx.S | 17 +++++++---------- arch/powerpc/mm/fault.c | 1 + 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S index 3af6db1..fbe5d10 100644 --- a/arch/powerpc/kernel/head_8xx.S +++ b/arch/powerpc/kernel/head_8xx.S @@ -234,15 +234,9 @@ DataAccess: EXC_XFER_LITE(0x300, handle_page_fault) /* Instruction access exception. - * This is "never generated" by the MPC8xx. We jump to it for other - * translation errors. + * This is "never generated" by the MPC8xx. */ - . = 0x400 -InstructionAccess: - EXCEPTION_PROLOG - mr r4,r12 - mr r5,r9 - EXC_XFER_LITE(0x400, handle_page_fault) + EXCEPTION(0x400, InstructionAccess, unknown_exception, EXC_XFER_STD) /* External interrupt */ EXCEPTION(0x500, HardwareInterrupt, do_IRQ, EXC_XFER_LITE) @@ -382,7 +376,7 @@ InstructionTLBMiss: #endif mfspr r10, SPRN_SPRG_SCRATCH2 EXCEPTION_EPILOG_0 - b InstructionAccess + b InstructionTLBError . = 0x1200 DataStoreTLBMiss: @@ -477,7 +471,10 @@ DataStoreTLBMiss: */ . = 0x1300 InstructionTLBError: - b InstructionAccess + EXCEPTION_PROLOG + mr r4,r12 + mr r5,r9 + EXC_XFER_LITE(0x1300, handle_page_fault) /* This is the data TLB error on the MPC8xx. This could be due to * many reasons, including a dirty update to a pte. We can catch that diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 51ab9e7..4d63c96 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -526,6 +526,7 @@ void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig) break; case 0x400: case 0x480: + case 0x1300: printk(KERN_ALERT "Unable to handle kernel paging request for " "instruction fetch\n"); break; -- 2.1.0 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v3 03/21] powerpc/8xx: exception InstructionAccess does not exist on MPC8xx 2014-09-17 16:36 [PATCH v3 03/21] powerpc/8xx: exception InstructionAccess does not exist on MPC8xx Christophe Leroy @ 2014-09-18 15:15 ` Joakim Tjernlund 2014-09-18 16:42 ` leroy christophe 0 siblings, 1 reply; 9+ messages in thread From: Joakim Tjernlund @ 2014-09-18 15:15 UTC (permalink / raw) To: Christophe Leroy; +Cc: scottwood, linuxppc-dev, linux-kernel, Paul Mackerras Christophe Leroy <christophe.leroy@c-s.fr> wrote on 2014/09/17 18:36:57: > > Exception InstructionAccess does not exist on MPC8xx. No need to branch there from somewhere else. > Handling can be done directly in InstructionTLBError Exception. > > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> > > --- > Changes in v2: > - None > > Changes in v3: > - arch/powerpc/mm/fault.c uses the vector number, so make sure it understand > the new ones. > > arch/powerpc/kernel/head_8xx.S | 17 +++++++---------- > arch/powerpc/mm/fault.c | 1 + > 2 files changed, 8 insertions(+), 10 deletions(-) > > diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S > index 3af6db1..fbe5d10 100644 > --- a/arch/powerpc/kernel/head_8xx.S > +++ b/arch/powerpc/kernel/head_8xx.S > @@ -234,15 +234,9 @@ DataAccess: > EXC_XFER_LITE(0x300, handle_page_fault) > > /* Instruction access exception. > - * This is "never generated" by the MPC8xx. We jump to it for other > - * translation errors. > + * This is "never generated" by the MPC8xx. > */ > - . = 0x400 > -InstructionAccess: > - EXCEPTION_PROLOG > - mr r4,r12 > - mr r5,r9 > - EXC_XFER_LITE(0x400, handle_page_fault) > + EXCEPTION(0x400, InstructionAccess, unknown_exception, EXC_XFER_STD) > > /* External interrupt */ > EXCEPTION(0x500, HardwareInterrupt, do_IRQ, EXC_XFER_LITE) > @@ -382,7 +376,7 @@ InstructionTLBMiss: > #endif > mfspr r10, SPRN_SPRG_SCRATCH2 > EXCEPTION_EPILOG_0 > - b InstructionAccess > + b InstructionTLBError > > . = 0x1200 > DataStoreTLBMiss: > @@ -477,7 +471,10 @@ DataStoreTLBMiss: > */ > . = 0x1300 > InstructionTLBError: > - b InstructionAccess > + EXCEPTION_PROLOG > + mr r4,r12 > + mr r5,r9 > + EXC_XFER_LITE(0x1300, handle_page_fault) Still don't like that you change the vector number, every other ppc uses the standard number. Can you not just lie here(EXC_XFER_LITE(0x400, handle_page_fault))? Move the code to InstructionAccess too and let TLBError branch there. If not I think you should keep the old/current way? Same for DataTLB Miss/Error > > /* This is the data TLB error on the MPC8xx. This could be due to > * many reasons, including a dirty update to a pte. We can catch that > diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c > index 51ab9e7..4d63c96 100644 > --- a/arch/powerpc/mm/fault.c > +++ b/arch/powerpc/mm/fault.c > @@ -526,6 +526,7 @@ void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig) > break; > case 0x400: > case 0x480: > + case 0x1300: > printk(KERN_ALERT "Unable to handle kernel paging request for " > "instruction fetch\n"); > break; > -- > 2.1.0 > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 03/21] powerpc/8xx: exception InstructionAccess does not exist on MPC8xx 2014-09-18 15:15 ` Joakim Tjernlund @ 2014-09-18 16:42 ` leroy christophe 2014-09-18 18:12 ` Joakim Tjernlund 2014-09-18 18:52 ` christophe leroy 0 siblings, 2 replies; 9+ messages in thread From: leroy christophe @ 2014-09-18 16:42 UTC (permalink / raw) To: Joakim Tjernlund; +Cc: scottwood, linuxppc-dev, linux-kernel, Paul Mackerras Le 18/09/2014 17:15, Joakim Tjernlund a écrit : > Christophe Leroy <christophe.leroy@c-s.fr> wrote on 2014/09/17 18:36:57: >> Exception InstructionAccess does not exist on MPC8xx. No need to branch > there from somewhere else. >> Handling can be done directly in InstructionTLBError Exception. >> >> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> >> >> --- >> Changes in v2: >> - None >> >> Changes in v3: >> - arch/powerpc/mm/fault.c uses the vector number, so make sure it > understand >> the new ones. >> >> arch/powerpc/kernel/head_8xx.S | 17 +++++++---------- >> arch/powerpc/mm/fault.c | 1 + >> 2 files changed, 8 insertions(+), 10 deletions(-) >> >> diff --git a/arch/powerpc/kernel/head_8xx.S > b/arch/powerpc/kernel/head_8xx.S >> index 3af6db1..fbe5d10 100644 >> --- a/arch/powerpc/kernel/head_8xx.S >> +++ b/arch/powerpc/kernel/head_8xx.S >> @@ -234,15 +234,9 @@ DataAccess: >> EXC_XFER_LITE(0x300, handle_page_fault) >> >> /* Instruction access exception. >> - * This is "never generated" by the MPC8xx. We jump to it for other >> - * translation errors. >> + * This is "never generated" by the MPC8xx. >> */ >> - . = 0x400 >> -InstructionAccess: >> - EXCEPTION_PROLOG >> - mr r4,r12 >> - mr r5,r9 >> - EXC_XFER_LITE(0x400, handle_page_fault) >> + EXCEPTION(0x400, InstructionAccess, unknown_exception, EXC_XFER_STD) >> >> /* External interrupt */ >> EXCEPTION(0x500, HardwareInterrupt, do_IRQ, EXC_XFER_LITE) >> @@ -382,7 +376,7 @@ InstructionTLBMiss: >> #endif >> mfspr r10, SPRN_SPRG_SCRATCH2 >> EXCEPTION_EPILOG_0 >> - b InstructionAccess >> + b InstructionTLBError >> >> . = 0x1200 >> DataStoreTLBMiss: >> @@ -477,7 +471,10 @@ DataStoreTLBMiss: >> */ >> . = 0x1300 >> InstructionTLBError: >> - b InstructionAccess >> + EXCEPTION_PROLOG >> + mr r4,r12 >> + mr r5,r9 >> + EXC_XFER_LITE(0x1300, handle_page_fault) > Still don't like that you change the vector number, every other ppc uses > the > standard number. > > Can you not just lie here(EXC_XFER_LITE(0x400, handle_page_fault))? > Move the code to InstructionAccess too and let TLBError branch there. My issue was that if I do EXC_XFER_LITE(0x400, handle_page_fault), I can't leave the EXCEPTION(0x400, InstructionAccess, unknown_exception, EXC_XFER_STD) at address .400 Otherwise, I get twice the same label. What about the following patch then ? Would this be acceptable ? @@ -234,15 +234,13 @@ DataAccess: EXC_XFER_LITE(0x300, handle_page_fault) /* Instruction access exception. - * This is "never generated" by the MPC8xx. We jump to it for other - * translation errors. + * This is "never generated" by the MPC8xx. */ . = 0x400 InstructionAccess: EXCEPTION_PROLOG - mr r4,r12 - mr r5,r9 - EXC_XFER_LITE(0x400, handle_page_fault) + addi r3,r1,STACK_FRAME_OVERHEAD + EXC_XFER_STD(0x401, unknown_exception) /* External interrupt */ EXCEPTION(0x500, HardwareInterrupt, do_IRQ, EXC_XFER_LITE) @@ -382,7 +380,7 @@ InstructionTLBMiss: #endif mfspr r10, SPRN_SPRG_SCRATCH2 EXCEPTION_EPILOG_0 - b InstructionAccess + b InstructionTLBError . = 0x1200 DataStoreTLBMiss: @@ -477,7 +475,11 @@ DataStoreTLBMiss: */ . = 0x1300 InstructionTLBError: - b InstructionAccess + EXCEPTION_PROLOG + mr r4,r12 + mr r5,r9 + /* 0x400 is InstructionAccess exception, needed by bad_page_fault() */ + EXC_XFER_LITE(0x400, handle_page_fault) /* This is the data TLB error on the MPC8xx. This could be due to * many reasons, including a dirty update to a pte. We can catch that > > If not I think you should keep the old/current way? > > Same for DataTLB Miss/Error > >> /* This is the data TLB error on the MPC8xx. This could be due to >> * many reasons, including a dirty update to a pte. We can catch that >> diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c >> index 51ab9e7..4d63c96 100644 >> --- a/arch/powerpc/mm/fault.c >> +++ b/arch/powerpc/mm/fault.c >> @@ -526,6 +526,7 @@ void bad_page_fault(struct pt_regs *regs, unsigned > long address, int sig) >> break; >> case 0x400: >> case 0x480: >> + case 0x1300: >> printk(KERN_ALERT "Unable to handle kernel paging request for " >> "instruction fetch\n"); >> break; >> -- >> 2.1.0 >> ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 03/21] powerpc/8xx: exception InstructionAccess does not exist on MPC8xx 2014-09-18 16:42 ` leroy christophe @ 2014-09-18 18:12 ` Joakim Tjernlund 2014-09-18 19:11 ` christophe leroy 2014-09-18 18:52 ` christophe leroy 1 sibling, 1 reply; 9+ messages in thread From: Joakim Tjernlund @ 2014-09-18 18:12 UTC (permalink / raw) To: leroy christophe; +Cc: scottwood, linuxppc-dev, linux-kernel, Paul Mackerras leroy christophe <christophe.leroy@c-s.fr> wrote on 2014/09/18 18:42:14: >=20 > Le 18/09/2014 17:15, Joakim Tjernlund a =E9crit : > > Christophe Leroy <christophe.leroy@c-s.fr> wrote on 2014/09/17=20 18:36:57: > >> Exception InstructionAccess does not exist on MPC8xx. No need to=20 branch > > there from somewhere else. > >> Handling can be done directly in InstructionTLBError Exception. > >> > >> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> > >> > >> --- > >> Changes in v2: > >> - None > >> > >> Changes in v3: > >> - arch/powerpc/mm/fault.c uses the vector number, so make sure it > > understand > >> the new ones. > >> > >> arch/powerpc/kernel/head=5F8xx.S | 17 +++++++---------- > >> arch/powerpc/mm/fault.c | 1 + > >> 2 files changed, 8 insertions(+), 10 deletions(-) > >> > >> diff --git a/arch/powerpc/kernel/head=5F8xx.S > > b/arch/powerpc/kernel/head=5F8xx.S > >> index 3af6db1..fbe5d10 100644 > >> --- a/arch/powerpc/kernel/head=5F8xx.S > >> +++ b/arch/powerpc/kernel/head=5F8xx.S > >> @@ -234,15 +234,9 @@ DataAccess: > >> EXC=5FXFER=5FLITE(0x300, handle=5Fpage=5Ffault) > >> > >> /* Instruction access exception. > >> - * This is "never generated" by the MPC8xx. We jump to it for other > >> - * translation errors. > >> + * This is "never generated" by the MPC8xx. > >> */ > >> - . =3D 0x400 > >> -InstructionAccess: > >> - EXCEPTION=5FPROLOG > >> - mr r4,r12 > >> - mr r5,r9 > >> - EXC=5FXFER=5FLITE(0x400, handle=5Fpage=5Ffault) > >> + EXCEPTION(0x400, InstructionAccess, unknown=5Fexception,=20 EXC=5FXFER=5FSTD) > >> > >> /* External interrupt */ > >> EXCEPTION(0x500, HardwareInterrupt, do=5FIRQ, EXC=5FXFER=5FLITE) > >> @@ -382,7 +376,7 @@ InstructionTLBMiss: > >> #endif > >> mfspr r10, SPRN=5FSPRG=5FSCRATCH2 > >> EXCEPTION=5FEPILOG=5F0 > >> - b InstructionAccess > >> + b InstructionTLBError > >> > >> . =3D 0x1200 > >> DataStoreTLBMiss: > >> @@ -477,7 +471,10 @@ DataStoreTLBMiss: > >> */ > >> . =3D 0x1300 > >> InstructionTLBError: > >> - b InstructionAccess > >> + EXCEPTION=5FPROLOG > >> + mr r4,r12 > >> + mr r5,r9 > >> + EXC=5FXFER=5FLITE(0x1300, handle=5Fpage=5Ffault) > > Still don't like that you change the vector number, every other ppc=20 uses > > the > > standard number. > > > > Can you not just lie here(EXC=5FXFER=5FLITE(0x400, handle=5Fpage=5Ffaul= t))? > > Move the code to InstructionAccess too and let TLBError branch there. > My issue was that if I do EXC=5FXFER=5FLITE(0x400, handle=5Fpage=5Ffault)= , I=20 > can't leave the > EXCEPTION(0x400, InstructionAccess, unknown=5Fexception,=20 > EXC=5FXFER=5FSTD) at address .400 > Otherwise, I get twice the same label. >=20 > What about the following patch then ? Would this be acceptable ? >=20 > @@ -234,15 +234,13 @@ DataAccess: > EXC=5FXFER=5FLITE(0x300, handle=5Fpage=5Ffault) >=20 > /* Instruction access exception. > - * This is "never generated" by the MPC8xx. We jump to it for other > - * translation errors. > + * This is "never generated" by the MPC8xx. > */ > . =3D 0x400 > InstructionAccess: > EXCEPTION=5FPROLOG > - mr r4,r12 > - mr r5,r9 > - EXC=5FXFER=5FLITE(0x400, handle=5Fpage=5Ffault) > + addi r3,r1,STACK=5FFRAME=5FOVERHEAD > + EXC=5FXFER=5FSTD(0x401, unknown=5Fexception) Since this is never generated I think it is OK. Nedds some more commenst though, why the 401 etc. >=20 > /* External interrupt */ > EXCEPTION(0x500, HardwareInterrupt, do=5FIRQ, EXC=5FXFER=5FLITE) > @@ -382,7 +380,7 @@ InstructionTLBMiss: > #endif > mfspr r10, SPRN=5FSPRG=5FSCRATCH2 > EXCEPTION=5FEPILOG=5F0 > - b InstructionAccess > + b InstructionTLBError >=20 > . =3D 0x1200 > DataStoreTLBMiss: > @@ -477,7 +475,11 @@ DataStoreTLBMiss: > */ > . =3D 0x1300 > InstructionTLBError: > - b InstructionAccess > + EXCEPTION=5FPROLOG > + mr r4,r12 > + mr r5,r9 > + /* 0x400 is InstructionAccess exception, needed by bad=5Fpage=5Ffaul= t()=20 */ > + EXC=5FXFER=5FLITE(0x400, handle=5Fpage=5Ffault) You should have the code in TLBMiss and have the TLBError branch there as that is the common case.=20 >=20 > /* This is the data TLB error on the MPC8xx. This could be due to > * many reasons, including a dirty update to a pte. We can catch that >=20 >=20 > > > > If not I think you should keep the old/current way? > > > > Same for DataTLB Miss/Error > > > >> /* This is the data TLB error on the MPC8xx. This could be due to > >> * many reasons, including a dirty update to a pte. We can catch=20 that > >> diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c > >> index 51ab9e7..4d63c96 100644 > >> --- a/arch/powerpc/mm/fault.c > >> +++ b/arch/powerpc/mm/fault.c > >> @@ -526,6 +526,7 @@ void bad=5Fpage=5Ffault(struct pt=5Fregs *regs,=20 unsigned > > long address, int sig) > >> break; > >> case 0x400: > >> case 0x480: > >> + case 0x1300: > >> printk(KERN=5FALERT "Unable to handle kernel paging request fo= r=20 " > >> "instruction fetch\n"); > >> break; > >> --=20 > >> 2.1.0 > >> >=20 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 03/21] powerpc/8xx: exception InstructionAccess does not exist on MPC8xx 2014-09-18 18:12 ` Joakim Tjernlund @ 2014-09-18 19:11 ` christophe leroy 2014-09-18 20:02 ` Joakim Tjernlund 0 siblings, 1 reply; 9+ messages in thread From: christophe leroy @ 2014-09-18 19:11 UTC (permalink / raw) To: Joakim Tjernlund; +Cc: scottwood, linuxppc-dev, linux-kernel, Paul Mackerras Le 18/09/2014 20:12, Joakim Tjernlund a écrit : > leroy christophe <christophe.leroy@c-s.fr> wrote on 2014/09/18 18:42:14: > >> Le 18/09/2014 17:15, Joakim Tjernlund a écrit : >>> Christophe Leroy <christophe.leroy@c-s.fr> wrote on 2014/09/17 > 18:36:57: >>>> Exception InstructionAccess does not exist on MPC8xx. No need to > branch >>> there from somewhere else. >>>> Handling can be done directly in InstructionTLBError Exception. >>>> >>>> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> >>>> >>>> --- >>>> Changes in v2: >>>> - None >>>> >>>> Changes in v3: >>>> - arch/powerpc/mm/fault.c uses the vector number, so make sure it >>> understand >>>> the new ones. >>>> >>>> arch/powerpc/kernel/head_8xx.S | 17 +++++++---------- >>>> arch/powerpc/mm/fault.c | 1 + >>>> 2 files changed, 8 insertions(+), 10 deletions(-) >>>> >>>> diff --git a/arch/powerpc/kernel/head_8xx.S >>> b/arch/powerpc/kernel/head_8xx.S >>>> index 3af6db1..fbe5d10 100644 >>>> --- a/arch/powerpc/kernel/head_8xx.S >>>> +++ b/arch/powerpc/kernel/head_8xx.S >>>> @@ -234,15 +234,9 @@ DataAccess: >>>> EXC_XFER_LITE(0x300, handle_page_fault) >>>> >>>> /* Instruction access exception. >>>> - * This is "never generated" by the MPC8xx. We jump to it for other >>>> - * translation errors. >>>> + * This is "never generated" by the MPC8xx. >>>> */ >>>> - . = 0x400 >>>> -InstructionAccess: >>>> - EXCEPTION_PROLOG >>>> - mr r4,r12 >>>> - mr r5,r9 >>>> - EXC_XFER_LITE(0x400, handle_page_fault) >>>> + EXCEPTION(0x400, InstructionAccess, unknown_exception, > EXC_XFER_STD) >>>> /* External interrupt */ >>>> EXCEPTION(0x500, HardwareInterrupt, do_IRQ, EXC_XFER_LITE) >>>> @@ -382,7 +376,7 @@ InstructionTLBMiss: >>>> #endif >>>> mfspr r10, SPRN_SPRG_SCRATCH2 >>>> EXCEPTION_EPILOG_0 >>>> - b InstructionAccess >>>> + b InstructionTLBError >>>> >>>> . = 0x1200 >>>> DataStoreTLBMiss: >>>> @@ -477,7 +471,10 @@ DataStoreTLBMiss: >>>> */ >>>> . = 0x1300 >>>> InstructionTLBError: >>>> - b InstructionAccess >>>> + EXCEPTION_PROLOG >>>> + mr r4,r12 >>>> + mr r5,r9 >>>> + EXC_XFER_LITE(0x1300, handle_page_fault) >>> Still don't like that you change the vector number, every other ppc > uses >>> the >>> standard number. >>> >>> Can you not just lie here(EXC_XFER_LITE(0x400, handle_page_fault))? >>> Move the code to InstructionAccess too and let TLBError branch there. >> My issue was that if I do EXC_XFER_LITE(0x400, handle_page_fault), I >> can't leave the >> EXCEPTION(0x400, InstructionAccess, unknown_exception, >> EXC_XFER_STD) at address .400 >> Otherwise, I get twice the same label. >> >> What about the following patch then ? Would this be acceptable ? >> >> @@ -234,15 +234,13 @@ DataAccess: >> EXC_XFER_LITE(0x300, handle_page_fault) >> >> /* Instruction access exception. >> - * This is "never generated" by the MPC8xx. We jump to it for other >> - * translation errors. >> + * This is "never generated" by the MPC8xx. >> */ >> . = 0x400 >> InstructionAccess: >> EXCEPTION_PROLOG >> - mr r4,r12 >> - mr r5,r9 >> - EXC_XFER_LITE(0x400, handle_page_fault) >> + addi r3,r1,STACK_FRAME_OVERHEAD >> + EXC_XFER_STD(0x401, unknown_exception) > Since this is never generated I think it is OK. Nedds some more commenst > though, why the 401 etc. > > >> /* External interrupt */ >> EXCEPTION(0x500, HardwareInterrupt, do_IRQ, EXC_XFER_LITE) >> @@ -382,7 +380,7 @@ InstructionTLBMiss: >> #endif >> mfspr r10, SPRN_SPRG_SCRATCH2 >> EXCEPTION_EPILOG_0 >> - b InstructionAccess >> + b InstructionTLBError >> >> . = 0x1200 >> DataStoreTLBMiss: >> @@ -477,7 +475,11 @@ DataStoreTLBMiss: >> */ >> . = 0x1300 >> InstructionTLBError: >> - b InstructionAccess >> + EXCEPTION_PROLOG >> + mr r4,r12 >> + mr r5,r9 >> + /* 0x400 is InstructionAccess exception, needed by bad_page_fault() > */ >> + EXC_XFER_LITE(0x400, handle_page_fault) > You should have the code in TLBMiss and have the TLBError branch there as > that is the common case. As far as I remember, I tried it already but we don't have enough space in TLBmiss for that. We can only have 40 instructions. > >> /* This is the data TLB error on the MPC8xx. This could be due to >> * many reasons, including a dirty update to a pte. We can catch that >> >> >>> If not I think you should keep the old/current way? >>> >>> Same for DataTLB Miss/Error >>> >>>> /* This is the data TLB error on the MPC8xx. This could be due to >>>> * many reasons, including a dirty update to a pte. We can catch > that >>>> diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c >>>> index 51ab9e7..4d63c96 100644 >>>> --- a/arch/powerpc/mm/fault.c >>>> +++ b/arch/powerpc/mm/fault.c >>>> @@ -526,6 +526,7 @@ void bad_page_fault(struct pt_regs *regs, > unsigned >>> long address, int sig) >>>> break; >>>> case 0x400: >>>> case 0x480: >>>> + case 0x1300: >>>> printk(KERN_ALERT "Unable to handle kernel paging request for > " >>>> "instruction fetch\n"); >>>> break; >>>> -- >>>> 2.1.0 >>>> --- Ce courrier électronique ne contient aucun virus ou logiciel malveillant parce que la protection avast! Antivirus est active. http://www.avast.com ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 03/21] powerpc/8xx: exception InstructionAccess does not exist on MPC8xx 2014-09-18 19:11 ` christophe leroy @ 2014-09-18 20:02 ` Joakim Tjernlund 2014-09-19 7:38 ` leroy christophe 0 siblings, 1 reply; 9+ messages in thread From: Joakim Tjernlund @ 2014-09-18 20:02 UTC (permalink / raw) To: christophe leroy; +Cc: scottwood, linuxppc-dev, linux-kernel, Paul Mackerras christophe leroy <christophe.leroy@c-s.fr> wrote on 2014/09/18 21:11:01: >=20 >=20 > Le 18/09/2014 20:12, Joakim Tjernlund a =E9crit : > > leroy christophe <christophe.leroy@c-s.fr> wrote on 2014/09/18=20 18:42:14: > > > >> Le 18/09/2014 17:15, Joakim Tjernlund a =E9crit : > >>> Christophe Leroy <christophe.leroy@c-s.fr> wrote on 2014/09/17 > > 18:36:57: > >>>> Exception InstructionAccess does not exist on MPC8xx. No need to > > branch > >>> there from somewhere else. > >>>> Handling can be done directly in InstructionTLBError Exception. > >>>> > >>>> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> > >> . =3D 0x1200 > >> DataStoreTLBMiss: > >> @@ -477,7 +475,11 @@ DataStoreTLBMiss: > >> */ > >> . =3D 0x1300 > >> InstructionTLBError: > >> - b InstructionAccess > >> + EXCEPTION=5FPROLOG > >> + mr r4,r12 > >> + mr r5,r9 > >> + /* 0x400 is InstructionAccess exception, needed by=20 bad=5Fpage=5Ffault() > > */ > >> + EXC=5FXFER=5FLITE(0x400, handle=5Fpage=5Ffault) > > You should have the code in TLBMiss and have the TLBError branch there = as > > that is the common case. > As far as I remember, I tried it already but we don't have enough space=20 > in TLBmiss for that. We can only have 40 instructions. Do your other optimizations first, then you might have space :) Jocke ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 03/21] powerpc/8xx: exception InstructionAccess does not exist on MPC8xx 2014-09-18 20:02 ` Joakim Tjernlund @ 2014-09-19 7:38 ` leroy christophe 0 siblings, 0 replies; 9+ messages in thread From: leroy christophe @ 2014-09-19 7:38 UTC (permalink / raw) To: Joakim Tjernlund; +Cc: scottwood, linuxppc-dev, linux-kernel, Paul Mackerras Le 18/09/2014 22:02, Joakim Tjernlund a écrit : > christophe leroy <christophe.leroy@c-s.fr> wrote on 2014/09/18 21:11:01: >> >> Le 18/09/2014 20:12, Joakim Tjernlund a écrit : >>> leroy christophe <christophe.leroy@c-s.fr> wrote on 2014/09/18 > 18:42:14: >>>> Le 18/09/2014 17:15, Joakim Tjernlund a écrit : >>>>> Christophe Leroy <christophe.leroy@c-s.fr> wrote on 2014/09/17 >>> 18:36:57: >>>>>> Exception InstructionAccess does not exist on MPC8xx. No need to >>> branch >>>>> there from somewhere else. >>>>>> Handling can be done directly in InstructionTLBError Exception. >>>>>> >>>>>> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> >>>> . = 0x1200 >>>> DataStoreTLBMiss: >>>> @@ -477,7 +475,11 @@ DataStoreTLBMiss: >>>> */ >>>> . = 0x1300 >>>> InstructionTLBError: >>>> - b InstructionAccess >>>> + EXCEPTION_PROLOG >>>> + mr r4,r12 >>>> + mr r5,r9 >>>> + /* 0x400 is InstructionAccess exception, needed by > bad_page_fault() >>> */ >>>> + EXC_XFER_LITE(0x400, handle_page_fault) >>> You should have the code in TLBMiss and have the TLBError branch there > as >>> that is the common case. >> As far as I remember, I tried it already but we don't have enough space >> in TLBmiss for that. We can only have 40 instructions. > Do your other optimizations first, then you might have space :) > > Even with the optimisation first, there is no chance to fit ITLBError instructions after ITLBMiss and before DTLBMiss. After optimisation, TLBMiss goes from 0x1100 to 0x1174. TLBError goes from 0x1300 to 0x13b4. DTLBMiss is at 0x1200 And this is without CPU6 ERRATA. So this is hopeless I believe. Christophe ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 03/21] powerpc/8xx: exception InstructionAccess does not exist on MPC8xx 2014-09-18 16:42 ` leroy christophe 2014-09-18 18:12 ` Joakim Tjernlund @ 2014-09-18 18:52 ` christophe leroy 2014-09-18 18:56 ` Scott Wood 1 sibling, 1 reply; 9+ messages in thread From: christophe leroy @ 2014-09-18 18:52 UTC (permalink / raw) To: Joakim Tjernlund; +Cc: scottwood, Paul Mackerras, linuxppc-dev, linux-kernel Le 18/09/2014 18:42, leroy christophe a écrit : > > Le 18/09/2014 17:15, Joakim Tjernlund a écrit : >> Christophe Leroy <christophe.leroy@c-s.fr> wrote on 2014/09/17 18:36:57: >>> Exception InstructionAccess does not exist on MPC8xx. No need to branch >> there from somewhere else. >>> Handling can be done directly in InstructionTLBError Exception. >>> >>> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> >>> >>> --- >>> Changes in v2: >>> - None >>> >>> Changes in v3: >>> - arch/powerpc/mm/fault.c uses the vector number, so make sure it >> understand >>> the new ones. >>> >>> arch/powerpc/kernel/head_8xx.S | 17 +++++++---------- >>> arch/powerpc/mm/fault.c | 1 + >>> 2 files changed, 8 insertions(+), 10 deletions(-) [...] >>> Still don't like that you change the vector number, every other ppc >>> uses >> the >> standard number. >> >> Can you not just lie here(EXC_XFER_LITE(0x400, handle_page_fault))? >> Move the code to InstructionAccess too and let TLBError branch there. > My issue was that if I do EXC_XFER_LITE(0x400, handle_page_fault), I > can't leave the > EXCEPTION(0x400, InstructionAccess, unknown_exception, > EXC_XFER_STD) at address .400 > Otherwise, I get twice the same label. > > What about the following patch then ? Would this be acceptable ? I don't like what I propose two hours ago indeed. Is it really worth trying to implement code for vectors 0x300 and 0x400 which are clearly stated in the Reference Manual as never being generated by the HW ?. If I just don't put anything at 0x300 and 0x400 is that OK ? Otherwise I have to put some code that will branch to TLBerror code, but writing dead code doesn't enchant me. Christophe > > @@ -234,15 +234,13 @@ DataAccess: > EXC_XFER_LITE(0x300, handle_page_fault) > > /* Instruction access exception. > - * This is "never generated" by the MPC8xx. We jump to it for other > - * translation errors. > + * This is "never generated" by the MPC8xx. > */ > . = 0x400 > InstructionAccess: > EXCEPTION_PROLOG > - mr r4,r12 > - mr r5,r9 > - EXC_XFER_LITE(0x400, handle_page_fault) > + addi r3,r1,STACK_FRAME_OVERHEAD > + EXC_XFER_STD(0x401, unknown_exception) > > /* External interrupt */ > EXCEPTION(0x500, HardwareInterrupt, do_IRQ, EXC_XFER_LITE) > @@ -382,7 +380,7 @@ InstructionTLBMiss: > #endif > mfspr r10, SPRN_SPRG_SCRATCH2 > EXCEPTION_EPILOG_0 > - b InstructionAccess > + b InstructionTLBError > > . = 0x1200 > DataStoreTLBMiss: > @@ -477,7 +475,11 @@ DataStoreTLBMiss: > */ > . = 0x1300 > InstructionTLBError: > - b InstructionAccess > + EXCEPTION_PROLOG > + mr r4,r12 > + mr r5,r9 > + /* 0x400 is InstructionAccess exception, needed by > bad_page_fault() */ > + EXC_XFER_LITE(0x400, handle_page_fault) > > /* This is the data TLB error on the MPC8xx. This could be due to > * many reasons, including a dirty update to a pte. We can catch that > > >> >> If not I think you should keep the old/current way? >> >> Same for DataTLB Miss/Error >> >>> /* This is the data TLB error on the MPC8xx. This could be due to >>> * many reasons, including a dirty update to a pte. We can catch >>> that >>> diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c >>> index 51ab9e7..4d63c96 100644 >>> --- a/arch/powerpc/mm/fault.c >>> +++ b/arch/powerpc/mm/fault.c >>> @@ -526,6 +526,7 @@ void bad_page_fault(struct pt_regs *regs, unsigned >> long address, int sig) >>> break; >>> case 0x400: >>> case 0x480: >>> + case 0x1300: >>> printk(KERN_ALERT "Unable to handle kernel paging request for " >>> "instruction fetch\n"); >>> break; >>> -- >>> 2.1.0 >>> > --- Ce courrier électronique ne contient aucun virus ou logiciel malveillant parce que la protection avast! Antivirus est active. http://www.avast.com ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 03/21] powerpc/8xx: exception InstructionAccess does not exist on MPC8xx 2014-09-18 18:52 ` christophe leroy @ 2014-09-18 18:56 ` Scott Wood 0 siblings, 0 replies; 9+ messages in thread From: Scott Wood @ 2014-09-18 18:56 UTC (permalink / raw) To: christophe leroy; +Cc: Paul Mackerras, linuxppc-dev, linux-kernel On Thu, 2014-09-18 at 20:52 +0200, christophe leroy wrote: > Le 18/09/2014 18:42, leroy christophe a écrit : > > > > Le 18/09/2014 17:15, Joakim Tjernlund a écrit : > >> Christophe Leroy <christophe.leroy@c-s.fr> wrote on 2014/09/17 18:36:57: > >>> Exception InstructionAccess does not exist on MPC8xx. No need to branch > >> there from somewhere else. > >>> Handling can be done directly in InstructionTLBError Exception. > >>> > >>> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> > >>> > >>> --- > >>> Changes in v2: > >>> - None > >>> > >>> Changes in v3: > >>> - arch/powerpc/mm/fault.c uses the vector number, so make sure it > >> understand > >>> the new ones. > >>> > >>> arch/powerpc/kernel/head_8xx.S | 17 +++++++---------- > >>> arch/powerpc/mm/fault.c | 1 + > >>> 2 files changed, 8 insertions(+), 10 deletions(-) > [...] > >>> Still don't like that you change the vector number, every other ppc > >>> uses > >> the > >> standard number. > >> > >> Can you not just lie here(EXC_XFER_LITE(0x400, handle_page_fault))? > >> Move the code to InstructionAccess too and let TLBError branch there. > > My issue was that if I do EXC_XFER_LITE(0x400, handle_page_fault), I > > can't leave the > > EXCEPTION(0x400, InstructionAccess, unknown_exception, > > EXC_XFER_STD) at address .400 > > Otherwise, I get twice the same label. > > > > What about the following patch then ? Would this be acceptable ? > I don't like what I propose two hours ago indeed. > Is it really worth trying to implement code for vectors 0x300 and 0x400 > which are clearly stated in the Reference Manual as never being > generated by the HW ?. > If I just don't put anything at 0x300 and 0x400 is that OK ? > Otherwise I have to put some code that will branch to TLBerror code, but > writing dead code doesn't enchant me. No, just have the one set of exception handlers that hardware will generate, and use the exception codes that Linux expects. E.g. exception codes are a giant lie on booke as well. It would be nice if we documented what linux wanted, though, instead of using magic numbers, and assuming it's the same as classic -- which especially fails when it's an exception type that doesn't exist on classic or book3s. -Scott ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-09-19 7:38 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-09-17 16:36 [PATCH v3 03/21] powerpc/8xx: exception InstructionAccess does not exist on MPC8xx Christophe Leroy 2014-09-18 15:15 ` Joakim Tjernlund 2014-09-18 16:42 ` leroy christophe 2014-09-18 18:12 ` Joakim Tjernlund 2014-09-18 19:11 ` christophe leroy 2014-09-18 20:02 ` Joakim Tjernlund 2014-09-19 7:38 ` leroy christophe 2014-09-18 18:52 ` christophe leroy 2014-09-18 18:56 ` Scott Wood
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).