Skip to contentSkip to conversation

FAILED: patch "[PATCH] powerpc/603: Always fault when _PAGE_ACCESSED is not set" failed to apply to 5.4-stable tree

PATCH [email protected] 2 participants 2 messages Nov 9, 2020

Subsystems (2)
Stable branch PowerPC
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 11522448e641e8f1690c9db06e01985e8e19b401 Mon Sep 17 00:00:00 2001
From: Christophe Leroy <[email protected]>
Date: Sat, 10 Oct 2020 15:14:30 +0000
Subject: [PATCH] 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 84de6ab0e904 ("powerpc/603: don't handle PAGE_ACCESSED in TLB miss handlers.")
Cc [email protected]
Signed-off-by Christophe Leroy <[email protected]>
Signed-off-by Michael Ellerman <[email protected]>
Link https://lore.kernel.org/r/a44367744de54e2315b2f1a8cbbd7f88488072e0.1602342806.git.christophe.leroy@csgroup.eu open here
arch/powerpc/kernel/head_book3s_32.S +0 -12
index 5eb9eedac920..2aa16d5368e1 100644
@@ -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 */
#1 lore raw

Le 09/11/2020 à 11:09, [email protected] a écrit :

Quoted 5 lines

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Yes, trivial conflict and name change. Sent you a backport patch.

Christophe

Quoted 64 lines

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 11522448e641e8f1690c9db06e01985e8e19b401 Mon Sep 17 00:00:00 2001
From: Christophe Leroy <[email protected]>
Date: Sat, 10 Oct 2020 15:14:30 +0000
Subject: [PATCH] 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 84de6ab0e904 ("powerpc/603: don't handle PAGE_ACCESSED in TLB miss handlers.")
Cc [email protected]
Signed-off-by Christophe Leroy <[email protected]>
Signed-off-by Michael Ellerman <[email protected]>
Link https://lore.kernel.org/r/a44367744de54e2315b2f1a8cbbd7f88488072e0.1602342806.git.christophe.leroy@csgroup.eu open here
arch/powerpc/kernel/head_book3s_32.S +0 -12
index 5eb9eedac920..2aa16d5368e1 100644
@@ -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 */