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

Commit 07e32661 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Linus Torvalds
Browse files

mm: add tlb_remove_check_page_size_change to track page size change 

With commit e77b0852 ("mm/mmu_gather: track page size with mmu
gather and force flush if page size change") we added the ability to
force a tlb flush when the page size change in a mmu_gather loop.  We
did that by checking for a page size change every time we added a page
to mmu_gather for lazy flush/remove.  We can improve that by moving the
page size change check early and not doing it every time we add a page.

This also helps us to do tlb flush when invalidating a range covering
dax mapping.  Wrt dax mapping we don't have a backing struct page and
hence we don't call tlb_remove_page, which earlier forced the tlb flush
on page size change.  Moving the page size change check earlier means we
will do the same even for dax mapping.

We also avoid doing this check on architecture other than powerpc.

In a later patch we will remove page size check from tlb_remove_page().

Link: http://lkml.kernel.org/r/20161026084839.27299-5-aneesh.kumar@linux.vnet.ibm.com


Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b528e4b6

arch/arm/include/asm/tlb.h

+6 −0
Original line number Diff line number Diff line
@@ -286,5 +286,11 @@ tlb_remove_pmd_tlb_entry(struct mmu_gather *tlb, pmd_t *pmdp, unsigned long addr 


#define tlb_migrate_finish(mm)		do { } while (0)



#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change

static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,

						     unsigned int page_size)

{

}



#endif /* CONFIG_MMU */

#endif

arch/ia64/include/asm/tlb.h

+6 −0
Original line number Diff line number Diff line
@@ -286,6 +286,12 @@ do { \ 
#define tlb_remove_huge_tlb_entry(h, tlb, ptep, address)	\

	tlb_remove_tlb_entry(tlb, ptep, address)



#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change

static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,

						     unsigned int page_size)

{

}



#define pte_free_tlb(tlb, ptep, address)		\

do {							\

	tlb->need_flush = 1;				\

arch/powerpc/include/asm/tlb.h

+16 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#define tlb_start_vma(tlb, vma)	do { } while (0)

#define tlb_end_vma(tlb, vma)	do { } while (0)

#define __tlb_remove_tlb_entry	__tlb_remove_tlb_entry

#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change



extern void tlb_flush(struct mmu_gather *tlb);
@@ -46,6 +47,21 @@ static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep, 
#endif

}



static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,

						     unsigned int page_size)

{

	if (!tlb->page_size)

		tlb->page_size = page_size;

	else if (tlb->page_size != page_size) {

		tlb_flush_mmu(tlb);

		/*

		 * update the page size after flush for the new

		 * mmu_gather.

		 */

		tlb->page_size = page_size;

	}

}



#ifdef CONFIG_SMP

static inline int mm_is_core_local(struct mm_struct *mm)

{

arch/s390/include/asm/tlb.h

+6 −0
Original line number Diff line number Diff line
@@ -165,4 +165,10 @@ static inline void pud_free_tlb(struct mmu_gather *tlb, pud_t *pud, 
#define tlb_remove_huge_tlb_entry(h, tlb, ptep, address)	\

	tlb_remove_tlb_entry(tlb, ptep, address)



#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change

static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,

						     unsigned int page_size)

{

}



#endif /* _S390_TLB_H */

arch/sh/include/asm/tlb.h

+6 −0
Original line number Diff line number Diff line
@@ -130,6 +130,12 @@ static inline void tlb_remove_page_size(struct mmu_gather *tlb, 
	return tlb_remove_page(tlb, page);

}



#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change

static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,

						     unsigned int page_size)

{

}



#define pte_free_tlb(tlb, ptep, addr)	pte_free((tlb)->mm, ptep)

#define pmd_free_tlb(tlb, pmdp, addr)	pmd_free((tlb)->mm, pmdp)

#define pud_free_tlb(tlb, pudp, addr)	pud_free((tlb)->mm, pudp)