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

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

mm: remove the page size change check in tlb_remove_page 

Now that we check for page size change early in the loop, we can
partially revert e9d55e15 ("mm: change the interface for
__tlb_remove_page").

This simplies the code much, by removing the need to track the last
address with which we adjusted the range.  We also go back to the older
way of filling the mmu_gather array, ie, we add an entry and then check
whether the gather batch is full.

Link: http://lkml.kernel.org/r/20161026084839.27299-6-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 07e32661

arch/arm/include/asm/tlb.h

+3 −10
Original line number Diff line number Diff line
@@ -213,18 +213,17 @@ tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vma) 


static inline bool __tlb_remove_page(struct mmu_gather *tlb, struct page *page)

{

	tlb->pages[tlb->nr++] = page;

	VM_WARN_ON(tlb->nr > tlb->max);

	if (tlb->nr == tlb->max)

		return true;

	tlb->pages[tlb->nr++] = page;

	return false;

}



static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)

{

	if (__tlb_remove_page(tlb, page)) {

	if (__tlb_remove_page(tlb, page))

		tlb_flush_mmu(tlb);

		__tlb_remove_page(tlb, page);

	}

}



static inline bool __tlb_remove_page_size(struct mmu_gather *tlb,
@@ -233,12 +232,6 @@ static inline bool __tlb_remove_page_size(struct mmu_gather *tlb, 
	return __tlb_remove_page(tlb, page);

}



static inline bool __tlb_remove_pte_page(struct mmu_gather *tlb,

					 struct page *page)

{

	return __tlb_remove_page(tlb, page);

}



static inline void tlb_remove_page_size(struct mmu_gather *tlb,

					struct page *page, int page_size)

{

arch/ia64/include/asm/tlb.h

+4 −12
Original line number Diff line number Diff line
@@ -207,15 +207,15 @@ tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end) 
 */

static inline bool __tlb_remove_page(struct mmu_gather *tlb, struct page *page)

{

	if (tlb->nr == tlb->max)

		return true;



	tlb->need_flush = 1;



	if (!tlb->nr && tlb->pages == tlb->local)

		__tlb_alloc_page(tlb);



	tlb->pages[tlb->nr++] = page;

	VM_WARN_ON(tlb->nr > tlb->max);

	if (tlb->nr == tlb->max)

		return true;

	return false;

}
@@ -236,10 +236,8 @@ static inline void tlb_flush_mmu(struct mmu_gather *tlb) 


static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)

{

	if (__tlb_remove_page(tlb, page)) {

	if (__tlb_remove_page(tlb, page))

		tlb_flush_mmu(tlb);

		__tlb_remove_page(tlb, page);

	}

}



static inline bool __tlb_remove_page_size(struct mmu_gather *tlb,
@@ -248,12 +246,6 @@ static inline bool __tlb_remove_page_size(struct mmu_gather *tlb, 
	return __tlb_remove_page(tlb, page);

}



static inline bool __tlb_remove_pte_page(struct mmu_gather *tlb,

					 struct page *page)

{

	return __tlb_remove_page(tlb, page);

}



static inline void tlb_remove_page_size(struct mmu_gather *tlb,

					struct page *page, int page_size)

{

arch/s390/include/asm/tlb.h

+0 −6
Original line number Diff line number Diff line
@@ -104,12 +104,6 @@ static inline bool __tlb_remove_page_size(struct mmu_gather *tlb, 
	return __tlb_remove_page(tlb, page);

}



static inline bool __tlb_remove_pte_page(struct mmu_gather *tlb,

					 struct page *page)

{

	return __tlb_remove_page(tlb, page);

}



static inline void tlb_remove_page_size(struct mmu_gather *tlb,

					struct page *page, int page_size)

{

arch/sh/include/asm/tlb.h

+0 −6
Original line number Diff line number Diff line
@@ -118,12 +118,6 @@ static inline bool __tlb_remove_page_size(struct mmu_gather *tlb, 
	return __tlb_remove_page(tlb, page);

}



static inline bool __tlb_remove_pte_page(struct mmu_gather *tlb,

					 struct page *page)

{

	return __tlb_remove_page(tlb, page);

}



static inline void tlb_remove_page_size(struct mmu_gather *tlb,

					struct page *page, int page_size)

{

arch/um/include/asm/tlb.h

+0 −6
Original line number Diff line number Diff line
@@ -116,12 +116,6 @@ static inline bool __tlb_remove_page_size(struct mmu_gather *tlb, 
	return __tlb_remove_page(tlb, page);

}



static inline bool __tlb_remove_pte_page(struct mmu_gather *tlb,

					 struct page *page)

{

	return __tlb_remove_page(tlb, page);

}



static inline void tlb_remove_page_size(struct mmu_gather *tlb,

					struct page *page, int page_size)

{