Re: [PATCH for 5.4] powerpc/603: Always fault when _PAGE_ACCESSED is not set

[Greg KH]

On Mon, Nov 09, 2020 at 05:40:52PM +, Christophe Leroy wrote:
> [That is backport of 11522448e641e8f1690c9db06e01985e8e19b401 to linux 5.4]
> 
> 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: 84de6ab0e904 ("powerpc/603: don't handle PAGE_ACCESSED in TLB miss 
> handlers.")
> Cc: sta...@vger.kernel.org
> Signed-off-by: Christophe Leroy 
> Signed-off-by: Michael Ellerman 
> Link: 
> https://lore.kernel.org/r/a44367744de54e2315b2f1a8cbbd7f88488072e0.1602342806.git.christophe.le...@csgroup.eu
> ---
>  arch/powerpc/kernel/head_32.S | 12 
>  1 file changed, 12 deletions(-)

Both backports now queued up, thanks.

greg k-h

[PATCH for 5.4] powerpc/603: Always fault when _PAGE_ACCESSED is not set

[Christophe Leroy]

[That is backport of 11522448e641e8f1690c9db06e01985e8e19b401 to linux 5.4]

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: 84de6ab0e904 ("powerpc/603: don't handle PAGE_ACCESSED in TLB miss 
handlers.")
Cc: sta...@vger.kernel.org
Signed-off-by: Christophe Leroy 
Signed-off-by: Michael Ellerman 
Link: 
https://lore.kernel.org/r/a44367744de54e2315b2f1a8cbbd7f88488072e0.1602342806.git.christophe.le...@csgroup.eu
---
 arch/powerpc/kernel/head_32.S | 12 
 1 file changed, 12 deletions(-)

diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 5e2f2fd78b94..126ba5438430 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -418,11 +418,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)
bge-112f
lis r2, (swapper_pg_dir - PAGE_OFFSET)@ha   /* if kernel address, 
use */
@@ -484,11 +480,7 @@ DataLoadTLBMiss:
lis r1,PAGE_OFFSET@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
bge-112f
lis r2, (swapper_pg_dir - PAGE_OFFSET)@ha   /* if kernel address, 
use */
addir2, r2, (swapper_pg_dir - PAGE_OFFSET)@l/* kernel page 
table */
@@ -564,11 +556,7 @@ DataStoreTLBMiss:
lis r1,PAGE_OFFSET@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
bge-112f
lis r2, (swapper_pg_dir - PAGE_OFFSET)@ha   /* if kernel address, 
use */
addir2, r2, (swapper_pg_dir - PAGE_OFFSET)@l/* kernel page 
table */
-- 
2.25.0