| Message ID | 20210124082230.2118861-7-npiggin@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | huge vmalloc mappings | expand |
Le 24/01/2021 à 09:22, Nicholas Piggin a écrit : > This allows unsupported levels to be constant folded away, and so > p4d_free_pud_page can be removed because it's no longer linked to. Ah, ok, you did it here. Why not squashing this patch into patch 5 directly ? > > Cc: linuxppc-dev@lists.ozlabs.org > Acked-by: Michael Ellerman <mpe@ellerman.id.au> > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > --- > arch/powerpc/include/asm/vmalloc.h | 19 ++++++++++++++++--- > arch/powerpc/mm/book3s64/radix_pgtable.c | 21 --------------------- > 2 files changed, 16 insertions(+), 24 deletions(-) > > diff --git a/arch/powerpc/include/asm/vmalloc.h b/arch/powerpc/include/asm/vmalloc.h > index 105abb73f075..3f0c153befb0 100644 > --- a/arch/powerpc/include/asm/vmalloc.h > +++ b/arch/powerpc/include/asm/vmalloc.h > @@ -1,12 +1,25 @@ > #ifndef _ASM_POWERPC_VMALLOC_H > #define _ASM_POWERPC_VMALLOC_H > > +#include <asm/mmu.h> > #include <asm/page.h> > > #ifdef CONFIG_HAVE_ARCH_HUGE_VMAP > -bool arch_vmap_p4d_supported(pgprot_t prot); > -bool arch_vmap_pud_supported(pgprot_t prot); > -bool arch_vmap_pmd_supported(pgprot_t prot); > +static inline bool arch_vmap_p4d_supported(pgprot_t prot) > +{ > + return false; > +} > + > +static inline bool arch_vmap_pud_supported(pgprot_t prot) > +{ > + /* HPT does not cope with large pages in the vmalloc area */ > + return radix_enabled(); > +} > + > +static inline bool arch_vmap_pmd_supported(pgprot_t prot) > +{ > + return radix_enabled(); > +} > #endif > > #endif /* _ASM_POWERPC_VMALLOC_H */ > diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c > index 743807fc210f..8da62afccee5 100644 > --- a/arch/powerpc/mm/book3s64/radix_pgtable.c > +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c > @@ -1082,22 +1082,6 @@ void radix__ptep_modify_prot_commit(struct vm_area_struct *vma, > set_pte_at(mm, addr, ptep, pte); > } > > -bool arch_vmap_pud_supported(pgprot_t prot) > -{ > - /* HPT does not cope with large pages in the vmalloc area */ > - return radix_enabled(); > -} > - > -bool arch_vmap_pmd_supported(pgprot_t prot) > -{ > - return radix_enabled(); > -} > - > -int p4d_free_pud_page(p4d_t *p4d, unsigned long addr) > -{ > - return 0; > -} > - > int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot) > { > pte_t *ptep = (pte_t *)pud; > @@ -1181,8 +1165,3 @@ int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) > > return 1; > } > - > -bool arch_vmap_p4d_supported(pgprot_t prot) > -{ > - return false; > -} >
Excerpts from Christophe Leroy's message of January 25, 2021 6:42 pm: > > > Le 24/01/2021 à 09:22, Nicholas Piggin a écrit : >> This allows unsupported levels to be constant folded away, and so >> p4d_free_pud_page can be removed because it's no longer linked to. > > Ah, ok, you did it here. Why not squashing this patch into patch 5 directly ? To reduce arch code movement in the first patch and split up these arch patches to get separate acks for them. Maybe overkill for these changes but doesn't hurt I think. Thanks, Nick
diff --git a/arch/powerpc/include/asm/vmalloc.h b/arch/powerpc/include/asm/vmalloc.h index 105abb73f075..3f0c153befb0 100644 --- a/arch/powerpc/include/asm/vmalloc.h +++ b/arch/powerpc/include/asm/vmalloc.h @@ -1,12 +1,25 @@ #ifndef _ASM_POWERPC_VMALLOC_H #define _ASM_POWERPC_VMALLOC_H +#include <asm/mmu.h> #include <asm/page.h> #ifdef CONFIG_HAVE_ARCH_HUGE_VMAP -bool arch_vmap_p4d_supported(pgprot_t prot); -bool arch_vmap_pud_supported(pgprot_t prot); -bool arch_vmap_pmd_supported(pgprot_t prot); +static inline bool arch_vmap_p4d_supported(pgprot_t prot) +{ + return false; +} + +static inline bool arch_vmap_pud_supported(pgprot_t prot) +{ + /* HPT does not cope with large pages in the vmalloc area */ + return radix_enabled(); +} + +static inline bool arch_vmap_pmd_supported(pgprot_t prot) +{ + return radix_enabled(); +} #endif #endif /* _ASM_POWERPC_VMALLOC_H */ diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c index 743807fc210f..8da62afccee5 100644 --- a/arch/powerpc/mm/book3s64/radix_pgtable.c +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c @@ -1082,22 +1082,6 @@ void radix__ptep_modify_prot_commit(struct vm_area_struct *vma, set_pte_at(mm, addr, ptep, pte); } -bool arch_vmap_pud_supported(pgprot_t prot) -{ - /* HPT does not cope with large pages in the vmalloc area */ - return radix_enabled(); -} - -bool arch_vmap_pmd_supported(pgprot_t prot) -{ - return radix_enabled(); -} - -int p4d_free_pud_page(p4d_t *p4d, unsigned long addr) -{ - return 0; -} - int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot) { pte_t *ptep = (pte_t *)pud; @@ -1181,8 +1165,3 @@ int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) return 1; } - -bool arch_vmap_p4d_supported(pgprot_t prot) -{ - return false; -}