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

Commit 56236a59 authored by Minchan Kim's avatar Minchan Kim Committed by Linus Torvalds
Browse files

mm: refactor TLB gathering API 

This patch is a preparatory patch for solving race problems caused by
TLB batch.  For that, we will increase/decrease TLB flush pending count
of mm_struct whenever tlb_[gather|finish]_mmu is called.

Before making it simple, this patch separates architecture specific part
and rename it to arch_tlb_[gather|finish]_mmu and generic part just
calls it.

It shouldn't change any behavior.

Link: http://lkml.kernel.org/r/20170802000818.4760-5-namit@vmware.com


Signed-off-by: default avatarMinchan Kim <minchan@kernel.org>
Signed-off-by: default avatarNadav Amit <namit@vmware.com>
Acked-by: default avatarMel Gorman <mgorman@techsingularity.net>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Nadav Amit <nadav.amit@gmail.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a9b80250

arch/arm/include/asm/tlb.h

+4 −2
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ static inline void tlb_flush_mmu(struct mmu_gather *tlb) 
}



static inline void

tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start, unsigned long end)

arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,

			unsigned long start, unsigned long end)

{

	tlb->mm = mm;

	tlb->fullmm = !(start | (end+1));
@@ -166,7 +167,8 @@ tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start 
}



static inline void

tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)

arch_tlb_finish_mmu(struct mmu_gather *tlb,

			unsigned long start, unsigned long end)

{

	tlb_flush_mmu(tlb);

arch/ia64/include/asm/tlb.h

+4 −2
Original line number Diff line number Diff line
@@ -168,7 +168,8 @@ static inline void __tlb_alloc_page(struct mmu_gather *tlb) 




static inline void

tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start, unsigned long end)

arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,

			unsigned long start, unsigned long end)

{

	tlb->mm = mm;

	tlb->max = ARRAY_SIZE(tlb->local);
@@ -185,7 +186,8 @@ tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start 
 * collected.

 */

static inline void

tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)

arch_tlb_finish_mmu(struct mmu_gather *tlb,

			unsigned long start, unsigned long end)

{

	/*

	 * Note: tlb->nr may be 0 at this point, so we can't rely on tlb->start_addr and

arch/s390/include/asm/tlb.h

+6 −6
Original line number Diff line number Diff line
@@ -47,10 +47,9 @@ struct mmu_table_batch { 
extern void tlb_table_flush(struct mmu_gather *tlb);

extern void tlb_remove_table(struct mmu_gather *tlb, void *table);



static inline void tlb_gather_mmu(struct mmu_gather *tlb,

				  struct mm_struct *mm,

				  unsigned long start,

				  unsigned long end)

static inline void

arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,

			unsigned long start, unsigned long end)

{

	tlb->mm = mm;

	tlb->start = start;
@@ -76,7 +75,8 @@ static inline void tlb_flush_mmu(struct mmu_gather *tlb) 
	tlb_flush_mmu_free(tlb);

}



static inline void tlb_finish_mmu(struct mmu_gather *tlb,

static inline void

arch_tlb_finish_mmu(struct mmu_gather *tlb,

		unsigned long start, unsigned long end)

{

	tlb_flush_mmu(tlb);

arch/sh/include/asm/tlb.h

+4 −2
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ static inline void init_tlb_gather(struct mmu_gather *tlb) 
}



static inline void

tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start, unsigned long end)

arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,

		unsigned long start, unsigned long end)

{

	tlb->mm = mm;

	tlb->start = start;
@@ -47,7 +48,8 @@ tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start 
}



static inline void

tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)

arch_tlb_finish_mmu(struct mmu_gather *tlb,

		unsigned long start, unsigned long end)

{

	if (tlb->fullmm)

		flush_tlb_mm(tlb->mm);

arch/um/include/asm/tlb.h

+5 −3
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ static inline void init_tlb_gather(struct mmu_gather *tlb) 
}



static inline void

tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned long start, unsigned long end)

arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,

		unsigned long start, unsigned long end)

{

	tlb->mm = mm;

	tlb->start = start;
@@ -80,12 +81,13 @@ tlb_flush_mmu(struct mmu_gather *tlb) 
	tlb_flush_mmu_free(tlb);

}



/* tlb_finish_mmu

/* arch_tlb_finish_mmu

 *	Called at the end of the shootdown operation to free up any resources

 *	that were required.

 */

static inline void

tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)

arch_tlb_finish_mmu(struct mmu_gather *tlb,

		unsigned long start, unsigned long end)

{

	tlb_flush_mmu(tlb);