github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-12 16:18:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm/page_table_check: Pass mm_struct to pxx_user_accessible_page()

Browse Source 
Unlike other architectures, s390 does not have means to
distinguish kernel vs user page table entries - neither
an entry itself, nor the address could be used for that.
It is only the mm_struct that indicates whether an entry
in question is mapped to a user space. So pass mm_struct
to pxx_user_accessible_page() callbacks.

[agordeev@linux.ibm.com: rephrased commit message, removed braces]

Acked-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Reviewed-by: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com> #powerpc
Signed-off-by: Tobias Huschle <huschle@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
Link: https://lore.kernel.org/r/ca77f3489453c2fe01b25e50e53b778929e0dfc5.1772812343.git.agordeev@linux.ibm.com
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
This commit is contained in:
Tobias Huschle 2026-03-06 17:16:30 +01:00 committed by Vasily Gorbik
parent 11439c4635
commit cf8771ca4c
8 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm64/include/asm/pgtable.h
View File

@ -1263,17 +1263,17 @@ static inline int pmdp_set_access_flags(struct vm_area_struct *vma,
#endif #endif
#ifdef CONFIG_PAGE_TABLE_CHECK #ifdef CONFIG_PAGE_TABLE_CHECK
static inline bool pte_user_accessible_page(pte_t pte, unsigned long addr) static inline bool pte_user_accessible_page(struct mm_struct *mm, unsigned long addr, pte_t pte)
{ {
return pte_valid(pte) && (pte_user(pte) || pte_user_exec(pte)); return pte_valid(pte) && (pte_user(pte) || pte_user_exec(pte));
} }
static inline bool pmd_user_accessible_page(pmd_t pmd, unsigned long addr) static inline bool pmd_user_accessible_page(struct mm_struct *mm, unsigned long addr, pmd_t pmd)
{ {
return pmd_valid(pmd) && !pmd_table(pmd) && (pmd_user(pmd) || pmd_user_exec(pmd)); return pmd_valid(pmd) && !pmd_table(pmd) && (pmd_user(pmd) || pmd_user_exec(pmd));
} }
static inline bool pud_user_accessible_page(pud_t pud, unsigned long addr) static inline bool pud_user_accessible_page(struct mm_struct *mm, unsigned long addr, pud_t pud)
{ {
return pud_valid(pud) && !pud_table(pud) && (pud_user(pud) || pud_user_exec(pud)); return pud_valid(pud) && !pud_table(pud) && (pud_user(pud) || pud_user_exec(pud));
} }

2
arch/powerpc/include/asm/book3s/32/pgtable.h
View File

@ -438,7 +438,7 @@ static inline bool pte_access_permitted(pte_t pte, bool write)
return true; return true;
} }
static inline bool pte_user_accessible_page(pte_t pte, unsigned long addr) static inline bool pte_user_accessible_page(struct mm_struct *mm, unsigned long addr, pte_t pte)
{ {
return pte_present(pte) && !is_kernel_addr(addr); return pte_present(pte) && !is_kernel_addr(addr);
} }

10
arch/powerpc/include/asm/book3s/64/pgtable.h
View File

@ -549,7 +549,7 @@ static inline bool pte_access_permitted(pte_t pte, bool write)
return arch_pte_access_permitted(pte_val(pte), write, 0); return arch_pte_access_permitted(pte_val(pte), write, 0);
} }
static inline bool pte_user_accessible_page(pte_t pte, unsigned long addr) static inline bool pte_user_accessible_page(struct mm_struct *mm, unsigned long addr, pte_t pte)
{ {
return pte_present(pte) && pte_user(pte); return pte_present(pte) && pte_user(pte);
} }
@ -925,9 +925,9 @@ static inline bool pud_access_permitted(pud_t pud, bool write)
} }
#define pud_user_accessible_page pud_user_accessible_page #define pud_user_accessible_page pud_user_accessible_page
static inline bool pud_user_accessible_page(pud_t pud, unsigned long addr) static inline bool pud_user_accessible_page(struct mm_struct *mm, unsigned long addr, pud_t pud)
{ {
return pud_leaf(pud) && pte_user_accessible_page(pud_pte(pud), addr); return pud_leaf(pud) && pte_user_accessible_page(mm, addr, pud_pte(pud));
} }
#define __p4d_raw(x) ((p4d_t) { __pgd_raw(x) }) #define __p4d_raw(x) ((p4d_t) { __pgd_raw(x) })
@ -1096,9 +1096,9 @@ static inline bool pmd_access_permitted(pmd_t pmd, bool write)
} }
#define pmd_user_accessible_page pmd_user_accessible_page #define pmd_user_accessible_page pmd_user_accessible_page
static inline bool pmd_user_accessible_page(pmd_t pmd, unsigned long addr) static inline bool pmd_user_accessible_page(struct mm_struct *mm, unsigned long addr, pmd_t pmd)
{ {
return pmd_leaf(pmd) && pte_user_accessible_page(pmd_pte(pmd), addr); return pmd_leaf(pmd) && pte_user_accessible_page(mm, addr, pmd_pte(pmd));
} }
#ifdef CONFIG_TRANSPARENT_HUGEPAGE #ifdef CONFIG_TRANSPARENT_HUGEPAGE

2
arch/powerpc/include/asm/nohash/pgtable.h
View File

@ -249,7 +249,7 @@ static inline bool pte_access_permitted(pte_t pte, bool write)
return true; return true;
} }
static inline bool pte_user_accessible_page(pte_t pte, unsigned long addr) static inline bool pte_user_accessible_page(struct mm_struct *mm, unsigned long addr, pte_t pte)
{ {
return pte_present(pte) && !is_kernel_addr(addr); return pte_present(pte) && !is_kernel_addr(addr);
} }

4
arch/powerpc/include/asm/pgtable.h
View File

@ -205,11 +205,11 @@ static inline bool arch_supports_memmap_on_memory(unsigned long vmemmap_size)
#endif /* CONFIG_PPC64 */ #endif /* CONFIG_PPC64 */
#ifndef pmd_user_accessible_page #ifndef pmd_user_accessible_page
#define pmd_user_accessible_page(pmd, addr) false #define pmd_user_accessible_page(mm, addr, pmd) false
#endif #endif
#ifndef pud_user_accessible_page #ifndef pud_user_accessible_page
#define pud_user_accessible_page(pud, addr) false #define pud_user_accessible_page(mm, addr, pud) false
#endif #endif
#endif /* __ASSEMBLER__ */ #endif /* __ASSEMBLER__ */

6
arch/riscv/include/asm/pgtable.h
View File

@ -984,17 +984,17 @@ static inline void set_pud_at(struct mm_struct *mm, unsigned long addr,
} }
#ifdef CONFIG_PAGE_TABLE_CHECK #ifdef CONFIG_PAGE_TABLE_CHECK
static inline bool pte_user_accessible_page(pte_t pte, unsigned long addr) static inline bool pte_user_accessible_page(struct mm_struct *mm, unsigned long addr, pte_t pte)
{ {
return pte_present(pte) && pte_user(pte); return pte_present(pte) && pte_user(pte);
} }
static inline bool pmd_user_accessible_page(pmd_t pmd, unsigned long addr) static inline bool pmd_user_accessible_page(struct mm_struct *mm, unsigned long addr, pmd_t pmd)
{ {
return pmd_leaf(pmd) && pmd_user(pmd); return pmd_leaf(pmd) && pmd_user(pmd);
} }
static inline bool pud_user_accessible_page(pud_t pud, unsigned long addr) static inline bool pud_user_accessible_page(struct mm_struct *mm, unsigned long addr, pud_t pud)
{ {
return pud_leaf(pud) && pud_user(pud); return pud_leaf(pud) && pud_user(pud);
} }

6
arch/x86/include/asm/pgtable.h
View File

@ -1680,17 +1680,17 @@ static inline bool arch_has_hw_nonleaf_pmd_young(void)
#endif #endif
#ifdef CONFIG_PAGE_TABLE_CHECK #ifdef CONFIG_PAGE_TABLE_CHECK
static inline bool pte_user_accessible_page(pte_t pte, unsigned long addr) static inline bool pte_user_accessible_page(struct mm_struct *mm, unsigned long addr, pte_t pte)
{ {
return (pte_val(pte) & _PAGE_PRESENT) && (pte_val(pte) & _PAGE_USER); return (pte_val(pte) & _PAGE_PRESENT) && (pte_val(pte) & _PAGE_USER);
} }
static inline bool pmd_user_accessible_page(pmd_t pmd, unsigned long addr) static inline bool pmd_user_accessible_page(struct mm_struct *mm, unsigned long addr, pmd_t pmd)
{ {
return pmd_leaf(pmd) && (pmd_val(pmd) & _PAGE_PRESENT) && (pmd_val(pmd) & _PAGE_USER); return pmd_leaf(pmd) && (pmd_val(pmd) & _PAGE_PRESENT) && (pmd_val(pmd) & _PAGE_USER);
} }
static inline bool pud_user_accessible_page(pud_t pud, unsigned long addr) static inline bool pud_user_accessible_page(struct mm_struct *mm, unsigned long addr, pud_t pud)
{ {
return pud_leaf(pud) && (pud_val(pud) & _PAGE_PRESENT) && (pud_val(pud) & _PAGE_USER); return pud_leaf(pud) && (pud_val(pud) & _PAGE_PRESENT) && (pud_val(pud) & _PAGE_USER);
} }

15
mm/page_table_check.c
View File

@ -151,10 +151,9 @@ void __page_table_check_pte_clear(struct mm_struct *mm, unsigned long addr,
if (&init_mm == mm) if (&init_mm == mm)
return; return;
if (pte_user_accessible_page(pte, addr)) { if (pte_user_accessible_page(mm, addr, pte))
page_table_check_clear(pte_pfn(pte), PAGE_SIZE >> PAGE_SHIFT); page_table_check_clear(pte_pfn(pte), PAGE_SIZE >> PAGE_SHIFT);
} }
}
EXPORT_SYMBOL(__page_table_check_pte_clear); EXPORT_SYMBOL(__page_table_check_pte_clear);
void __page_table_check_pmd_clear(struct mm_struct *mm, unsigned long addr, void __page_table_check_pmd_clear(struct mm_struct *mm, unsigned long addr,
@ -163,10 +162,9 @@ void __page_table_check_pmd_clear(struct mm_struct *mm, unsigned long addr,
if (&init_mm == mm) if (&init_mm == mm)
return; return;
if (pmd_user_accessible_page(pmd, addr)) { if (pmd_user_accessible_page(mm, addr, pmd))
page_table_check_clear(pmd_pfn(pmd), PMD_SIZE >> PAGE_SHIFT); page_table_check_clear(pmd_pfn(pmd), PMD_SIZE >> PAGE_SHIFT);
} }
}
EXPORT_SYMBOL(__page_table_check_pmd_clear); EXPORT_SYMBOL(__page_table_check_pmd_clear);
void __page_table_check_pud_clear(struct mm_struct *mm, unsigned long addr, void __page_table_check_pud_clear(struct mm_struct *mm, unsigned long addr,
@ -175,10 +173,9 @@ void __page_table_check_pud_clear(struct mm_struct *mm, unsigned long addr,
if (&init_mm == mm) if (&init_mm == mm)
return; return;
if (pud_user_accessible_page(pud, addr)) { if (pud_user_accessible_page(mm, addr, pud))
page_table_check_clear(pud_pfn(pud), PUD_SIZE >> PAGE_SHIFT); page_table_check_clear(pud_pfn(pud), PUD_SIZE >> PAGE_SHIFT);
} }
}
EXPORT_SYMBOL(__page_table_check_pud_clear); EXPORT_SYMBOL(__page_table_check_pud_clear);
/* Whether the swap entry cached writable information */ /* Whether the swap entry cached writable information */
@ -211,7 +208,7 @@ void __page_table_check_ptes_set(struct mm_struct *mm, unsigned long addr,
for (i = 0; i < nr; i++) for (i = 0; i < nr; i++)
__page_table_check_pte_clear(mm, addr + PAGE_SIZE * i, ptep_get(ptep + i)); __page_table_check_pte_clear(mm, addr + PAGE_SIZE * i, ptep_get(ptep + i));
if (pte_user_accessible_page(pte, addr)) if (pte_user_accessible_page(mm, addr, pte))
page_table_check_set(pte_pfn(pte), nr, pte_write(pte)); page_table_check_set(pte_pfn(pte), nr, pte_write(pte));
} }
EXPORT_SYMBOL(__page_table_check_ptes_set); EXPORT_SYMBOL(__page_table_check_ptes_set);
@ -241,7 +238,7 @@ void __page_table_check_pmds_set(struct mm_struct *mm, unsigned long addr,
for (i = 0; i < nr; i++) for (i = 0; i < nr; i++)
__page_table_check_pmd_clear(mm, addr + PMD_SIZE * i, *(pmdp + i)); __page_table_check_pmd_clear(mm, addr + PMD_SIZE * i, *(pmdp + i));
if (pmd_user_accessible_page(pmd, addr)) if (pmd_user_accessible_page(mm, addr, pmd))
page_table_check_set(pmd_pfn(pmd), stride * nr, pmd_write(pmd)); page_table_check_set(pmd_pfn(pmd), stride * nr, pmd_write(pmd));
} }
EXPORT_SYMBOL(__page_table_check_pmds_set); EXPORT_SYMBOL(__page_table_check_pmds_set);
@ -257,7 +254,7 @@ void __page_table_check_puds_set(struct mm_struct *mm, unsigned long addr,
for (i = 0; i < nr; i++) for (i = 0; i < nr; i++)
__page_table_check_pud_clear(mm, addr + PUD_SIZE * i, *(pudp + i)); __page_table_check_pud_clear(mm, addr + PUD_SIZE * i, *(pudp + i));
if (pud_user_accessible_page(pud, addr)) if (pud_user_accessible_page(mm, addr, pud))
page_table_check_set(pud_pfn(pud), stride * nr, pud_write(pud)); page_table_check_set(pud_pfn(pud), stride * nr, pud_write(pud));
} }
EXPORT_SYMBOL(__page_table_check_puds_set); EXPORT_SYMBOL(__page_table_check_puds_set);