| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <77670b86-1212-4547-a119-a876e4948b33@ghiti.fr>
Date: Thu, 14 Aug 2025 11:50:03 +0200
From: Alexandre Ghiti <alex@...ti.fr>
To: Andrew Donnellan <ajd@...ux.ibm.com>, linuxppc-dev@...ts.ozlabs.org,
linux-mm@...ck.org
Cc: akpm@...ux-foundation.org, x86@...nel.org,
linux-riscv@...ts.infradead.org, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org, pasha.tatashin@...een.com,
sweettea-kernel@...miny.me, nicholas@...ux.ibm.com,
christophe.leroy@...roup.eu, Rohan McLure <rmclure@...ux.ibm.com>,
Ingo Molnar <mingo@...nel.org>
Subject: Re: [PATCH v16 04/13] mm/page_table_check: Reinstate address
parameter in [__]page_table_check_pmd[s]_set()
On 8/13/25 08:26, Andrew Donnellan wrote:
> From: Rohan McLure <rmclure@...ux.ibm.com>
>
> This reverts commit a3b837130b58 ("mm/page_table_check: remove unused
> parameter in [__]page_table_check_pmd_set").
>
> Reinstate previously unused parameters for the purpose of supporting
> powerpc platforms, as many do not encode user/kernel ownership of the
> page in the pte, but instead in the address of the access.
>
> Apply this to __page_table_check_pmds_set(), page_table_check_pmd_set(), and
> the page_table_check_pmd_set() wrapper macro.
>
> [ajd@...ux.ibm.com: rebase on arm64 + riscv changes, update commit message]
> Signed-off-by: Rohan McLure <rmclure@...ux.ibm.com>
> Reviewed-by: Pasha Tatashin <pasha.tatashin@...een.com>
> Acked-by: Ingo Molnar <mingo@...nel.org> # x86
> Signed-off-by: Andrew Donnellan <ajd@...ux.ibm.com>
> ---
> v13: remove inaccurate comment on riscv in the commit message
> v14: rebase
> v15: rebase, amend commit message
> ---
> arch/arm64/include/asm/pgtable.h | 5 +++--
> arch/riscv/include/asm/pgtable.h | 4 ++--
> arch/x86/include/asm/pgtable.h | 4 ++--
> include/linux/page_table_check.h | 12 ++++++------
> mm/page_table_check.c | 4 ++--
> 5 files changed, 15 insertions(+), 14 deletions(-)
>
> diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
> index 8070b653c409..9fe3af8b4cad 100644
> --- a/arch/arm64/include/asm/pgtable.h
> +++ b/arch/arm64/include/asm/pgtable.h
> @@ -709,7 +709,8 @@ static inline void __set_ptes_anysz(struct mm_struct *mm, unsigned long addr,
> page_table_check_ptes_set(mm, ptep, pte, nr);
> break;
> case PMD_SIZE:
> - page_table_check_pmds_set(mm, (pmd_t *)ptep, pte_pmd(pte), nr);
> + page_table_check_pmds_set(mm, addr, (pmd_t *)ptep,
> + pte_pmd(pte), nr);
> break;
> #ifndef __PAGETABLE_PMD_FOLDED
> case PUD_SIZE:
> @@ -1514,7 +1515,7 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
> static inline pmd_t pmdp_establish(struct vm_area_struct *vma,
> unsigned long address, pmd_t *pmdp, pmd_t pmd)
> {
> - page_table_check_pmd_set(vma->vm_mm, pmdp, pmd);
> + page_table_check_pmd_set(vma->vm_mm, address, pmdp, pmd);
> return __pmd(xchg_relaxed(&pmd_val(*pmdp), pmd_val(pmd)));
> }
> #endif
> diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
> index 3ed0f5e4879d..6e8c3d19f96a 100644
> --- a/arch/riscv/include/asm/pgtable.h
> +++ b/arch/riscv/include/asm/pgtable.h
> @@ -805,7 +805,7 @@ static inline pud_t pud_mkspecial(pud_t pud)
> static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr,
> pmd_t *pmdp, pmd_t pmd)
> {
> - page_table_check_pmd_set(mm, pmdp, pmd);
> + page_table_check_pmd_set(mm, addr, pmdp, pmd);
> return __set_pte_at(mm, (pte_t *)pmdp, pmd_pte(pmd));
> }
>
> @@ -876,7 +876,7 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
> static inline pmd_t pmdp_establish(struct vm_area_struct *vma,
> unsigned long address, pmd_t *pmdp, pmd_t pmd)
> {
> - page_table_check_pmd_set(vma->vm_mm, pmdp, pmd);
> + page_table_check_pmd_set(vma->vm_mm, address, pmdp, pmd);
> return __pmd(atomic_long_xchg((atomic_long_t *)pmdp, pmd_val(pmd)));
> }
>
> diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
> index 0603793acb3a..8ee301b16b50 100644
> --- a/arch/x86/include/asm/pgtable.h
> +++ b/arch/x86/include/asm/pgtable.h
> @@ -1213,7 +1213,7 @@ static inline pud_t native_local_pudp_get_and_clear(pud_t *pudp)
> static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr,
> pmd_t *pmdp, pmd_t pmd)
> {
> - page_table_check_pmd_set(mm, pmdp, pmd);
> + page_table_check_pmd_set(mm, addr, pmdp, pmd);
> set_pmd(pmdp, pmd);
> }
>
> @@ -1356,7 +1356,7 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
> static inline pmd_t pmdp_establish(struct vm_area_struct *vma,
> unsigned long address, pmd_t *pmdp, pmd_t pmd)
> {
> - page_table_check_pmd_set(vma->vm_mm, pmdp, pmd);
> + page_table_check_pmd_set(vma->vm_mm, address, pmdp, pmd);
> if (IS_ENABLED(CONFIG_SMP)) {
> return xchg(pmdp, pmd);
> } else {
> diff --git a/include/linux/page_table_check.h b/include/linux/page_table_check.h
> index 0bf18b884a12..cf7c28d8d468 100644
> --- a/include/linux/page_table_check.h
> +++ b/include/linux/page_table_check.h
> @@ -19,8 +19,8 @@ void __page_table_check_pmd_clear(struct mm_struct *mm, pmd_t pmd);
> void __page_table_check_pud_clear(struct mm_struct *mm, pud_t pud);
> void __page_table_check_ptes_set(struct mm_struct *mm, pte_t *ptep, pte_t pte,
> unsigned int nr);
> -void __page_table_check_pmds_set(struct mm_struct *mm, pmd_t *pmdp, pmd_t pmd,
> - unsigned int nr);
> +void __page_table_check_pmds_set(struct mm_struct *mm, unsigned long addr,
> + pmd_t *pmdp, pmd_t pmd, unsigned int nr);
> void __page_table_check_puds_set(struct mm_struct *mm, unsigned long addr,
> pud_t *pudp, pud_t pud, unsigned int nr);
> void __page_table_check_pte_clear_range(struct mm_struct *mm,
> @@ -77,12 +77,12 @@ static inline void page_table_check_ptes_set(struct mm_struct *mm,
> }
>
> static inline void page_table_check_pmds_set(struct mm_struct *mm,
> - pmd_t *pmdp, pmd_t pmd, unsigned int nr)
> + unsigned long addr, pmd_t *pmdp, pmd_t pmd, unsigned int nr)
> {
> if (static_branch_likely(&page_table_check_disabled))
> return;
>
> - __page_table_check_pmds_set(mm, pmdp, pmd, nr);
> + __page_table_check_pmds_set(mm, addr, pmdp, pmd, nr);
> }
>
> static inline void page_table_check_puds_set(struct mm_struct *mm,
> @@ -132,7 +132,7 @@ static inline void page_table_check_ptes_set(struct mm_struct *mm,
> }
>
> static inline void page_table_check_pmds_set(struct mm_struct *mm,
> - pmd_t *pmdp, pmd_t pmd, unsigned int nr)
> + unsigned long addr, pmd_t *pmdp, pmd_t pmd, unsigned int nr)
> {
> }
>
> @@ -149,7 +149,7 @@ static inline void page_table_check_pte_clear_range(struct mm_struct *mm,
>
> #endif /* CONFIG_PAGE_TABLE_CHECK */
>
> -#define page_table_check_pmd_set(mm, pmdp, pmd) page_table_check_pmds_set(mm, pmdp, pmd, 1)
> +#define page_table_check_pmd_set(mm, addr, pmdp, pmd) page_table_check_pmds_set(mm, addr, pmdp, pmd, 1)
> #define page_table_check_pud_set(mm, addr, pudp, pud) page_table_check_puds_set(mm, addr, pudp, pud, 1)
>
> #endif /* __LINUX_PAGE_TABLE_CHECK_H */
> diff --git a/mm/page_table_check.c b/mm/page_table_check.c
> index 3c39e4375886..09258f2ad93f 100644
> --- a/mm/page_table_check.c
> +++ b/mm/page_table_check.c
> @@ -218,8 +218,8 @@ static inline void page_table_check_pmd_flags(pmd_t pmd)
> WARN_ON_ONCE(swap_cached_writable(pmd_to_swp_entry(pmd)));
> }
>
> -void __page_table_check_pmds_set(struct mm_struct *mm, pmd_t *pmdp, pmd_t pmd,
> - unsigned int nr)
> +void __page_table_check_pmds_set(struct mm_struct *mm, unsigned long addr,
> + pmd_t *pmdp, pmd_t pmd, unsigned int nr)
> {
> unsigned long stride = PMD_SIZE >> PAGE_SHIFT;
> unsigned int i;
Acked-by: Alexandre Ghiti <alexghiti@...osinc.com> # riscv
Thanks,
Alex
Powered by blists - more mailing lists