Commit 1e5f50fc authored by Alexandre Ghiti's avatar Alexandre Ghiti Committed by Linus Torvalds

hugetlb: introduce generic version of hugetlb_free_pgd_range

arm, arm64, mips, parisc, sh, x86 architectures use the same version of
hugetlb_free_pgd_range, so move this generic implementation into
asm-generic/hugetlb.h.

Link: http://lkml.kernel.org/r/20180920060358.16606-3-alex@ghiti.frSigned-off-by: default avatarAlexandre Ghiti <alex@ghiti.fr>
Reviewed-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Tested-by: Helge Deller <deller@gmx.de>			[parisc]
Acked-by: Catalin Marinas <catalin.marinas@arm.com>	[arm64]
Acked-by: Paul Burton <paul.burton@mips.com>		[MIPS]
Acked-by: Ingo Molnar <mingo@kernel.org>		[x86]
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James E.J. Bottomley <jejb@parisc-linux.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d018498c
...@@ -27,15 +27,6 @@ ...@@ -27,15 +27,6 @@
#include <asm/hugetlb-3level.h> #include <asm/hugetlb-3level.h>
static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb,
unsigned long addr, unsigned long end,
unsigned long floor,
unsigned long ceiling)
{
free_pgd_range(tlb, addr, end, floor, ceiling);
}
static inline int is_hugepage_only_range(struct mm_struct *mm, static inline int is_hugepage_only_range(struct mm_struct *mm,
unsigned long addr, unsigned long len) unsigned long addr, unsigned long len)
{ {
......
...@@ -25,16 +25,6 @@ static inline pte_t huge_ptep_get(pte_t *ptep) ...@@ -25,16 +25,6 @@ static inline pte_t huge_ptep_get(pte_t *ptep)
return READ_ONCE(*ptep); return READ_ONCE(*ptep);
} }
static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb,
unsigned long addr, unsigned long end,
unsigned long floor,
unsigned long ceiling)
{
free_pgd_range(tlb, addr, end, floor, ceiling);
}
static inline int is_hugepage_only_range(struct mm_struct *mm, static inline int is_hugepage_only_range(struct mm_struct *mm,
unsigned long addr, unsigned long len) unsigned long addr, unsigned long len)
{ {
......
...@@ -3,9 +3,8 @@ ...@@ -3,9 +3,8 @@
#define _ASM_IA64_HUGETLB_H #define _ASM_IA64_HUGETLB_H
#include <asm/page.h> #include <asm/page.h>
#include <asm-generic/hugetlb.h>
#define __HAVE_ARCH_HUGETLB_FREE_PGD_RANGE
void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr, void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr,
unsigned long end, unsigned long floor, unsigned long end, unsigned long floor,
unsigned long ceiling); unsigned long ceiling);
...@@ -70,4 +69,6 @@ static inline void arch_clear_hugepage_flags(struct page *page) ...@@ -70,4 +69,6 @@ static inline void arch_clear_hugepage_flags(struct page *page)
{ {
} }
#include <asm-generic/hugetlb.h>
#endif /* _ASM_IA64_HUGETLB_H */ #endif /* _ASM_IA64_HUGETLB_H */
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
#define __ASM_HUGETLB_H #define __ASM_HUGETLB_H
#include <asm/page.h> #include <asm/page.h>
#include <asm-generic/hugetlb.h>
static inline int is_hugepage_only_range(struct mm_struct *mm, static inline int is_hugepage_only_range(struct mm_struct *mm,
unsigned long addr, unsigned long addr,
...@@ -38,15 +36,6 @@ static inline int prepare_hugepage_range(struct file *file, ...@@ -38,15 +36,6 @@ static inline int prepare_hugepage_range(struct file *file,
return 0; return 0;
} }
static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb,
unsigned long addr,
unsigned long end,
unsigned long floor,
unsigned long ceiling)
{
free_pgd_range(tlb, addr, end, floor, ceiling);
}
static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
pte_t *ptep, pte_t pte) pte_t *ptep, pte_t pte)
{ {
...@@ -114,4 +103,6 @@ static inline void arch_clear_hugepage_flags(struct page *page) ...@@ -114,4 +103,6 @@ static inline void arch_clear_hugepage_flags(struct page *page)
{ {
} }
#include <asm-generic/hugetlb.h>
#endif /* __ASM_HUGETLB_H */ #endif /* __ASM_HUGETLB_H */
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
#define _ASM_PARISC64_HUGETLB_H #define _ASM_PARISC64_HUGETLB_H
#include <asm/page.h> #include <asm/page.h>
#include <asm-generic/hugetlb.h>
void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
pte_t *ptep, pte_t pte); pte_t *ptep, pte_t pte);
...@@ -32,14 +30,6 @@ static inline int prepare_hugepage_range(struct file *file, ...@@ -32,14 +30,6 @@ static inline int prepare_hugepage_range(struct file *file,
return 0; return 0;
} }
static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb,
unsigned long addr, unsigned long end,
unsigned long floor,
unsigned long ceiling)
{
free_pgd_range(tlb, addr, end, floor, ceiling);
}
static inline void huge_ptep_clear_flush(struct vm_area_struct *vma, static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
unsigned long addr, pte_t *ptep) unsigned long addr, pte_t *ptep)
{ {
...@@ -71,4 +61,6 @@ static inline void arch_clear_hugepage_flags(struct page *page) ...@@ -71,4 +61,6 @@ static inline void arch_clear_hugepage_flags(struct page *page)
{ {
} }
#include <asm-generic/hugetlb.h>
#endif /* _ASM_PARISC64_HUGETLB_H */ #endif /* _ASM_PARISC64_HUGETLB_H */
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#ifdef CONFIG_HUGETLB_PAGE #ifdef CONFIG_HUGETLB_PAGE
#include <asm/page.h> #include <asm/page.h>
#include <asm-generic/hugetlb.h>
extern struct kmem_cache *hugepte_cache; extern struct kmem_cache *hugepte_cache;
...@@ -110,6 +109,7 @@ static inline void flush_hugetlb_page(struct vm_area_struct *vma, ...@@ -110,6 +109,7 @@ static inline void flush_hugetlb_page(struct vm_area_struct *vma,
void flush_hugetlb_page(struct vm_area_struct *vma, unsigned long vmaddr); void flush_hugetlb_page(struct vm_area_struct *vma, unsigned long vmaddr);
#endif #endif
#define __HAVE_ARCH_HUGETLB_FREE_PGD_RANGE
void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr, void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr,
unsigned long end, unsigned long floor, unsigned long end, unsigned long floor,
unsigned long ceiling); unsigned long ceiling);
...@@ -176,6 +176,8 @@ static inline void arch_clear_hugepage_flags(struct page *page) ...@@ -176,6 +176,8 @@ static inline void arch_clear_hugepage_flags(struct page *page)
{ {
} }
#include <asm-generic/hugetlb.h>
#else /* ! CONFIG_HUGETLB_PAGE */ #else /* ! CONFIG_HUGETLB_PAGE */
static inline void flush_hugetlb_page(struct vm_area_struct *vma, static inline void flush_hugetlb_page(struct vm_area_struct *vma,
unsigned long vmaddr) unsigned long vmaddr)
......
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm-generic/hugetlb.h>
static inline int is_hugepage_only_range(struct mm_struct *mm, static inline int is_hugepage_only_range(struct mm_struct *mm,
unsigned long addr, unsigned long addr,
...@@ -27,14 +25,6 @@ static inline int prepare_hugepage_range(struct file *file, ...@@ -27,14 +25,6 @@ static inline int prepare_hugepage_range(struct file *file,
return 0; return 0;
} }
static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb,
unsigned long addr, unsigned long end,
unsigned long floor,
unsigned long ceiling)
{
free_pgd_range(tlb, addr, end, floor, ceiling);
}
static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
pte_t *ptep, pte_t pte) pte_t *ptep, pte_t pte)
{ {
...@@ -85,4 +75,6 @@ static inline void arch_clear_hugepage_flags(struct page *page) ...@@ -85,4 +75,6 @@ static inline void arch_clear_hugepage_flags(struct page *page)
clear_bit(PG_dcache_clean, &page->flags); clear_bit(PG_dcache_clean, &page->flags);
} }
#include <asm-generic/hugetlb.h>
#endif /* _ASM_SH_HUGETLB_H */ #endif /* _ASM_SH_HUGETLB_H */
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#define _ASM_SPARC64_HUGETLB_H #define _ASM_SPARC64_HUGETLB_H
#include <asm/page.h> #include <asm/page.h>
#include <asm-generic/hugetlb.h>
#ifdef CONFIG_HUGETLB_PAGE #ifdef CONFIG_HUGETLB_PAGE
struct pud_huge_patch_entry { struct pud_huge_patch_entry {
...@@ -84,8 +83,11 @@ static inline void arch_clear_hugepage_flags(struct page *page) ...@@ -84,8 +83,11 @@ static inline void arch_clear_hugepage_flags(struct page *page)
{ {
} }
#define __HAVE_ARCH_HUGETLB_FREE_PGD_RANGE
void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr, void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr,
unsigned long end, unsigned long floor, unsigned long end, unsigned long floor,
unsigned long ceiling); unsigned long ceiling);
#include <asm-generic/hugetlb.h>
#endif /* _ASM_SPARC64_HUGETLB_H */ #endif /* _ASM_SPARC64_HUGETLB_H */
...@@ -28,14 +28,6 @@ static inline int prepare_hugepage_range(struct file *file, ...@@ -28,14 +28,6 @@ static inline int prepare_hugepage_range(struct file *file,
return 0; return 0;
} }
static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb,
unsigned long addr, unsigned long end,
unsigned long floor,
unsigned long ceiling)
{
free_pgd_range(tlb, addr, end, floor, ceiling);
}
static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
pte_t *ptep, pte_t pte) pte_t *ptep, pte_t pte)
{ {
......
...@@ -40,4 +40,15 @@ static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr, ...@@ -40,4 +40,15 @@ static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr,
} }
#endif #endif
#ifndef __HAVE_ARCH_HUGETLB_FREE_PGD_RANGE
static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb,
unsigned long addr, unsigned long end,
unsigned long floor, unsigned long ceiling)
{
free_pgd_range(tlb, addr, end, floor, ceiling);
}
#endif
#endif /* _ASM_GENERIC_HUGETLB_H */ #endif /* _ASM_GENERIC_HUGETLB_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment