Commit 36f01141 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/64s: move DABR match out of handle_page_fault 



Similar to the 32/s change, move the test and call to the do_break
handler to the DSI.

Suggested-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210130130852.2952424-5-npiggin@gmail.com
parent 7a24ae2e

arch/powerpc/kernel/exceptions-64s.S

+16 −18
Original line number Diff line number Diff line
@@ -1439,6 +1439,8 @@ EXC_COMMON_BEGIN(data_access_common) 
	GEN_COMMON data_access

	ld	r4,_DAR(r1)

	ld	r5,_DSISR(r1)

	andis.	r0,r5,DSISR_DABRMATCH@h

	bne-	1f

BEGIN_MMU_FTR_SECTION

	ld	r6,_MSR(r1)

	li	r3,0x300
@@ -1447,6 +1449,18 @@ MMU_FTR_SECTION_ELSE 
	b	handle_page_fault

ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX)



1:	/* We have a data breakpoint exception - handle it */

	ld      r4,_DAR(r1)

	ld      r5,_DSISR(r1)

	addi    r3,r1,STACK_FRAME_OVERHEAD

	bl      do_break

	/*

	 * do_break() may have changed the NV GPRS while handling a breakpoint.

	 * If so, we need to restore them with their updated values.

	 */

	REST_NVGPRS(r1)

	b       interrupt_return



	GEN_KVM data_access
@@ -3209,7 +3223,7 @@ disable_machine_check: 
	.balign	IFETCH_ALIGN_BYTES

do_hash_page:

#ifdef CONFIG_PPC_BOOK3S_64

	lis	r0,(DSISR_BAD_FAULT_64S | DSISR_DABRMATCH | DSISR_KEYFAULT)@h

	lis	r0,(DSISR_BAD_FAULT_64S | DSISR_KEYFAULT)@h

	ori	r0,r0,DSISR_BAD_FAULT_64S@l

	and.	r0,r5,r0		/* weird error? */

	bne-	handle_page_fault	/* if not, try to insert a HPTE */
@@ -3243,15 +3257,13 @@ do_hash_page: 
	/* Error */

	blt-	13f



	/* Reload DAR/DSISR into r4/r5 for the DABR check below */

	/* Reload DAR/DSISR into r4/r5 for handle_page_fault */

	ld	r4,_DAR(r1)

	ld      r5,_DSISR(r1)

#endif /* CONFIG_PPC_BOOK3S_64 */



/* Here we have a page fault that hash_page can't handle. */

handle_page_fault:

11:	andis.  r0,r5,DSISR_DABRMATCH@h

	bne-    handle_dabr_fault

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	do_page_fault

	cmpdi	r3,0
@@ -3262,20 +3274,6 @@ handle_page_fault: 
	bl	__bad_page_fault

	b	interrupt_return



/* We have a data breakpoint exception - handle it */

handle_dabr_fault:

	ld      r4,_DAR(r1)

	ld      r5,_DSISR(r1)

	addi    r3,r1,STACK_FRAME_OVERHEAD

	bl      do_break

	/*

	 * do_break() may have changed the NV GPRS while handling a breakpoint.

	 * If so, we need to restore them with their updated values.

	 */

	REST_NVGPRS(r1)

	b       interrupt_return





#ifdef CONFIG_PPC_BOOK3S_64

/* We have a page fault that hash_page could handle but HV refused

 * the PTE insertion