Commit c5b27a88 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

sh/tlb: Convert SH to generic mmu_gather 



Generic mmu_gather provides everything SH needs (range tracking and
cache coherency).

No change in behavior intended.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Nick Piggin <npiggin@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rich Felker <dalias@libc.org>
Cc: Rik van Riel <riel@surriel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent e1547007

arch/sh/include/asm/pgalloc.h

+9 −0
Original line number Diff line number Diff line
@@ -70,6 +70,15 @@ do { \ 
	tlb_remove_page((tlb), (pte));			\

} while (0)



#if CONFIG_PGTABLE_LEVELS > 2

#define __pmd_free_tlb(tlb, pmdp, addr)			\

do {							\

	struct page *page = virt_to_page(pmdp);		\

	pgtable_pmd_page_dtor(page);			\

	tlb_remove_page((tlb), page);			\

} while (0);

#endif



static inline void check_pgt_cache(void)

{

	quicklist_trim(QUICK_PT, NULL, 25, 16);

arch/sh/include/asm/tlb.h

+1 −129
Original line number Diff line number Diff line
@@ -11,131 +11,8 @@ 


#ifdef CONFIG_MMU

#include <linux/swap.h>

#include <asm/pgalloc.h>

#include <asm/tlbflush.h>

#include <asm/mmu_context.h>



/*

 * TLB handling.  This allows us to remove pages from the page

 * tables, and efficiently handle the TLB issues.

 */

struct mmu_gather {

	struct mm_struct	*mm;

	unsigned int		fullmm;

	unsigned long		start, end;

};



static inline void init_tlb_gather(struct mmu_gather *tlb)

{

	tlb->start = TASK_SIZE;

	tlb->end = 0;



	if (tlb->fullmm) {

		tlb->start = 0;

		tlb->end = TASK_SIZE;

	}

}



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;

	tlb->end = end;

	tlb->fullmm = !(start | (end+1));



	init_tlb_gather(tlb);

}



static inline void

arch_tlb_finish_mmu(struct mmu_gather *tlb,

		unsigned long start, unsigned long end, bool force)

{

	if (tlb->fullmm || force)

		flush_tlb_mm(tlb->mm);



	/* keep the page table cache within bounds */

	check_pgt_cache();

}



static inline void

tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep, unsigned long address)

{

	if (tlb->start > address)

		tlb->start = address;

	if (tlb->end < address + PAGE_SIZE)

		tlb->end = address + PAGE_SIZE;

}



#define tlb_remove_huge_tlb_entry(h, tlb, ptep, address)	\

	tlb_remove_tlb_entry(tlb, ptep, address)



/*

 * In the case of tlb vma handling, we can optimise these away in the

 * case where we're doing a full MM flush.  When we're doing a munmap,

 * the vmas are adjusted to only cover the region to be torn down.

 */

static inline void

tlb_start_vma(struct mmu_gather *tlb, struct vm_area_struct *vma)

{

	if (!tlb->fullmm)

		flush_cache_range(vma, vma->vm_start, vma->vm_end);

}



static inline void

tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vma)

{

	if (!tlb->fullmm && tlb->end) {

		flush_tlb_range(vma, tlb->start, tlb->end);

		init_tlb_gather(tlb);

	}

}



static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb)

{

}



static inline void tlb_flush_mmu_free(struct mmu_gather *tlb)

{

}



static inline void tlb_flush_mmu(struct mmu_gather *tlb)

{

}



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

{

	free_page_and_swap_cache(page);

	return false; /* avoid calling tlb_flush_mmu */

}



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

{

	__tlb_remove_page(tlb, page);

}



static inline bool __tlb_remove_page_size(struct mmu_gather *tlb,

					  struct page *page, int page_size)

{

	return __tlb_remove_page(tlb, page);

}



static inline void tlb_remove_page_size(struct mmu_gather *tlb,

					struct page *page, int page_size)

{

	return tlb_remove_page(tlb, page);

}



static inline void tlb_change_page_size(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)



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

#include <asm-generic/tlb.h>



#if defined(CONFIG_CPU_SH4) || defined(CONFIG_SUPERH64)

extern void tlb_wire_entry(struct vm_area_struct *, unsigned long, pte_t);
@@ -155,11 +32,6 @@ static inline void tlb_unwire_entry(void) 


#else /* CONFIG_MMU */



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

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

#define __tlb_remove_tlb_entry(tlb, pte, address)	do { } while (0)

#define tlb_flush(tlb)					do { } while (0)



#include <asm-generic/tlb.h>



#endif /* CONFIG_MMU */

CRA Git | Maintained and supported by SUSTech CRA and CCSE