mm: introduce arch_has_hw_nonleaf_pmd_young()
Subsystems (11)
PATCH v2 1/1 mm: introduce arch_has_hw_nonleaf_pmd_young()
When running as a Xen PV guests commit eed9a328aa1a ("mm: x86: add CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG") can cause a protection violation in pmdp_test_and_clear_young():
BUG: unable to handle page fault for address: ffff8880083374d0 #PF: supervisor write access in kernel mode #PF: error_code(0x0003) - permissions violation PGD 3026067 P4D 3026067 PUD 3027067 PMD 7fee5067 PTE 8010000008337065 Oops: 0003 [#1] PREEMPT SMP NOPTI CPU: 7 PID: 158 Comm: kswapd0 Not tainted 6.1.0-rc5-20221118-doflr+ #1 RIP: e030:pmdp_test_and_clear_young+0x25/0x40
This happens because the Xen hypervisor can't emulate direct writes to page table entries other than PTEs.
This can easily be fixed by introducing arch_has_hw_nonleaf_pmd_young() similar to arch_has_hw_pte_young() and test that instead of CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG.
---
V2:
- correct function name in commit message to match patch
--- arch/x86/include/asm/pgtable.h | 8 ++++++++ include/linux/pgtable.h | 11 +++++++++++ mm/vmscan.c | 10 +++++----- 3 files changed, 24 insertions(+), 5 deletions(-)
arch/x86/include/asm/pgtable.h +8 -0
@@ -1438,6 +1438,14 @@ static inline bool arch_has_hw_pte_young(void)return true; } +#ifdef CONFIG_XEN_PV +#define arch_has_hw_nonleaf_pmd_young arch_has_hw_nonleaf_pmd_young +static inline bool arch_has_hw_nonleaf_pmd_young (void ) +{ +return !cpu_feature_enabled (X86_FEATURE_XENPV ); +} +#endif +#ifdef CONFIG_PAGE_TABLE_CHECK static inline bool pte_user_accessible_page (pte_t pte) {
include/linux/pgtable.h +11 -0
@@ -260,6 +260,17 @@ static inline int pmdp_clear_flush_young(struct vm_area_struct *vma,#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ #endif +#ifndef arch_has_hw_nonleaf_pmd_young +/* +* Return whether the accessed bit in non-leaf PMD entries is supported on the +* local CPU. +*/ +static inline bool arch_has_hw_nonleaf_pmd_young (void ) +{ +return IS_ENABLED (CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG ); +} +#endif +#ifndef arch_has_hw_pte_young/* * Return whether the accessed bit is supported on the local CPU.
mm/vmscan.c +5 -5
@@ -3975,7 +3975,7 @@ static void walk_pmd_range_locked(pud_t *pud, unsigned long next, struct vm_area goto next;if (!pmd_trans_huge (pmd[i])) { -if (IS_ENABLED (CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG ) && +if (arch_has_hw_nonleaf_pmd_young () &&get_cap (LRU_GEN_NONLEAF_YOUNG ))pmdp_test_and_clear_young (vma, addr, pmd + i); goto next;
@@ -4073,14 +4073,14 @@ static void walk_pmd_range(pud_t *pud, unsigned long start, unsigned long end,#endif walk->mm_stats[MM_NONLEAF_TOTAL ]++; -#ifdef CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG -if (get_cap (LRU_GEN_NONLEAF_YOUNG )) { +if (arch_has_hw_nonleaf_pmd_young () && +get_cap (LRU_GEN_NONLEAF_YOUNG )) {if (!pmd_young (val))continue ;walk_pmd_range_locked (pud, addr, vma, args, bitmap, &pos); } -#endif +if (!walk->force_scan && !test_bloom_filter (walk->lruvec, walk->max_seq, pmd + i))continue ;
@@ -5354,7 +5354,7 @@ static ssize_t show_enabled(struct kobject *kobj, struct kobj_attribute *attr, cif (arch_has_hw_pte_young () &&get_cap (LRU_GEN_MM_WALK )) caps |=BIT (LRU_GEN_MM_WALK ); -if (IS_ENABLED (CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG ) &&get_cap (LRU_GEN_NONLEAF_YOUNG )) +if (arch_has_hw_nonleaf_pmd_young () &&get_cap (LRU_GEN_NONLEAF_YOUNG )) caps |=BIT (LRU_GEN_NONLEAF_YOUNG );return snprintf (buf,PAGE_SIZE ,"0x%04x\n" , caps);
Signature · 1 line
2.35.3
Quoted 106 lines · Juergen Gross
When running as a Xen PV guests commit
eed9a328aa1a("mm: x86: addCONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG") can cause a protection violation inpmdp_test_and_clear_young():BUG: unable to handle page fault for address: ffff8880083374d0 #PF: supervisor write access in kernel mode #PF: error_code(0x0003) - permissions violation PGD 3026067 P4D 3026067 PUD 3027067 PMD 7fee5067 PTE 8010000008337065 Oops: 0003 [#1] PREEMPT SMP NOPTI CPU: 7 PID: 158 Comm: kswapd0 Not tainted 6.1.0-rc5-20221118-doflr+ #1 RIP: e030:pmdp_test_and_clear_young+0x25/0x40This happens because the Xen hypervisor can't emulate direct writes to page table entries other than PTEs.
This can easily be fixed by introducing
arch_has_hw_nonleaf_pmd_young()similar toarch_has_hw_pte_young()and test that instead ofCONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG.Fixes eed9a328aa1a ("mm: x86: add CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG")Reported-by Sander Eikelenboom <[email protected]>Signed-off-by Juergen Gross <[email protected]>Acked-by Yu Zhao <[email protected]>Tested-by Sander Eikelenboom <[email protected]>---
V2:
- correct function name in commit message to match patch--- arch/x86/include/asm/pgtable.h | 8 ++++++++ include/linux/pgtable.h | 11 +++++++++++ mm/vmscan.c | 10 +++++----- 3 files changed, 24 insertions(+), 5 deletions(-)arch/x86/include/asm/pgtable.h +8
-0@@ -1438,6 +1438,14 @@ static inline bool arch_has_hw_pte_young(void)return true; } +#ifdef CONFIG_XEN_PV +#define arch_has_hw_nonleaf_pmd_young arch_has_hw_nonleaf_pmd_young +static inline bool arch_has_hw_nonleaf_pmd_young (void ) +{ +return !cpu_feature_enabled (X86_FEATURE_XENPV ); +} +#endif +#ifdef CONFIG_PAGE_TABLE_CHECK static inline bool pte_user_accessible_page (pte_t pte) {include/linux/pgtable.h +11
-0@@ -260,6 +260,17 @@ static inline int pmdp_clear_flush_young(struct vm_area_struct *vma,#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ #endif +#ifndef arch_has_hw_nonleaf_pmd_young +/* +* Return whether the accessed bit in non-leaf PMD entries is supported on the +* local CPU. +*/ +static inline bool arch_has_hw_nonleaf_pmd_young (void ) +{ +return IS_ENABLED (CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG ); +} +#endif +#ifndef arch_has_hw_pte_young/* * Return whether the accessed bit is supported on the local CPU. mm/vmscan.c +4
-4@@ -3975,7 +3975,7 @@ static void walk_pmd_range_locked(pud_t *pud, unsigned long next, struct vm_area goto next;if (!pmd_trans_huge (pmd[i])) { -if (IS_ENABLED (CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG ) && +if (arch_has_hw_nonleaf_pmd_young () &&get_cap (LRU_GEN_NONLEAF_YOUNG ))pmdp_test_and_clear_young (vma, addr, pmd + i); goto next;@@ -4073,14 +4073,14 @@ static void walk_pmd_range(pud_t *pud, unsigned long start, unsigned long end,#endif walk->mm_stats[MM_NONLEAF_TOTAL ]++; -#ifdef CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG -if (get_cap (LRU_GEN_NONLEAF_YOUNG )) { +if (arch_has_hw_nonleaf_pmd_young () && +get_cap (LRU_GEN_NONLEAF_YOUNG )) {if (!pmd_young (val))continue ;walk_pmd_range_locked (pud, addr, vma, args, bitmap, &pos); } -#endif +if (!walk->force_scan && !test_bloom_filter (walk->lruvec, walk->max_seq, pmd + i))continue ;
mm/vmscan.c static ssize_t show_enabled(struct kobject *kobj, struct kobj_attribute *attr, c · line 5360
Quoted 8 lines
mm/vmscan.c +1
-1@@ -5354,7 +5354,7 @@ static ssize_t show_enabled(struct kobject *kobj, struct kobj_attribute *attr, cif (arch_has_hw_pte_young () &&get_cap (LRU_GEN_MM_WALK )) caps |=BIT (LRU_GEN_MM_WALK ); -if (IS_ENABLED (CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG ) &&get_cap (LRU_GEN_NONLEAF_YOUNG )) +if (arch_has_hw_nonleaf_pmd_young () &&get_cap (LRU_GEN_NONLEAF_YOUNG )) caps |=BIT (LRU_GEN_NONLEAF_YOUNG );return snprintf (buf,PAGE_SIZE ,"0x%04x\n" , caps);
Signature · 3 lines
Thanks, David / dhildenb
Hi Jürgen,
Quoted 19 lines · Juergen Gross
When running as a Xen PV guests commit
eed9a328aa1a("mm: x86: addCONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG") can cause a protection violation inpmdp_test_and_clear_young():BUG: unable to handle page fault for address: ffff8880083374d0 #PF: supervisor write access in kernel mode #PF: error_code(0x0003) - permissions violation PGD 3026067 P4D 3026067 PUD 3027067 PMD 7fee5067 PTE 8010000008337065 Oops: 0003 [#1] PREEMPT SMP NOPTI CPU: 7 PID: 158 Comm: kswapd0 Not tainted 6.1.0-rc5-20221118-doflr+ #1 RIP: e030:pmdp_test_and_clear_young+0x25/0x40This happens because the Xen hypervisor can't emulate direct writes to page table entries other than PTEs.
This can easily be fixed by introducing
arch_has_hw_nonleaf_pmd_young()similar toarch_has_hw_pte_young()and test that instead ofCONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG.
Quoted 8 lines
Fixes eed9a328aa1a ("mm: x86: add CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG")Reported-by Sander Eikelenboom <[email protected]>Signed-off-by Juergen Gross <[email protected]>Acked-by Yu Zhao <[email protected]>Tested-by Sander Eikelenboom <[email protected]>---
V2:
- correct function name in commit message to match patch
Thanks for your patch, which is now commit 3f85e711d5af4fb4 ("mm:
introduce arch_has_hw_nonleaf_pmd_young()") in next-20221124.
[email protected] reported a build failure for m68k/allmodconfig, which I have bisected to this commit.
mm/vmscan.c static void walk_pmd_range(pud_t *pud, unsigned long start, unsigned long end, · line 4078
Quoted 12 lines
mm/vmscan.c +2
-2@@ -4073,14 +4073,14 @@ static void walk_pmd_range(pud_t *pud, unsigned long start, unsigned long end,#endif walk->mm_stats[MM_NONLEAF_TOTAL ]++; -#ifdef CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG -if (get_cap (LRU_GEN_NONLEAF_YOUNG )) { +if (arch_has_hw_nonleaf_pmd_young () && +get_cap (LRU_GEN_NONLEAF_YOUNG )) {if (!pmd_young (val))
mm/vmscan.c:4102:30: error: implicit declaration of function 'pmd_young'; did you mean 'pte_young'? [-Werror=implicit-function-declaration]
pmd_young() seems to be defined only on a handful of architectures.
mm/vmscan.c static void walk_pmd_range(pud_t *pud, unsigned long start, unsigned long end, · line 4086
Quoted 9 lines
mm/vmscan.c +1
-1continue ;walk_pmd_range_locked (pud, addr, vma, args, bitmap, &pos); } -#endif +if (!walk->force_scan && !test_bloom_filter (walk->lruvec, walk->max_seq, pmd + i))continue ;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Hi,
Quoted 54 lines · Geert Uytterhoeven
Hi Jürgen,
Quoted 19 lines · Juergen Gross
When running as a Xen PV guests commit
eed9a328aa1a("mm: x86: addCONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG") can cause a protection violation inpmdp_test_and_clear_young():BUG: unable to handle page fault for address: ffff8880083374d0 #PF: supervisor write access in kernel mode #PF: error_code(0x0003) - permissions violation PGD 3026067 P4D 3026067 PUD 3027067 PMD 7fee5067 PTE 8010000008337065 Oops: 0003 [#1] PREEMPT SMP NOPTI CPU: 7 PID: 158 Comm: kswapd0 Not tainted 6.1.0-rc5-20221118-doflr+ #1 RIP: e030:pmdp_test_and_clear_young+0x25/0x40This happens because the Xen hypervisor can't emulate direct writes to page table entries other than PTEs.
This can easily be fixed by introducing
arch_has_hw_nonleaf_pmd_young()similar toarch_has_hw_pte_young()and test that instead ofCONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG.Quoted 8 lines
Fixes eed9a328aa1a ("mm: x86: add CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG")Reported-by Sander Eikelenboom <[email protected]>Signed-off-by Juergen Gross <[email protected]>Acked-by Yu Zhao <[email protected]>Tested-by Sander Eikelenboom <[email protected]>---
V2:
- correct function name in commit message to match patchThanks for your patch, which is now commit
3f85e711d5af4fb4("mm:
introducearch_has_hw_nonleaf_pmd_young()") in next-20221124.[email protected] reported a build failure for m68k/allmodconfig, which I have bisected to this commit.
mm/vmscan.c static void walk_pmd_range(pud_t *pud, unsigned long start, unsigned long end, · line 4078
Quoted 12 lines
mm/vmscan.c +2
-2@@ -4073,14 +4073,14 @@ static void walk_pmd_range(pud_t *pud, unsigned long start, unsigned long end,#endif walk->mm_stats[MM_NONLEAF_TOTAL ]++; -#ifdef CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG -if (get_cap (LRU_GEN_NONLEAF_YOUNG )) { +if (arch_has_hw_nonleaf_pmd_young () && +get_cap (LRU_GEN_NONLEAF_YOUNG )) {if (!pmd_young (val))
mm/vmscan.c:4102:30: error: implicit declaration of function 'pmd_young'; did you mean 'pte_young'? [-Werror=implicit-function-declaration]
Quoted 1 line
pmd_young()seems to be defined only on a handful of architectures.
What would be the preferred fix for that?
I could offer:
- use V1 of the patch
- add the #ifdefs again to this patch (which would be kind of weird)
- use the attached patch
Juergen
From 9f16c75dfbff994c01a003e4701f5bdd48cbfc3f Mon Sep 17 00:00:00 2001
From: Juergen Gross <[email protected]>
Date: Thu, 24 Nov 2022 15:18:03 +0100
Subject: [PATCH] mm: add dummy pmd_young() for architectures not having it
In order to avoid #ifdeffery add a dummy pmd_young() implementation as a fallback.
--- arch/loongarch/include/asm/pgtable.h | 1 + arch/mips/include/asm/pgtable.h | 1 + arch/riscv/include/asm/pgtable.h | 1 + arch/s390/include/asm/pgtable.h | 1 + arch/sparc/include/asm/pgtable_64.h | 1 + arch/x86/include/asm/pgtable.h | 1 + include/linux/pgtable.h | 7 +++++++ 7 files changed, 13 insertions(+)
arch/loongarch/include/asm/pgtable.h +1 -0
@@ -482,6 +482,7 @@ static inline pmd_t pmd_mkdirty(pmd_t pmd)return pmd; } +#define pmd_young pmd_youngstatic inline int pmd_young (pmd_t pmd) {return !!(pmd_val (pmd) & _PAGE_ACCESSED);
arch/mips/include/asm/pgtable.h +1 -0
@@ -622,6 +622,7 @@ static inline pmd_t pmd_mkdirty(pmd_t pmd)return pmd; } +#define pmd_young pmd_youngstatic inline int pmd_young (pmd_t pmd) {return !!(pmd_val (pmd) & _PAGE_ACCESSED);
arch/riscv/include/asm/pgtable.h +1 -0
@@ -600,6 +600,7 @@ static inline int pmd_dirty(pmd_t pmd)return pte_dirty (pmd_pte (pmd)); } +#define pmd_young pmd_youngstatic inline int pmd_young (pmd_t pmd) {return pte_young (pmd_pte (pmd));
arch/s390/include/asm/pgtable.h +1 -0
@@ -763,6 +763,7 @@ static inline int pmd_dirty(pmd_t pmd)return (pmd_val (pmd) & _SEGMENT_ENTRY_DIRTY) !=0 ; } +#define pmd_young pmd_youngstatic inline int pmd_young (pmd_t pmd) {return (pmd_val (pmd) & _SEGMENT_ENTRY_YOUNG) !=0 ;
arch/sparc/include/asm/pgtable_64.h +1 -0
@@ -693,6 +693,7 @@ static inline unsigned long pmd_dirty(pmd_t pmd)return pte_dirty (pte); } +#define pmd_young pmd_youngstatic inline unsigned long pmd_young (pmd_t pmd) {pte_t pte =__pte (pmd_val (pmd));
arch/x86/include/asm/pgtable.h +1 -0
@@ -139,6 +139,7 @@ static inline int pmd_dirty(pmd_t pmd)return pmd_flags (pmd) & _PAGE_DIRTY; } +#define pmd_young pmd_youngstatic inline int pmd_young (pmd_t pmd) {return pmd_flags (pmd) & _PAGE_ACCESSED;
include/linux/pgtable.h +7 -0
@@ -165,6 +165,13 @@ static inline pte_t *virt_to_kpte(unsigned long vaddr)return pmd_none (*pmd) ?NULL :pte_offset_kernel (pmd, vaddr); } +#ifndef pmd_young +static inline int pmd_young (pmd_t pmd) +{ +return 0 ; +} +#endif +#ifndef __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS extern int ptep_set_access_flags(struct vm_area_struct *vma, unsigned long address, pte_t *ptep,
Signature · 1 line
2.35.3
Yu Zhao
Acked-byQuoted 60 lines · Juergen Gross
Hi,
Quoted 54 lines · Geert Uytterhoeven
Hi Jürgen,
Quoted 19 lines · Juergen Gross
When running as a Xen PV guests commit
eed9a328aa1a("mm: x86: addCONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG") can cause a protection violation inpmdp_test_and_clear_young():BUG: unable to handle page fault for address: ffff8880083374d0 #PF: supervisor write access in kernel mode #PF: error_code(0x0003) - permissions violation PGD 3026067 P4D 3026067 PUD 3027067 PMD 7fee5067 PTE 8010000008337065 Oops: 0003 [#1] PREEMPT SMP NOPTI CPU: 7 PID: 158 Comm: kswapd0 Not tainted 6.1.0-rc5-20221118-doflr+ #1 RIP: e030:pmdp_test_and_clear_young+0x25/0x40This happens because the Xen hypervisor can't emulate direct writes to page table entries other than PTEs.
This can easily be fixed by introducing
arch_has_hw_nonleaf_pmd_young()similar toarch_has_hw_pte_young()and test that instead ofCONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG.Quoted 8 lines
Fixes eed9a328aa1a ("mm: x86: add CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG")Reported-by Sander Eikelenboom <[email protected]>Signed-off-by Juergen Gross <[email protected]>Acked-by Yu Zhao <[email protected]>Tested-by Sander Eikelenboom <[email protected]>---
V2:
- correct function name in commit message to match patchThanks for your patch, which is now commit
3f85e711d5af4fb4("mm:
introducearch_has_hw_nonleaf_pmd_young()") in next-20221124.[email protected] reported a build failure for m68k/allmodconfig, which I have bisected to this commit.
mm/vmscan.c static void walk_pmd_range(pud_t *pud, unsigned long start, unsigned long end, · line 4078
Quoted 12 lines
mm/vmscan.c +2
-2@@ -4073,14 +4073,14 @@ static void walk_pmd_range(pud_t *pud, unsigned long start, unsigned long end,#endif walk->mm_stats[MM_NONLEAF_TOTAL ]++; -#ifdef CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG -if (get_cap (LRU_GEN_NONLEAF_YOUNG )) { +if (arch_has_hw_nonleaf_pmd_young () && +get_cap (LRU_GEN_NONLEAF_YOUNG )) {if (!pmd_young (val))
mm/vmscan.c:4102:30: error: implicit declaration of function 'pmd_young'; did you mean 'pte_young'? [-Werror=implicit-function-declaration]Quoted 1 line
pmd_young()seems to be defined only on a handful of architectures.
Quoted 7 lines
What would be the preferred fix for that?
I could offer:
- use V1 of the patch
- add the #ifdefs again to this patch (which would be kind of weird)
- use the attached patch
Your patch looks good to me:
Thanks.