Commit 51718e25 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

mm: convert arch_clear_hugepage_flags to take a folio 

All implementations that aren't no-ops just set a bit in the flags, and we
want to use the folio flags rather than the page flags for that.  Rename
it to arch_clear_hugetlb_flags() while we're touching it so nobody thinks
it's used for THP.

[willy@infradead.org: fix arm64 build]
  Link: https://lkml.kernel.org/r/ZgQvNKGdlDkwhQEX@casper.infradead.org
Link: https://lkml.kernel.org/r/20240326171045.410737-8-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent b84fd283

arch/arm/include/asm/hugetlb.h

+3 −3
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
#include <asm/hugetlb-3level.h>

#include <asm-generic/hugetlb.h>



static inline void arch_clear_hugepage_flags(struct page *page)

static inline void arch_clear_hugetlb_flags(struct folio *folio)

{

	clear_bit(PG_dcache_clean, &page->flags);

	clear_bit(PG_dcache_clean, &folio->flags);

}

#define arch_clear_hugepage_flags arch_clear_hugepage_flags

#define arch_clear_hugetlb_flags arch_clear_hugetlb_flags



#endif /* _ASM_ARM_HUGETLB_H */

arch/arm64/include/asm/hugetlb.h

+3 −3
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ 
extern bool arch_hugetlb_migration_supported(struct hstate *h);

#endif



static inline void arch_clear_hugepage_flags(struct page *page)

static inline void arch_clear_hugetlb_flags(struct folio *folio)

{

	clear_bit(PG_dcache_clean, &page->flags);

	clear_bit(PG_dcache_clean, &folio->flags);

}

#define arch_clear_hugepage_flags arch_clear_hugepage_flags

#define arch_clear_hugetlb_flags arch_clear_hugetlb_flags



pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags);

#define arch_make_huge_pte arch_make_huge_pte

arch/riscv/include/asm/hugetlb.h

+3 −3
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ 
#include <asm/cacheflush.h>

#include <asm/page.h>



static inline void arch_clear_hugepage_flags(struct page *page)

static inline void arch_clear_hugetlb_flags(struct folio *folio)

{

	clear_bit(PG_dcache_clean, &page->flags);

	clear_bit(PG_dcache_clean, &folio->flags);

}

#define arch_clear_hugepage_flags arch_clear_hugepage_flags

#define arch_clear_hugetlb_flags arch_clear_hugetlb_flags



#ifdef CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION

bool arch_hugetlb_migration_supported(struct hstate *h);

arch/s390/include/asm/hugetlb.h

+3 −3
Original line number Diff line number Diff line
@@ -39,11 +39,11 @@ static inline int prepare_hugepage_range(struct file *file, 
	return 0;

}



static inline void arch_clear_hugepage_flags(struct page *page)

static inline void arch_clear_hugetlb_flags(struct folio *folio)

{

	clear_bit(PG_arch_1, &page->flags);

	clear_bit(PG_arch_1, &folio->flags);

}

#define arch_clear_hugepage_flags arch_clear_hugepage_flags

#define arch_clear_hugetlb_flags arch_clear_hugetlb_flags



static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr,

				  pte_t *ptep, unsigned long sz)

arch/sh/include/asm/hugetlb.h

+3 −3
Original line number Diff line number Diff line
@@ -27,11 +27,11 @@ static inline pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, 
	return *ptep;

}



static inline void arch_clear_hugepage_flags(struct page *page)

static inline void arch_clear_hugetlb_flags(struct folio *folio)

{

	clear_bit(PG_dcache_clean, &page->flags);

	clear_bit(PG_dcache_clean, &folio->flags);

}

#define arch_clear_hugepage_flags arch_clear_hugepage_flags

#define arch_clear_hugetlb_flags arch_clear_hugetlb_flags



#include <asm-generic/hugetlb.h>