UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/64s/exception: reduce page fault unnecessary loads 

This avoids 3 loads in the radix page fault case, 1 load in the
hash fault case, and 2 loads in the hash miss page fault case.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20190802105709.27696-37-npiggin@gmail.com
This commit is contained in:
Nicholas Piggin 2019-08-02 20:57:01 +10:00 committed by Michael Ellerman
parent 05f97d94dd
commit 9b123d1ea2
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
arch/powerpc/kernel/exceptions-64s.S
View File

@ -1159,11 +1159,11 @@ EXC_COMMON_BEGIN(data_access_common)
* EX_DAR and EX_DSISR have saved DAR/DSISR * EX_DAR and EX_DSISR have saved DAR/DSISR
*/ */
INT_COMMON 0x300, PACA_EXGEN, 1, 1, 1, 1, 1 INT_COMMON 0x300, PACA_EXGEN, 1, 1, 1, 1, 1
ld r12,_MSR(r1) ld r4,_DAR(r1)
ld r3,_DAR(r1) ld r5,_DSISR(r1)
ld r4,_DSISR(r1)
li r5,0x300
BEGIN_MMU_FTR_SECTION BEGIN_MMU_FTR_SECTION
ld r6,_MSR(r1)
li r3,0x300
b do_hash_page /* Try to handle as hpte fault */ b do_hash_page /* Try to handle as hpte fault */
MMU_FTR_SECTION_ELSE MMU_FTR_SECTION_ELSE
b handle_page_fault b handle_page_fault
@ -1211,11 +1211,11 @@ EXC_VIRT_END(instruction_access, 0x4400, 0x80)
INT_KVM_HANDLER instruction_access, 0x400, EXC_STD, PACA_EXGEN, 0 INT_KVM_HANDLER instruction_access, 0x400, EXC_STD, PACA_EXGEN, 0
EXC_COMMON_BEGIN(instruction_access_common) EXC_COMMON_BEGIN(instruction_access_common)
INT_COMMON 0x400, PACA_EXGEN, 1, 1, 1, 2, 2 INT_COMMON 0x400, PACA_EXGEN, 1, 1, 1, 2, 2
ld r12,_MSR(r1) ld r4,_DAR(r1)
ld r3,_DAR(r1) ld r5,_DSISR(r1)
ld r4,_DSISR(r1)
li r5,0x400
BEGIN_MMU_FTR_SECTION BEGIN_MMU_FTR_SECTION
ld r6,_MSR(r1)
li r3,0x400
b do_hash_page /* Try to handle as hpte fault */ b do_hash_page /* Try to handle as hpte fault */
MMU_FTR_SECTION_ELSE MMU_FTR_SECTION_ELSE
b handle_page_fault b handle_page_fault
@ -2260,7 +2260,7 @@ do_hash_page:
#ifdef CONFIG_PPC_BOOK3S_64 #ifdef CONFIG_PPC_BOOK3S_64
lis r0,(DSISR_BAD_FAULT_64S | DSISR_DABRMATCH | DSISR_KEYFAULT)@h lis r0,(DSISR_BAD_FAULT_64S | DSISR_DABRMATCH | DSISR_KEYFAULT)@h
ori r0,r0,DSISR_BAD_FAULT_64S@l ori r0,r0,DSISR_BAD_FAULT_64S@l
and. r0,r4,r0 /* weird error? */ and. r0,r5,r0 /* weird error? */
bne- handle_page_fault /* if not, try to insert a HPTE */ bne- handle_page_fault /* if not, try to insert a HPTE */
ld r11, PACA_THREAD_INFO(r13) ld r11, PACA_THREAD_INFO(r13)
lwz r0,TI_PREEMPT(r11) /* If we're in an "NMI" */ lwz r0,TI_PREEMPT(r11) /* If we're in an "NMI" */
@ -2268,15 +2268,13 @@ do_hash_page:
bne 77f /* then don't call hash_page now */ bne 77f /* then don't call hash_page now */
/* /*
* r3 contains the faulting address * r3 contains the trap number
* r4 msr * r4 contains the faulting address
* r5 contains the trap number * r5 contains dsisr
* r6 contains dsisr * r6 msr
* *
* at return r3 = 0 for success, 1 for page fault, negative for error * at return r3 = 0 for success, 1 for page fault, negative for error
*/ */
mr r4,r12
ld r6,_DSISR(r1)
bl __hash_page /* build HPTE if possible */ bl __hash_page /* build HPTE if possible */
cmpdi r3,0 /* see if __hash_page succeeded */ cmpdi r3,0 /* see if __hash_page succeeded */
@ -2286,16 +2284,15 @@ do_hash_page:
/* Error */ /* Error */
blt- 13f blt- 13f
/* Reload DSISR into r4 for the DABR check below */ /* Reload DAR/DSISR into r4/r5 for the DABR check below */
ld r4,_DSISR(r1) ld r4,_DAR(r1)
ld r5,_DSISR(r1)
#endif /* CONFIG_PPC_BOOK3S_64 */ #endif /* CONFIG_PPC_BOOK3S_64 */
/* Here we have a page fault that hash_page can't handle. */ /* Here we have a page fault that hash_page can't handle. */
handle_page_fault: handle_page_fault:
11: andis. r0,r4,DSISR_DABRMATCH@h 11: andis. r0,r5,DSISR_DABRMATCH@h
bne- handle_dabr_fault bne- handle_dabr_fault
ld r4,_DAR(r1)
ld r5,_DSISR(r1)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
bl do_page_fault bl do_page_fault
cmpdi r3,0 cmpdi r3,0
@ -2342,7 +2339,6 @@ handle_dabr_fault:
* the access, or panic if there isn't a handler. * the access, or panic if there isn't a handler.
*/ */
77: bl save_nvgprs 77: bl save_nvgprs
mr r4,r3
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
li r5,SIGSEGV li r5,SIGSEGV
bl bad_page_fault bl bad_page_fault

4
arch/powerpc/mm/book3s64/hash_utils.c
View File

@ -1462,8 +1462,8 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap,
} }
EXPORT_SYMBOL_GPL(hash_page); EXPORT_SYMBOL_GPL(hash_page);
int __hash_page(unsigned long ea, unsigned long msr, unsigned long trap, int __hash_page(unsigned long trap, unsigned long ea, unsigned long dsisr,
unsigned long dsisr) unsigned long msr)
{ {
unsigned long access = _PAGE_PRESENT | _PAGE_READ; unsigned long access = _PAGE_PRESENT | _PAGE_READ;
unsigned long flags = 0; unsigned long flags = 0;