Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cec90e9 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mm: refactor pgtable freeing functions on nohash 



pgtable_free() and others are identical on nohash/32 and 64,
so move them into asm/nohash/pgalloc.h

Reviewed-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent bf8156c5

arch/powerpc/include/asm/nohash/32/pgalloc.h

+0 −43
Original line number Diff line number Diff line
@@ -45,47 +45,4 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmdp, 


#define pmd_pgtable(pmd) ((pgtable_t)pmd_page_vaddr(pmd))



static inline void pgtable_free(void *table, unsigned index_size)

{

	if (!index_size) {

		pte_fragment_free((unsigned long *)table, 0);

	} else {

		BUG_ON(index_size > MAX_PGTABLE_INDEX_SIZE);

		kmem_cache_free(PGT_CACHE(index_size), table);

	}

}



#define get_hugepd_cache_index(x)	(x)



#ifdef CONFIG_SMP

static inline void pgtable_free_tlb(struct mmu_gather *tlb,

				    void *table, int shift)

{

	unsigned long pgf = (unsigned long)table;

	BUG_ON(shift > MAX_PGTABLE_INDEX_SIZE);

	pgf |= shift;

	tlb_remove_table(tlb, (void *)pgf);

}



static inline void __tlb_remove_table(void *_table)

{

	void *table = (void *)((unsigned long)_table & ~MAX_PGTABLE_INDEX_SIZE);

	unsigned shift = (unsigned long)_table & MAX_PGTABLE_INDEX_SIZE;



	pgtable_free(table, shift);

}

#else

static inline void pgtable_free_tlb(struct mmu_gather *tlb,

				    void *table, int shift)

{

	pgtable_free(table, shift);

}

#endif



static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table,

				  unsigned long address)

{

	tlb_flush_pgtable(tlb, address);

	pgtable_free_tlb(tlb, table, 0);

}

#endif /* _ASM_POWERPC_PGALLOC_32_H */

arch/powerpc/include/asm/nohash/64/pgalloc.h

+0 −43
Original line number Diff line number Diff line
@@ -72,49 +72,6 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) 
	kmem_cache_free(PGT_CACHE(PMD_CACHE_INDEX), pmd);

}



static inline void pgtable_free(void *table, int shift)

{

	if (!shift) {

		pte_fragment_free((unsigned long *)table, 0);

	} else {

		BUG_ON(shift > MAX_PGTABLE_INDEX_SIZE);

		kmem_cache_free(PGT_CACHE(shift), table);

	}

}



#define get_hugepd_cache_index(x)	(x)

#ifdef CONFIG_SMP

static inline void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift)

{

	unsigned long pgf = (unsigned long)table;



	BUG_ON(shift > MAX_PGTABLE_INDEX_SIZE);

	pgf |= shift;

	tlb_remove_table(tlb, (void *)pgf);

}



static inline void __tlb_remove_table(void *_table)

{

	void *table = (void *)((unsigned long)_table & ~MAX_PGTABLE_INDEX_SIZE);

	unsigned shift = (unsigned long)_table & MAX_PGTABLE_INDEX_SIZE;



	pgtable_free(table, shift);

}



#else

static inline void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift)

{

	pgtable_free(table, shift);

}

#endif



static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table,

				  unsigned long address)

{

	tlb_flush_pgtable(tlb, address);

	pgtable_free_tlb(tlb, table, 0);

}



#define __pmd_free_tlb(tlb, pmd, addr)		      \

	pgtable_free_tlb(tlb, pmd, PMD_CACHE_INDEX)

#define __pud_free_tlb(tlb, pud, addr)		      \

arch/powerpc/include/asm/nohash/pgalloc.h

+44 −0
Original line number Diff line number Diff line
@@ -21,4 +21,48 @@ static inline void tlb_flush_pgtable(struct mmu_gather *tlb, 
#else

#include <asm/nohash/32/pgalloc.h>

#endif



static inline void pgtable_free(void *table, int shift)

{

	if (!shift) {

		pte_fragment_free((unsigned long *)table, 0);

	} else {

		BUG_ON(shift > MAX_PGTABLE_INDEX_SIZE);

		kmem_cache_free(PGT_CACHE(shift), table);

	}

}



#define get_hugepd_cache_index(x)	(x)



#ifdef CONFIG_SMP

static inline void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift)

{

	unsigned long pgf = (unsigned long)table;



	BUG_ON(shift > MAX_PGTABLE_INDEX_SIZE);

	pgf |= shift;

	tlb_remove_table(tlb, (void *)pgf);

}



static inline void __tlb_remove_table(void *_table)

{

	void *table = (void *)((unsigned long)_table & ~MAX_PGTABLE_INDEX_SIZE);

	unsigned shift = (unsigned long)_table & MAX_PGTABLE_INDEX_SIZE;



	pgtable_free(table, shift);

}



#else

static inline void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift)

{

	pgtable_free(table, shift);

}

#endif



static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table,

				  unsigned long address)

{

	tlb_flush_pgtable(tlb, address);

	pgtable_free_tlb(tlb, table, 0);

}

#endif /* _ASM_POWERPC_NOHASH_PGALLOC_H */