Commit d7d65b10 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Andrew Morton
Browse files

mm: move set_pxd_safe() helpers from generic to platform 

set_pxd_safe() helpers that serve a specific purpose for both x86 and
riscv platforms, do not need to be in the common memory code.  Otherwise
they just unnecessarily make the common API more complicated.  This moves
the helpers from common code to platform instead.

Link: https://lkml.kernel.org/r/20241003044842.246016-1-anshuman.khandual@arm.com


Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Suggested-by: default avatarDavid Hildenbrand <david@redhat.com>
Acked-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: David Hildenbrand <david@redhat.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent f0327de7

arch/riscv/include/asm/pgtable.h

+19 −0
Original line number Diff line number Diff line
@@ -963,6 +963,25 @@ void misc_mem_init(void); 
extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];

#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))



/*

 * Use set_p*_safe(), and elide TLB flushing, when confident that *no*

 * TLB flush will be required as a result of the "set". For example, use

 * in scenarios where it is known ahead of time that the routine is

 * setting non-present entries, or re-setting an existing entry to the

 * same value. Otherwise, use the typical "set" helpers and flush the

 * TLB.

 */

#define set_p4d_safe(p4dp, p4d) \

({ \

	WARN_ON_ONCE(p4d_present(*p4dp) && !p4d_same(*p4dp, p4d)); \

	set_p4d(p4dp, p4d); \

})



#define set_pgd_safe(pgdp, pgd) \

({ \

	WARN_ON_ONCE(pgd_present(*pgdp) && !pgd_same(*pgdp, pgd)); \

	set_pgd(pgdp, pgd); \

})

#endif /* !__ASSEMBLY__ */



#endif /* _ASM_RISCV_PGTABLE_H */

arch/x86/include/asm/pgtable.h

+37 −0
Original line number Diff line number Diff line
@@ -1775,6 +1775,43 @@ bool arch_is_platform_page(u64 paddr); 
#define arch_is_platform_page arch_is_platform_page

#endif



/*

 * Use set_p*_safe(), and elide TLB flushing, when confident that *no*

 * TLB flush will be required as a result of the "set". For example, use

 * in scenarios where it is known ahead of time that the routine is

 * setting non-present entries, or re-setting an existing entry to the

 * same value. Otherwise, use the typical "set" helpers and flush the

 * TLB.

 */

#define set_pte_safe(ptep, pte) \

({ \

	WARN_ON_ONCE(pte_present(*ptep) && !pte_same(*ptep, pte)); \

	set_pte(ptep, pte); \

})



#define set_pmd_safe(pmdp, pmd) \

({ \

	WARN_ON_ONCE(pmd_present(*pmdp) && !pmd_same(*pmdp, pmd)); \

	set_pmd(pmdp, pmd); \

})



#define set_pud_safe(pudp, pud) \

({ \

	WARN_ON_ONCE(pud_present(*pudp) && !pud_same(*pudp, pud)); \

	set_pud(pudp, pud); \

})



#define set_p4d_safe(p4dp, p4d) \

({ \

	WARN_ON_ONCE(p4d_present(*p4dp) && !p4d_same(*p4dp, p4d)); \

	set_p4d(p4dp, p4d); \

})



#define set_pgd_safe(pgdp, pgd) \

({ \

	WARN_ON_ONCE(pgd_present(*pgdp) && !pgd_same(*pgdp, pgd)); \

	set_pgd(pgdp, pgd); \

})

#endif	/* __ASSEMBLY__ */



#endif /* _ASM_X86_PGTABLE_H */

include/linux/pgtable.h

+0 −38
Original line number Diff line number Diff line
@@ -1056,44 +1056,6 @@ static inline int pgd_same(pgd_t pgd_a, pgd_t pgd_b) 
}

#endif



/*

 * Use set_p*_safe(), and elide TLB flushing, when confident that *no*

 * TLB flush will be required as a result of the "set". For example, use

 * in scenarios where it is known ahead of time that the routine is

 * setting non-present entries, or re-setting an existing entry to the

 * same value. Otherwise, use the typical "set" helpers and flush the

 * TLB.

 */

#define set_pte_safe(ptep, pte) \

({ \

	WARN_ON_ONCE(pte_present(*ptep) && !pte_same(*ptep, pte)); \

	set_pte(ptep, pte); \

})



#define set_pmd_safe(pmdp, pmd) \

({ \

	WARN_ON_ONCE(pmd_present(*pmdp) && !pmd_same(*pmdp, pmd)); \

	set_pmd(pmdp, pmd); \

})



#define set_pud_safe(pudp, pud) \

({ \

	WARN_ON_ONCE(pud_present(*pudp) && !pud_same(*pudp, pud)); \

	set_pud(pudp, pud); \

})



#define set_p4d_safe(p4dp, p4d) \

({ \

	WARN_ON_ONCE(p4d_present(*p4dp) && !p4d_same(*p4dp, p4d)); \

	set_p4d(p4dp, p4d); \

})



#define set_pgd_safe(pgdp, pgd) \

({ \

	WARN_ON_ONCE(pgd_present(*pgdp) && !pgd_same(*pgdp, pgd)); \

	set_pgd(pgdp, pgd); \

})



#ifndef __HAVE_ARCH_DO_SWAP_PAGE

static inline void arch_do_swap_page_nr(struct mm_struct *mm,

				     struct vm_area_struct *vma,