Commit 11522448 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/603: Always fault when _PAGE_ACCESSED is not set 



The kernel expects pte_young() to work regardless of CONFIG_SWAP.

Make sure a minor fault is taken to set _PAGE_ACCESSED when it
is not already set, regardless of the selection of CONFIG_SWAP.

Fixes: 84de6ab0 ("powerpc/603: don't handle PAGE_ACCESSED in TLB miss handlers.")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/a44367744de54e2315b2f1a8cbbd7f88488072e0.1602342806.git.christophe.leroy@csgroup.eu
parent 1344a232

arch/powerpc/kernel/head_book3s_32.S

+0 −12
Original line number Diff line number Diff line
@@ -457,11 +457,7 @@ InstructionTLBMiss: 
	cmplw	0,r1,r3

#endif

	mfspr	r2, SPRN_SPRG_PGDIR

#ifdef CONFIG_SWAP

	li	r1,_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_EXEC

#else

	li	r1,_PAGE_PRESENT | _PAGE_EXEC

#endif

#if defined(CONFIG_MODULES) || defined(CONFIG_DEBUG_PAGEALLOC)

	bgt-	112f

	lis	r2, (swapper_pg_dir - PAGE_OFFSET)@ha	/* if kernel address, use */
@@ -523,11 +519,7 @@ DataLoadTLBMiss: 
	lis	r1, TASK_SIZE@h		/* check if kernel address */

	cmplw	0,r1,r3

	mfspr	r2, SPRN_SPRG_PGDIR

#ifdef CONFIG_SWAP

	li	r1, _PAGE_PRESENT | _PAGE_ACCESSED

#else

	li	r1, _PAGE_PRESENT

#endif

	bgt-	112f

	lis	r2, (swapper_pg_dir - PAGE_OFFSET)@ha	/* if kernel address, use */

	addi	r2, r2, (swapper_pg_dir - PAGE_OFFSET)@l	/* kernel page table */
@@ -603,11 +595,7 @@ DataStoreTLBMiss: 
	lis	r1, TASK_SIZE@h		/* check if kernel address */

	cmplw	0,r1,r3

	mfspr	r2, SPRN_SPRG_PGDIR

#ifdef CONFIG_SWAP

	li	r1, _PAGE_RW | _PAGE_DIRTY | _PAGE_PRESENT | _PAGE_ACCESSED

#else

	li	r1, _PAGE_RW | _PAGE_DIRTY | _PAGE_PRESENT

#endif

	bgt-	112f

	lis	r2, (swapper_pg_dir - PAGE_OFFSET)@ha	/* if kernel address, use */

	addi	r2, r2, (swapper_pg_dir - PAGE_OFFSET)@l	/* kernel page table */

CRA Git | Maintained and supported by SUSTech CRA and CCSE