Consolidate tlb.h

Consolidate tlb.h

[Richard Weinberger]

While staring at an UML TLB bug I've noticed that most archs
copy and pasted stuff from each others tlb.h.
This patch series combines common stuff into the generic tlb.h.

[PATCH 01/27] arm64: Override defaults from generic/tlb.h
[PATCH 02/27] powerpc: Override defaults from generic/tlb.h
[PATCH 03/27] generic/tlb.h: Move common defines into generic tlb.h
[PATCH 04/27] alpha: Use generic tlb.h
[PATCH 05/27] arc: Use common bits from generic tlb.h
[PATCH 06/27] avr32: Use common bits from generic tlb.h
[PATCH 07/27] blackfin: Use generic tlb.h
[PATCH 08/27] c6x: Use generic tlb.h
[PATCH 09/27] cris: Use common bits from generic tlb.h
[PATCH 10/27] frv: Use common bits from generic tlb.h
[PATCH 11/27] hexagon: Use common bits from generic tlb.h
[PATCH 12/27] m32r: Use generic tlb.h
[PATCH 13/27] m68k: Use common bits from generic tlb.h
[PATCH 14/27] metag: Use common bits from generic tlb.h
[PATCH 15/27] microblaze: Use generic tlb.h
[PATCH 16/27] mips: Use common bits from generic tlb.h
[PATCH 17/27] mn10300: Use generic tlb.h
[PATCH 18/27] openrisc: Use generic tlb.h
[PATCH 19/27] parisc: Use common bits from generic tlb.h
[PATCH 20/27] powerpc: Use common bits from generic tlb.h
[PATCH 21/27] score: Use generic tlb.h
[PATCH 22/27] sh: Use common bits from generic tlb.h
[PATCH 23/27] sparc: Use common bits from generic tlb.h
[PATCH 24/27] tile: Use generic tlb.h
[PATCH 25/27] unicore32: Use common bits from generic tlb.h
[PATCH 26/27] x86: Use common bits from generic tlb.h
[PATCH 27/27] xtensa: Use common bits from generic tlb.h

 arch/alpha/include/asm/Kbuild      |  1 +
 arch/alpha/include/asm/tlb.h       | 15 ---------------
 arch/arc/include/asm/tlb.h         |  6 +-----
 arch/arm64/include/asm/tlb.h       |  7 +++++++
 arch/avr32/include/asm/tlb.h       |  7 -------
 arch/blackfin/include/asm/Kbuild   |  1 +
 arch/blackfin/include/asm/tlb.h    | 22 ---------------------
 arch/c6x/include/asm/Kbuild        |  1 +
 arch/c6x/include/asm/tlb.h         |  8 --------
 arch/cris/include/asm/tlb.h        | 11 -----------
 arch/frv/include/asm/tlb.h         | 12 ------------
 arch/hexagon/include/asm/Kbuild    |  1 +
 arch/hexagon/include/asm/tlb.h     | 39 --------------------------------------
 arch/m32r/include/asm/Kbuild       |  1 +
 arch/m32r/include/asm/tlb.h        | 20 -------------------
 arch/m68k/include/asm/tlb.h        | 18 +++++-------------
 arch/metag/include/asm/tlb.h       | 10 ----------
 arch/microblaze/include/asm/Kbuild |  1 +
 arch/microblaze/include/asm/tlb.h  | 25 ------------------------
 arch/mips/include/asm/tlb.h        |  7 -------
 arch/mn10300/include/asm/Kbuild    |  1 +
 arch/mn10300/include/asm/pgalloc.h |  2 ++
 arch/mn10300/include/asm/tlb.h     | 34 ---------------------------------
 arch/openrisc/include/asm/Kbuild   |  1 +
 arch/openrisc/include/asm/tlb.h    | 34 ---------------------------------
 arch/parisc/include/asm/tlb.h      |  6 ------
 arch/powerpc/include/asm/pgalloc.h |  1 -
 arch/powerpc/include/asm/tlb.h     |  7 ++++---
 arch/score/include/asm/Kbuild      |  1 +
 arch/score/include/asm/irq.h       |  1 +
 arch/score/include/asm/tlb.h       | 17 -----------------
 arch/sh/include/asm/tlb.h          |  5 -----
 arch/sparc/include/asm/tlb_32.h    |  8 --------
 arch/sparc/include/asm/tlb_64.h    |  3 ---
 arch/tile/include/asm/Kbuild       |  1 +
 arch/tile/include/asm/tlb.h        | 25 ------------------------
 arch/unicore32/include/asm/tlb.h   |  5 -----
 arch/x86/include/asm/tlb.h         |  4 ----
 arch/xtensa/include/asm/tlb.h      | 16 +---------------
 include/asm-generic/tlb.h          | 24 +++++++++++++++++++++++
 40 files changed, 55 insertions(+), 354 deletions(-)

All patches are also available at:
git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc.git tlb-generic-cleanup

Thanks,
//richard

[PATCH 01/27] arm64: Override defaults from generic/tlb.h

[Richard Weinberger]

Make sure to not conflict with the defaults provided
by generic/tlb.h.

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Steve Capper <steve.capper@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/arm64/include/asm/tlb.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm64/include/asm/tlb.h b/arch/arm64/include/asm/tlb.h
index 80e2c08..65a474d 100644
--- a/arch/arm64/include/asm/tlb.h
+++ b/arch/arm64/include/asm/tlb.h
@@ -19,7 +19,14 @@
 #ifndef __ASM_TLB_H
 #define __ASM_TLB_H
 
+/* These defines are needed to override the defaults from asm-generic/tlb.h */
 #define  __tlb_remove_pmd_tlb_entry __tlb_remove_pmd_tlb_entry
+#define tlb_start_vma tlb_start_vma
+#define tlb_end_vma tlb_end_vma
+#define __tlb_remove_tlb_entry __tlb_remove_tlb_entry
+#define tlb_flush tlb_flush
+#define __pte_free_tlb __pte_free_tlb
+#define __pmd_free_tlb __pmd_free_tlb
 
 #include <asm-generic/tlb.h>
 
-- 
1.8.4.2

[PATCH 02/27] powerpc: Override defaults from generic/tlb.h

[Richard Weinberger]

Make sure to not conflict with the defaults provided
by generic/tlb.h.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/powerpc/include/asm/pgalloc.h | 1 -
 arch/powerpc/include/asm/tlb.h     | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/include/asm/pgalloc.h b/arch/powerpc/include/asm/pgalloc.h
index e9a9f60..5fddba7 100644
--- a/arch/powerpc/include/asm/pgalloc.h
+++ b/arch/powerpc/include/asm/pgalloc.h
@@ -3,7 +3,6 @@
 #ifdef __KERNEL__
 
 #include <linux/mm.h>
-#include <asm-generic/tlb.h>
 
 #ifdef CONFIG_PPC_BOOK3E
 extern void tlb_flush_pgtable(struct mmu_gather *tlb, unsigned long address);
diff --git a/arch/powerpc/include/asm/tlb.h b/arch/powerpc/include/asm/tlb.h
index e2b428b..392e5ef 100644
--- a/arch/powerpc/include/asm/tlb.h
+++ b/arch/powerpc/include/asm/tlb.h
@@ -30,6 +30,10 @@
 
 extern void tlb_flush(struct mmu_gather *tlb);
 
+/* These defines are needed to override the defaults from asm-generic/tlb.h */
+#define tlb_flush tlb_flush
+#define __tlb_remove_tlb_entry __tlb_remove_tlb_entry
+
 /* Get the generic bits... */
 #include <asm-generic/tlb.h>
 
-- 
1.8.4.2

[PATCH 03/27] generic/tlb.h: Move common defines into generic tlb.h

[Richard Weinberger]

Move most common defines into the generic tlb.h to avoid
duplicate code.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arch@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 include/asm-generic/tlb.h | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
index 5672d7e..6e15413 100644
--- a/include/asm-generic/tlb.h
+++ b/include/asm-generic/tlb.h
@@ -149,6 +149,30 @@ static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)
 #define __tlb_remove_pmd_tlb_entry(tlb, pmdp, address) do {} while (0)
 #endif
 
+#ifndef tlb_start_vma
+#define tlb_start_vma(tlb, vma) do {} while (0)
+#endif
+
+#ifndef tlb_end_vma
+#define tlb_end_vma(tlb, vma) do {} while (0)
+#endif
+
+#ifndef __tlb_remove_tlb_entry
+#define __tlb_remove_tlb_entry(tlb, ptep, address) do {} while (0)
+#endif
+
+#ifndef tlb_flush
+#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
+#endif
+
+#ifndef __pte_free_tlb
+#define __pte_free_tlb(tlb, pte, address) pte_free((tlb)->mm, pte)
+#endif
+
+#ifndef __pmd_free_tlb
+#define __pmd_free_tlb(tlb, pmd, address) pmd_free((tlb)->mm, pmd)
+#endif
+
 #define tlb_remove_pmd_tlb_entry(tlb, pmdp, address)		\
 	do {							\
 		tlb->need_flush = 1;				\
-- 
1.8.4.2

[PATCH 04/27] alpha: Use generic tlb.h

[Richard Weinberger]

As everything we need is now in generic tlb.h
we can drop our own one.

Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Rik van Riel <riel@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: linux-alpha@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/alpha/include/asm/Kbuild |  1 +
 arch/alpha/include/asm/tlb.h  | 15 ---------------
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 arch/alpha/include/asm/tlb.h

diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild
index 96e54be..459aa4c 100644
--- a/arch/alpha/include/asm/Kbuild
+++ b/arch/alpha/include/asm/Kbuild
@@ -6,4 +6,5 @@ generic-y += exec.h
 generic-y += hash.h
 generic-y += mcs_spinlock.h
 generic-y += preempt.h
+generic-y += tlb.h
 generic-y += trace_clock.h
diff --git a/arch/alpha/include/asm/tlb.h b/arch/alpha/include/asm/tlb.h
deleted file mode 100644
index 4286675..0000000
--- a/arch/alpha/include/asm/tlb.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _ALPHA_TLB_H
-#define _ALPHA_TLB_H
-
-#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, addr)	do { } while (0)
-
-#define tlb_flush(tlb)				flush_tlb_mm((tlb)->mm)
-
-#include <asm-generic/tlb.h>
-
-#define __pte_free_tlb(tlb, pte, address)		pte_free((tlb)->mm, pte)
-#define __pmd_free_tlb(tlb, pmd, address)		pmd_free((tlb)->mm, pmd)
- 
-#endif
-- 
1.8.4.2

[PATCH 05/27] arc: Use common bits from generic tlb.h

[Richard Weinberger]

It is no longer needed to define them on our own.

Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/arc/include/asm/tlb.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/arch/arc/include/asm/tlb.h b/arch/arc/include/asm/tlb.h
index a9db5f6..a0fa06d 100644
--- a/arch/arc/include/asm/tlb.h
+++ b/arch/arc/include/asm/tlb.h
@@ -23,9 +23,7 @@ do {						\
  *
  * Note, read http://lkml.org/lkml/2004/1/15/6
  */
-#ifndef CONFIG_ARC_CACHE_VIPT_ALIASING
-#define tlb_start_vma(tlb, vma)
-#else
+#ifdef CONFIG_ARC_CACHE_VIPT_ALIASING
 #define tlb_start_vma(tlb, vma)						\
 do {									\
 	if (!tlb->fullmm)						\
@@ -39,8 +37,6 @@ do {									\
 		flush_tlb_range(vma, vma->vm_start, vma->vm_end);	\
 } while (0)
 
-#define __tlb_remove_tlb_entry(tlb, ptep, address)
-
 #include <linux/pagemap.h>
 #include <asm-generic/tlb.h>
 
-- 
1.8.4.2

[PATCH 06/27] avr32: Use common bits from generic tlb.h

[Richard Weinberger]

It is no longer needed to define them on our own.

Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Richard Weinberger <richard@nod.at>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/avr32/include/asm/tlb.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/arch/avr32/include/asm/tlb.h b/arch/avr32/include/asm/tlb.h
index 5c55f9c..2e5601d 100644
--- a/arch/avr32/include/asm/tlb.h
+++ b/arch/avr32/include/asm/tlb.h
@@ -14,13 +14,6 @@
 #define tlb_end_vma(tlb, vma) \
 	flush_tlb_range(vma, vma->vm_start, vma->vm_end)
 
-#define __tlb_remove_tlb_entry(tlb, pte, address) do { } while(0)
-
-/*
- * Flush whole TLB for MM
- */
-#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
-
 #include <asm-generic/tlb.h>
 
 /*
-- 
1.8.4.2

[PATCH 07/27] blackfin: Use generic tlb.h

[Richard Weinberger]

As everything we need is now in generic tlb.h
we can drop our own one.

Cc: Steven Miao <realmz6@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Richard Weinberger <richard@nod.at>
Cc: adi-buildroot-devel@lists.sourceforge.net
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/blackfin/include/asm/Kbuild |  1 +
 arch/blackfin/include/asm/tlb.h  | 22 ----------------------
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 arch/blackfin/include/asm/tlb.h

diff --git a/arch/blackfin/include/asm/Kbuild b/arch/blackfin/include/asm/Kbuild
index 0d93b9a..d4fdbc0 100644
--- a/arch/blackfin/include/asm/Kbuild
+++ b/arch/blackfin/include/asm/Kbuild
@@ -40,6 +40,7 @@ generic-y += sockios.h
 generic-y += statfs.h
 generic-y += termbits.h
 generic-y += termios.h
+generic-y += tlb.h
 generic-y += topology.h
 generic-y += trace_clock.h
 generic-y += types.h
diff --git a/arch/blackfin/include/asm/tlb.h b/arch/blackfin/include/asm/tlb.h
deleted file mode 100644
index a74ae08..0000000
--- a/arch/blackfin/include/asm/tlb.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2004-2008 Analog Devices Inc.
- *
- * Licensed under the GPL-2 or later.
- */
-
-#ifndef _BLACKFIN_TLB_H
-#define _BLACKFIN_TLB_H
-
-#define tlb_start_vma(tlb, vma)	do { } while (0)
-#define tlb_end_vma(tlb, vma)	do { } while (0)
-#define __tlb_remove_tlb_entry(tlb, ptep, address)	do { } while (0)
-
-/*
- * .. because we flush the whole mm when it
- * fills up.
- */
-#define tlb_flush(tlb)		flush_tlb_mm((tlb)->mm)
-
-#include <asm-generic/tlb.h>
-
-#endif				/* _BLACKFIN_TLB_H */
-- 
1.8.4.2

[PATCH 08/27] c6x: Use generic tlb.h

[Richard Weinberger]

As everything we need is now in generic tlb.h
we can drop our own one.

Cc: Mark Salter <msalter@redhat.com>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Richard Weinberger <richard@nod.at>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-c6x-dev@linux-c6x.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/c6x/include/asm/Kbuild | 1 +
 arch/c6x/include/asm/tlb.h  | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 arch/c6x/include/asm/tlb.h

diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild
index 8dbdce8..3a41af2 100644
--- a/arch/c6x/include/asm/Kbuild
+++ b/arch/c6x/include/asm/Kbuild
@@ -51,6 +51,7 @@ generic-y += stat.h
 generic-y += statfs.h
 generic-y += termbits.h
 generic-y += termios.h
+generic-y += tlb.h
 generic-y += tlbflush.h
 generic-y += topology.h
 generic-y += trace_clock.h
diff --git a/arch/c6x/include/asm/tlb.h b/arch/c6x/include/asm/tlb.h
deleted file mode 100644
index 8709e5e..0000000
--- a/arch/c6x/include/asm/tlb.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _ASM_C6X_TLB_H
-#define _ASM_C6X_TLB_H
-
-#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
-
-#include <asm-generic/tlb.h>
-
-#endif /* _ASM_C6X_TLB_H */
-- 
1.8.4.2

[PATCH 09/27] cris: Use common bits from generic tlb.h

[Richard Weinberger]

It is no longer needed to define them on our own.

Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: linux-cris-kernel@axis.com
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/cris/include/asm/tlb.h | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/arch/cris/include/asm/tlb.h b/arch/cris/include/asm/tlb.h
index 77384ea..4cc840f 100644
--- a/arch/cris/include/asm/tlb.h
+++ b/arch/cris/include/asm/tlb.h
@@ -2,18 +2,7 @@
 #define _CRIS_TLB_H
 
 #include <linux/pagemap.h>
-
 #include <arch/tlb.h>
-
-/*
- * cris doesn't need any special per-pte or
- * per-vma handling..
- */
-#define tlb_start_vma(tlb, vma) do { } while (0)
-#define tlb_end_vma(tlb, vma) do { } while (0)
-#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)
-
-#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
 #include <asm-generic/tlb.h>
 
 #endif
-- 
1.8.4.2

[PATCH 10/27] frv: Use common bits from generic tlb.h

[Richard Weinberger]

It is no longer needed to define them on our own.

Cc: David Howells <dhowells@redhat.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/frv/include/asm/tlb.h | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/arch/frv/include/asm/tlb.h b/arch/frv/include/asm/tlb.h
index cd458eb..ba690cc 100644
--- a/arch/frv/include/asm/tlb.h
+++ b/arch/frv/include/asm/tlb.h
@@ -9,18 +9,6 @@ extern void check_pgt_cache(void);
 #define check_pgt_cache() do {} while(0)
 #endif
 
-/*
- * we don't need any special per-pte or per-vma handling...
- */
-#define tlb_start_vma(tlb, vma)				do { } while (0)
-#define tlb_end_vma(tlb, vma)				do { } while (0)
-#define __tlb_remove_tlb_entry(tlb, ptep, address)	do { } while (0)
-
-/*
- * .. because we flush the whole mm when it fills up
- */
-#define tlb_flush(tlb)		flush_tlb_mm((tlb)->mm)
-
 #include <asm-generic/tlb.h>
 
 #endif /* _ASM_TLB_H */
-- 
1.8.4.2

[PATCH 11/27] hexagon: Use common bits from generic tlb.h

[Richard Weinberger]

It is no longer needed to define them on our own.

Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Chen Gang <gang.chen.5i5j@gmail.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: linux-hexagon@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/hexagon/include/asm/Kbuild |  1 +
 arch/hexagon/include/asm/tlb.h  | 39 ---------------------------------------
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 arch/hexagon/include/asm/tlb.h

diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild
index 0e69796..7397e1a 100644
--- a/arch/hexagon/include/asm/Kbuild
+++ b/arch/hexagon/include/asm/Kbuild
@@ -52,6 +52,7 @@ generic-y += stat.h
 generic-y += statfs.h
 generic-y += termbits.h
 generic-y += termios.h
+generic-y += tlb.h
 generic-y += topology.h
 generic-y += trace_clock.h
 generic-y += types.h
diff --git a/arch/hexagon/include/asm/tlb.h b/arch/hexagon/include/asm/tlb.h
deleted file mode 100644
index 2f00772..0000000
--- a/arch/hexagon/include/asm/tlb.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef _ASM_TLB_H
-#define _ASM_TLB_H
-
-#include <linux/pagemap.h>
-#include <asm/tlbflush.h>
-
-/*
- * We don't need any special per-pte or per-vma handling...
- */
-#define tlb_start_vma(tlb, vma)				do { } while (0)
-#define tlb_end_vma(tlb, vma)				do { } while (0)
-#define __tlb_remove_tlb_entry(tlb, ptep, address)	do { } while (0)
-
-/*
- * .. because we flush the whole mm when it fills up
- */
-#define tlb_flush(tlb)		flush_tlb_mm((tlb)->mm)
-
-#include <asm-generic/tlb.h>
-
-#endif
-- 
1.8.4.2

[PATCH 12/27] m32r: Use generic tlb.h

[Richard Weinberger]

As everything we need is now in generic tlb.h
we can drop our own one.

Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Rik van Riel <riel@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: linux-m32r@ml.linux-m32r.org
Cc: linux-m32r-ja@ml.linux-m32r.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/m32r/include/asm/Kbuild |  1 +
 arch/m32r/include/asm/tlb.h  | 20 --------------------
 2 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 arch/m32r/include/asm/tlb.h

diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild
index 67779a7..2cc845b 100644
--- a/arch/m32r/include/asm/Kbuild
+++ b/arch/m32r/include/asm/Kbuild
@@ -6,4 +6,5 @@ generic-y += hash.h
 generic-y += mcs_spinlock.h
 generic-y += module.h
 generic-y += preempt.h
+generic-y += tlb.h
 generic-y += trace_clock.h
diff --git a/arch/m32r/include/asm/tlb.h b/arch/m32r/include/asm/tlb.h
deleted file mode 100644
index c7ebd8d..0000000
--- a/arch/m32r/include/asm/tlb.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _M32R_TLB_H
-#define _M32R_TLB_H
-
-/*
- * x86 doesn't need any special per-pte or
- * per-vma handling..
- */
-#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)
-
-/*
- * .. because we flush the whole mm when it
- * fills up.
- */
-#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
-
-#include <asm-generic/tlb.h>
-
-#endif /* _M32R_TLB_H */
-- 
1.8.4.2

[PATCH 13/27] m68k: Use common bits from generic tlb.h

[Richard Weinberger]

It is no longer needed to define them on our own.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: linux-m68k@lists.linux-m68k.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/m68k/include/asm/tlb.h | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/arch/m68k/include/asm/tlb.h b/arch/m68k/include/asm/tlb.h
index 1785cff..74c15f6 100644
--- a/arch/m68k/include/asm/tlb.h
+++ b/arch/m68k/include/asm/tlb.h
@@ -1,19 +1,11 @@
 #ifndef _M68K_TLB_H
 #define _M68K_TLB_H
 
-/*
- * m68k doesn't need any special per-pte or
- * per-vma handling..
- */
-#define tlb_start_vma(tlb, vma)	do { } while (0)
-#define tlb_end_vma(tlb, vma)	do { } while (0)
-#define __tlb_remove_tlb_entry(tlb, ptep, address)	do { } while (0)
-
-/*
- * .. because we flush the whole mm when it
- * fills up.
- */
-#define tlb_flush(tlb)		flush_tlb_mm((tlb)->mm)
+#ifdef CONFIG_MMU && !defined(CONFIG_COLDFIRE) && !defined(CONFIG_SUN3)
+/* These defines are needed to override the defaults from asm-generic/tlb.h */
+#define __pte_free_tlb __pte_free_tlb
+#define __pmd_free_tlb __pmd_free_tlb
+#endif
 
 #include <asm-generic/tlb.h>
 
-- 
1.8.4.2

[PATCH 14/27] metag: Use common bits from generic tlb.h

[Richard Weinberger]

It is no longer needed to define them on our own.

Cc: James Hogan <james.hogan@imgtec.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: linux-metag@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/metag/include/asm/tlb.h | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/arch/metag/include/asm/tlb.h b/arch/metag/include/asm/tlb.h
index 048282f1..0fb0b46 100644
--- a/arch/metag/include/asm/tlb.h
+++ b/arch/metag/include/asm/tlb.h
@@ -19,18 +19,8 @@
 		if (!tlb->fullmm)					      \
 			flush_tlb_range(vma, vma->vm_start, vma->vm_end);     \
 	} while (0)
-
-
-#else
-
-#define tlb_start_vma(tlb, vma)			do { } while (0)
-#define tlb_end_vma(tlb, vma)			do { } while (0)
-
 #endif
 
-#define __tlb_remove_tlb_entry(tlb, pte, addr)	do { } while (0)
-#define tlb_flush(tlb)				flush_tlb_mm((tlb)->mm)
-
 #include <asm-generic/tlb.h>
 
 #endif
-- 
1.8.4.2

[PATCH 15/27] microblaze: Use generic tlb.h

[Richard Weinberger]

As everything we need is now in generic tlb.h
we can drop our own one.

Cc: Michal Simek <monstr@monstr.eu>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Richard Weinberger <richard@nod.at>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/microblaze/include/asm/Kbuild |  1 +
 arch/microblaze/include/asm/tlb.h  | 25 -------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 arch/microblaze/include/asm/tlb.h

diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild
index c98ed95..7908c58 100644
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@ -7,4 +7,5 @@ generic-y += hash.h
 generic-y += mcs_spinlock.h
 generic-y += preempt.h
 generic-y += syscalls.h
+generic-y += tlb.h
 generic-y += trace_clock.h
diff --git a/arch/microblaze/include/asm/tlb.h b/arch/microblaze/include/asm/tlb.h
deleted file mode 100644
index 8aa9781..0000000
--- a/arch/microblaze/include/asm/tlb.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu>
- * Copyright (C) 2008-2009 PetaLogix
- * Copyright (C) 2006 Atmark Techno, Inc.
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-
-#ifndef _ASM_MICROBLAZE_TLB_H
-#define _ASM_MICROBLAZE_TLB_H
-
-#define tlb_flush(tlb)	flush_tlb_mm((tlb)->mm)
-
-#include <linux/pagemap.h>
-#include <asm-generic/tlb.h>
-
-#ifdef 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)
-#endif
-
-#endif /* _ASM_MICROBLAZE_TLB_H */
-- 
1.8.4.2

[PATCH 16/27] mips: Use common bits from generic tlb.h

[Richard Weinberger]

It is no longer needed to define them on our own.

Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: John Crispin <blogic@openwrt.org>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/mips/include/asm/tlb.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/arch/mips/include/asm/tlb.h b/arch/mips/include/asm/tlb.h
index 4a23493..5ea43ca 100644
--- a/arch/mips/include/asm/tlb.h
+++ b/arch/mips/include/asm/tlb.h
@@ -10,13 +10,6 @@
 		if (!tlb->fullmm)				\
 			flush_cache_range(vma, vma->vm_start, vma->vm_end); \
 	}  while (0)
-#define tlb_end_vma(tlb, vma) do { } while (0)
-#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)
-
-/*
- * .. because we flush the whole mm when it fills up.
- */
-#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
 
 #define UNIQUE_ENTRYHI(idx)						\
 		((CKSEG0 + ((idx) << (PAGE_SHIFT + 1))) |		\
-- 
1.8.4.2

[PATCH 17/27] mn10300: Use generic tlb.h

[Richard Weinberger]

As everything we need is now in generic tlb.h
we can drop our own one.

Cc: David Howells <dhowells@redhat.com>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Richard Weinberger <richard@nod.at>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: linux-am33-list@redhat.com
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/mn10300/include/asm/Kbuild    |  1 +
 arch/mn10300/include/asm/pgalloc.h |  2 ++
 arch/mn10300/include/asm/tlb.h     | 34 ----------------------------------
 3 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 arch/mn10300/include/asm/tlb.h

diff --git a/arch/mn10300/include/asm/Kbuild b/arch/mn10300/include/asm/Kbuild
index 654d5ba..ecfaa34 100644
--- a/arch/mn10300/include/asm/Kbuild
+++ b/arch/mn10300/include/asm/Kbuild
@@ -6,4 +6,5 @@ generic-y += exec.h
 generic-y += hash.h
 generic-y += mcs_spinlock.h
 generic-y += preempt.h
+generic-y += tlb.h
 generic-y += trace_clock.h
diff --git a/arch/mn10300/include/asm/pgalloc.h b/arch/mn10300/include/asm/pgalloc.h
index 0f25d5f..0027581 100644
--- a/arch/mn10300/include/asm/pgalloc.h
+++ b/arch/mn10300/include/asm/pgalloc.h
@@ -53,4 +53,6 @@ static inline void pte_free(struct mm_struct *mm, struct page *pte)
 
 #define __pte_free_tlb(tlb, pte, addr) tlb_remove_page((tlb), (pte))
 
+extern void check_pgt_cache(void);
+
 #endif /* _ASM_PGALLOC_H */
diff --git a/arch/mn10300/include/asm/tlb.h b/arch/mn10300/include/asm/tlb.h
deleted file mode 100644
index 65d232b..0000000
--- a/arch/mn10300/include/asm/tlb.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* MN10300 TLB definitions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-
-#ifndef _ASM_TLB_H
-#define _ASM_TLB_H
-
-#include <asm/tlbflush.h>
-
-extern void check_pgt_cache(void);
-
-/*
- * we don't need any special per-pte or per-vma handling...
- */
-#define tlb_start_vma(tlb, vma)				do { } while (0)
-#define tlb_end_vma(tlb, vma)				do { } while (0)
-#define __tlb_remove_tlb_entry(tlb, ptep, address)	do { } while (0)
-
-/*
- * .. because we flush the whole mm when it fills up
- */
-#define tlb_flush(tlb)	flush_tlb_mm((tlb)->mm)
-
-/* for now, just use the generic stuff */
-#include <asm-generic/tlb.h>
-
-#endif /* _ASM_TLB_H */
-- 
1.8.4.2

[PATCH 18/27] openrisc: Use generic tlb.h

[Richard Weinberger]

As everything we need is now in generic tlb.h
we can drop our own one.

Cc: Jonas Bonn <jonas@southpole.se>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux@lists.openrisc.net
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/openrisc/include/asm/Kbuild |  1 +
 arch/openrisc/include/asm/tlb.h  | 34 ----------------------------------
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 arch/openrisc/include/asm/tlb.h

diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild
index 480af0d..abe411f 100644
--- a/arch/openrisc/include/asm/Kbuild
+++ b/arch/openrisc/include/asm/Kbuild
@@ -63,6 +63,7 @@ generic-y += swab.h
 generic-y += switch_to.h
 generic-y += termbits.h
 generic-y += termios.h
+generic-y += tlb.h
 generic-y += topology.h
 generic-y += trace_clock.h
 generic-y += types.h
diff --git a/arch/openrisc/include/asm/tlb.h b/arch/openrisc/include/asm/tlb.h
deleted file mode 100644
index fa4376a..0000000
--- a/arch/openrisc/include/asm/tlb.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * OpenRISC Linux
- *
- * Linux architectural port borrowing liberally from similar works of
- * others.  All original copyrights apply as per the original source
- * declaration.
- *
- * OpenRISC implementation:
- * Copyright (C) 2003 Matjaz Breskvar <phoenix@bsemi.com>
- * Copyright (C) 2010-2011 Jonas Bonn <jonas@southpole.se>
- * et al.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef __ASM_OPENRISC_TLB_H__
-#define __ASM_OPENRISC_TLB_H__
-
-/*
- * or32 doesn't need any special per-pte or
- * per-vma handling..
- */
-#define tlb_start_vma(tlb, vma) do { } while (0)
-#define tlb_end_vma(tlb, vma) do { } while (0)
-#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)
-
-#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
-#include <linux/pagemap.h>
-#include <asm-generic/tlb.h>
-
-#endif /* __ASM_OPENRISC_TLB_H__ */
-- 
1.8.4.2

[PATCH 19/27] parisc: Use common bits from generic tlb.h

[Richard Weinberger]

It is no longer needed to define them on our own.

Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Richard Weinberger <richard@nod.at>
Cc: linux-parisc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/parisc/include/asm/tlb.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/arch/parisc/include/asm/tlb.h b/arch/parisc/include/asm/tlb.h
index 0792490..4e231b1 100644
--- a/arch/parisc/include/asm/tlb.h
+++ b/arch/parisc/include/asm/tlb.h
@@ -16,12 +16,6 @@ do {	if (!(tlb)->fullmm)	\
 		flush_tlb_range(vma, vma->vm_start, vma->vm_end); \
 } while (0)
 
-#define __tlb_remove_tlb_entry(tlb, pte, address) \
-	do { } while (0)
-
 #include <asm-generic/tlb.h>
 
-#define __pmd_free_tlb(tlb, pmd, addr)	pmd_free((tlb)->mm, pmd)
-#define __pte_free_tlb(tlb, pte, addr)	pte_free((tlb)->mm, pte)
-
 #endif
-- 
1.8.4.2

[PATCH 20/27] powerpc: Use common bits from generic tlb.h

[Richard Weinberger]

It is no longer needed to define them on our own.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/powerpc/include/asm/tlb.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/powerpc/include/asm/tlb.h b/arch/powerpc/include/asm/tlb.h
index 392e5ef..bdea7f5 100644
--- a/arch/powerpc/include/asm/tlb.h
+++ b/arch/powerpc/include/asm/tlb.h
@@ -25,9 +25,6 @@
 
 #include <linux/pagemap.h>
 
-#define tlb_start_vma(tlb, vma)	do { } while (0)
-#define tlb_end_vma(tlb, vma)	do { } while (0)
-
 extern void tlb_flush(struct mmu_gather *tlb);
 
 /* These defines are needed to override the defaults from asm-generic/tlb.h */
-- 
1.8.4.2

[PATCH 21/27] score: Use generic tlb.h

[Richard Weinberger]

As everything we need is now in generic tlb.h
we can drop our own one.

Cc: Chen Liqin <liqin.linux@gmail.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Richard Weinberger <richard@nod.at>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/score/include/asm/Kbuild |  1 +
 arch/score/include/asm/irq.h  |  1 +
 arch/score/include/asm/tlb.h  | 17 -----------------
 3 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 arch/score/include/asm/tlb.h

diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild
index 2f947ab..fee1a34 100644
--- a/arch/score/include/asm/Kbuild
+++ b/arch/score/include/asm/Kbuild
@@ -8,5 +8,6 @@ generic-y += cputime.h
 generic-y += hash.h
 generic-y += mcs_spinlock.h
 generic-y += preempt.h
+generic-y += tlb.h
 generic-y += trace_clock.h
 generic-y += xor.h
diff --git a/arch/score/include/asm/irq.h b/arch/score/include/asm/irq.h
index c883f3d..c5ea32a 100644
--- a/arch/score/include/asm/irq.h
+++ b/arch/score/include/asm/irq.h
@@ -21,5 +21,6 @@
 #define IRQ_TIMER (7)		/* Timer IRQ number of SPCT6600 */
 
 extern void interrupt_exception_vector(void);
+extern void score7_FTLB_refill_Handler(void);
 
 #endif /* _ASM_SCORE_IRQ_H */
diff --git a/arch/score/include/asm/tlb.h b/arch/score/include/asm/tlb.h
deleted file mode 100644
index 46882ed..0000000
--- a/arch/score/include/asm/tlb.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _ASM_SCORE_TLB_H
-#define _ASM_SCORE_TLB_H
-
-/*
- * SCORE doesn't need any special per-pte or per-vma handling, except
- * we need to flush cache for area to be unmapped.
- */
-#define tlb_start_vma(tlb, vma)		do {} while (0)
-#define tlb_end_vma(tlb, vma)		do {} while (0)
-#define __tlb_remove_tlb_entry(tlb, ptep, address) do {} while (0)
-#define tlb_flush(tlb)			flush_tlb_mm((tlb)->mm)
-
-extern void score7_FTLB_refill_Handler(void);
-
-#include <asm-generic/tlb.h>
-
-#endif /* _ASM_SCORE_TLB_H */
-- 
1.8.4.2

[PATCH 22/27] sh: Use common bits from generic tlb.h

[Richard Weinberger]

It is no longer needed to define them on our own.

Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Hugh Dickins <hughd@google.com>
Cc: linux-sh@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/sh/include/asm/tlb.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/arch/sh/include/asm/tlb.h b/arch/sh/include/asm/tlb.h
index 62f80d2..7d3f816 100644
--- a/arch/sh/include/asm/tlb.h
+++ b/arch/sh/include/asm/tlb.h
@@ -133,11 +133,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 */
-- 
1.8.4.2

[PATCH 23/27] sparc: Use common bits from generic tlb.h

[Richard Weinberger]

It is no longer needed to define them on our own.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Richard Weinberger <richard@nod.at>
Cc: sparclinux@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/sparc/include/asm/tlb_32.h | 8 --------
 arch/sparc/include/asm/tlb_64.h | 3 ---
 2 files changed, 11 deletions(-)

diff --git a/arch/sparc/include/asm/tlb_32.h b/arch/sparc/include/asm/tlb_32.h
index 6d02d1c..60641a1 100644
--- a/arch/sparc/include/asm/tlb_32.h
+++ b/arch/sparc/include/asm/tlb_32.h
@@ -11,14 +11,6 @@ do {								\
 	flush_tlb_range(vma, vma->vm_start, vma->vm_end);	\
 } while (0)
 
-#define __tlb_remove_tlb_entry(tlb, pte, address) \
-	do { } while (0)
-
-#define tlb_flush(tlb) \
-do {								\
-	flush_tlb_mm((tlb)->mm);				\
-} while (0)
-
 #include <asm-generic/tlb.h>
 
 #endif /* _SPARC_TLB_H */
diff --git a/arch/sparc/include/asm/tlb_64.h b/arch/sparc/include/asm/tlb_64.h
index 190e189..36fdcec 100644
--- a/arch/sparc/include/asm/tlb_64.h
+++ b/arch/sparc/include/asm/tlb_64.h
@@ -22,9 +22,6 @@ extern void smp_flush_tlb_mm(struct mm_struct *mm);
 extern void __flush_tlb_pending(unsigned long, unsigned long, unsigned long *);
 extern void flush_tlb_pending(void);
 
-#define tlb_start_vma(tlb, vma) do { } while (0)
-#define tlb_end_vma(tlb, vma)	do { } while (0)
-#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)
 #define tlb_flush(tlb)	flush_tlb_pending()
 
 #include <asm-generic/tlb.h>
-- 
1.8.4.2

[PATCH 24/27] tile: Use generic tlb.h

[Richard Weinberger]

As everything we need is now in generic tlb.h
we can drop our own one.

Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Tony Lu <zlu@tilera.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/tile/include/asm/Kbuild |  1 +
 arch/tile/include/asm/tlb.h  | 25 -------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 arch/tile/include/asm/tlb.h

diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild
index 0aa5675..a4fabe4 100644
--- a/arch/tile/include/asm/Kbuild
+++ b/arch/tile/include/asm/Kbuild
@@ -38,6 +38,7 @@ generic-y += sockios.h
 generic-y += statfs.h
 generic-y += termbits.h
 generic-y += termios.h
+generic-y += tlb.h
 generic-y += trace_clock.h
 generic-y += types.h
 generic-y += xor.h
diff --git a/arch/tile/include/asm/tlb.h b/arch/tile/include/asm/tlb.h
deleted file mode 100644
index 4a891a1..0000000
--- a/arch/tile/include/asm/tlb.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2010 Tilera Corporation. All Rights Reserved.
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation, version 2.
- *
- *   This program is distributed in the hope that it will be useful, but
- *   WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- *   NON INFRINGEMENT.  See the GNU General Public License for
- *   more details.
- */
-
-#ifndef _ASM_TILE_TLB_H
-#define _ASM_TILE_TLB_H
-
-#define tlb_start_vma(tlb, vma) do { } while (0)
-#define tlb_end_vma(tlb, vma) do { } while (0)
-#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)
-#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
-
-#include <asm-generic/tlb.h>
-
-#endif /* _ASM_TILE_TLB_H */
-- 
1.8.4.2

[PATCH 25/27] unicore32: Use common bits from generic tlb.h

[Richard Weinberger]

It is no longer needed to define them on our own.

Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Richard Weinberger <richard@nod.at>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/unicore32/include/asm/tlb.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/arch/unicore32/include/asm/tlb.h b/arch/unicore32/include/asm/tlb.h
index 9cca15c..e6ba38a 100644
--- a/arch/unicore32/include/asm/tlb.h
+++ b/arch/unicore32/include/asm/tlb.h
@@ -12,11 +12,6 @@
 #ifndef __UNICORE_TLB_H__
 #define __UNICORE_TLB_H__
 
-#define tlb_start_vma(tlb, vma)				do { } while (0)
-#define tlb_end_vma(tlb, vma)				do { } while (0)
-#define __tlb_remove_tlb_entry(tlb, ptep, address)	do { } while (0)
-#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
-
 #define __pte_free_tlb(tlb, pte, addr)				\
 	do {							\
 		pgtable_page_dtor(pte);				\
-- 
1.8.4.2

[PATCH 26/27] x86: Use common bits from generic tlb.h

[Richard Weinberger]

It is no longer needed to define them on our own.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: Richard Weinberger <richard@nod.at>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/x86/include/asm/tlb.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/x86/include/asm/tlb.h b/arch/x86/include/asm/tlb.h
index c779730..f4c76d6 100644
--- a/arch/x86/include/asm/tlb.h
+++ b/arch/x86/include/asm/tlb.h
@@ -1,10 +1,6 @@
 #ifndef _ASM_X86_TLB_H
 #define _ASM_X86_TLB_H
 
-#define tlb_start_vma(tlb, vma) do { } while (0)
-#define tlb_end_vma(tlb, vma) do { } while (0)
-#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)
-
 #define tlb_flush(tlb)							\
 {									\
 	if (!tlb->fullmm && !tlb->need_flush_all) 			\
-- 
1.8.4.2

[PATCH 27/27] xtensa: Use common bits from generic tlb.h

[Richard Weinberger]

It is no longer needed to define them on our own.

Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: linux-xtensa@linux-xtensa.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/xtensa/include/asm/tlb.h | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/arch/xtensa/include/asm/tlb.h b/arch/xtensa/include/asm/tlb.h
index 0d766f9..09ed867 100644
--- a/arch/xtensa/include/asm/tlb.h
+++ b/arch/xtensa/include/asm/tlb.h
@@ -14,15 +14,7 @@
 #include <asm/cache.h>
 #include <asm/page.h>
 
-#if (DCACHE_WAY_SIZE <= PAGE_SIZE)
-
-/* Note, read http://lkml.org/lkml/2004/1/15/6 */
-
-# define tlb_start_vma(tlb,vma)			do { } while (0)
-# define tlb_end_vma(tlb,vma)			do { } while (0)
-
-#else
-
+#if (DCACHE_WAY_SIZE > PAGE_SIZE)
 # define tlb_start_vma(tlb, vma)					      \
 	do {								      \
 		if (!tlb->fullmm)					      \
@@ -34,14 +26,8 @@
 		if (!tlb->fullmm)					      \
 			flush_tlb_range(vma, vma->vm_start, vma->vm_end);     \
 	} while(0)
-
 #endif
 
-#define __tlb_remove_tlb_entry(tlb,pte,addr)	do { } while (0)
-#define tlb_flush(tlb)				flush_tlb_mm((tlb)->mm)
-
 #include <asm-generic/tlb.h>
 
-#define __pte_free_tlb(tlb, pte, address)	pte_free((tlb)->mm, pte)
-
 #endif	/* _XTENSA_TLB_H */
-- 
1.8.4.2

Re: [PATCH 04/27] alpha: Use generic tlb.h

[Rik van Riel]

On 05/14/2014 02:59 PM, Richard Weinberger wrote:
> As everything we need is now in generic tlb.h
> we can drop our own one.
> 
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
> Cc: Matt Turner <mattst88@gmail.com>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Ingo Molnar <mingo@kernel.org>
> Cc: Tim Chen <tim.c.chen@linux.intel.com>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Rik van Riel <riel@redhat.com>
> Cc: Frederic Weisbecker <fweisbec@gmail.com>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: linux-alpha@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Richard Weinberger <richard@nod.at>

Acked-by: Rik van Riel <riel@redhat.com>


-- 
All rights reversed

Re: [PATCH 12/27] m32r: Use generic tlb.h

[Rik van Riel]

On 05/14/2014 02:59 PM, Richard Weinberger wrote:
> As everything we need is now in generic tlb.h
> we can drop our own one.
> 
> Cc: Hirokazu Takata <takata@linux-m32r.org>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Ingo Molnar <mingo@kernel.org>
> Cc: Tim Chen <tim.c.chen@linux.intel.com>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Rik van Riel <riel@redhat.com>
> Cc: Frederic Weisbecker <fweisbec@gmail.com>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: linux-m32r@ml.linux-m32r.org
> Cc: linux-m32r-ja@ml.linux-m32r.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Richard Weinberger <richard@nod.at>

Acked-by: Rik van Riel <riel@redhat.com>

-- 
All rights reversed

Re: [PATCH 13/27] m68k: Use common bits from generic tlb.h

[Geert Uytterhoeven]

On Wed, May 14, 2014 at 8:59 PM, Richard Weinberger <richard@nod.at> wrote:
> --- a/arch/m68k/include/asm/tlb.h
> +++ b/arch/m68k/include/asm/tlb.h
> @@ -1,19 +1,11 @@
>  #ifndef _M68K_TLB_H
>  #define _M68K_TLB_H
>
> -/*
> - * m68k doesn't need any special per-pte or
> - * per-vma handling..
> - */
> -#define tlb_start_vma(tlb, vma)        do { } while (0)
> -#define tlb_end_vma(tlb, vma)  do { } while (0)
> -#define __tlb_remove_tlb_entry(tlb, ptep, address)     do { } while (0)
> -
> -/*
> - * .. because we flush the whole mm when it
> - * fills up.
> - */
> -#define tlb_flush(tlb)         flush_tlb_mm((tlb)->mm)
> +#ifdef CONFIG_MMU && !defined(CONFIG_COLDFIRE) && !defined(CONFIG_SUN3)

Syntax error:

#if defined(CONFIG_MMU) && ...

But why this sudden #ifdef checks?

> +/* These defines are needed to override the defaults from asm-generic/tlb.h */
> +#define __pte_free_tlb __pte_free_tlb
> +#define __pmd_free_tlb __pmd_free_tlb
> +#endif

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 13/27] m68k: Use common bits from generic tlb.h

[Richard Weinberger]

Am 14.05.2014 21:19, schrieb Geert Uytterhoeven:
> On Wed, May 14, 2014 at 8:59 PM, Richard Weinberger <richard@nod.at> wrote:
>> --- a/arch/m68k/include/asm/tlb.h
>> +++ b/arch/m68k/include/asm/tlb.h
>> @@ -1,19 +1,11 @@
>>  #ifndef _M68K_TLB_H
>>  #define _M68K_TLB_H
>>
>> -/*
>> - * m68k doesn't need any special per-pte or
>> - * per-vma handling..
>> - */
>> -#define tlb_start_vma(tlb, vma)        do { } while (0)
>> -#define tlb_end_vma(tlb, vma)  do { } while (0)
>> -#define __tlb_remove_tlb_entry(tlb, ptep, address)     do { } while (0)
>> -
>> -/*
>> - * .. because we flush the whole mm when it
>> - * fills up.
>> - */
>> -#define tlb_flush(tlb)         flush_tlb_mm((tlb)->mm)
>> +#ifdef CONFIG_MMU && !defined(CONFIG_COLDFIRE) && !defined(CONFIG_SUN3)
> 
> Syntax error:
> 
> #if defined(CONFIG_MMU) && ...

Whoops, thanks for pointing this out.

> But why this sudden #ifdef checks?

They are needed because in pgalloc.h you have:
#ifdef CONFIG_MMU
#include <asm/virtconvert.h>
#if defined(CONFIG_COLDFIRE)
#include <asm/mcf_pgalloc.h>
#elif defined(CONFIG_SUN3)
#include <asm/sun3_pgalloc.h>
#else
#include <asm/motorola_pgalloc.h>
#endif

And only asm/motorola_pgalloc.h have __pte/pmd_free_tlb as static inline functions.
Therefore we need to define them such that the generic tlb.h versions will not clash
with yours.

Thanks,
//richard

Re: [PATCH 13/27] m68k: Use common bits from generic tlb.h

[Geert Uytterhoeven]

Hi Richard,

On Wed, May 14, 2014 at 9:26 PM, Richard Weinberger <richard@nod.at> wrote:
>> But why this sudden #ifdef checks?
>
> They are needed because in pgalloc.h you have:
> #ifdef CONFIG_MMU
> #include <asm/virtconvert.h>
> #if defined(CONFIG_COLDFIRE)
> #include <asm/mcf_pgalloc.h>
> #elif defined(CONFIG_SUN3)
> #include <asm/sun3_pgalloc.h>
> #else
> #include <asm/motorola_pgalloc.h>
> #endif
>
> And only asm/motorola_pgalloc.h have __pte/pmd_free_tlb as static inline functions.
> Therefore we need to define them such that the generic tlb.h versions will not clash
> with yours.

Thanks for the clarification!

Perhaps this deserves a comment:

/* Applies to Classic m68k MMU only */

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 08/27] c6x: Use generic tlb.h

[Mark Salter]

On Wed, 2014-05-14 at 20:59 +0200, Richard Weinberger wrote:
> As everything we need is now in generic tlb.h
> we can drop our own one.
> 
> Cc: Mark Salter <msalter@redhat.com>
> Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Ingo Molnar <mingo@kernel.org>
> Cc: Tim Chen <tim.c.chen@linux.intel.com>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: linux-c6x-dev@linux-c6x.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Richard Weinberger <richard@nod.at>

Acked-by: Mark Salter <msalter@redhat.com>

Re: [PATCH 23/27] sparc: Use common bits from generic tlb.h

[Sam Ravnborg]

On Wed, May 14, 2014 at 08:59:55PM +0200, Richard Weinberger wrote:
> It is no longer needed to define them on our own.
> 
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: sparclinux@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Richard Weinberger <richard@nod.at>
> ---
>  arch/sparc/include/asm/tlb_32.h | 8 --------
>  arch/sparc/include/asm/tlb_64.h | 3 ---
>  2 files changed, 11 deletions(-)
> 
> diff --git a/arch/sparc/include/asm/tlb_32.h b/arch/sparc/include/asm/tlb_32.h
> index 6d02d1c..60641a1 100644
> --- a/arch/sparc/include/asm/tlb_32.h
> +++ b/arch/sparc/include/asm/tlb_32.h
> @@ -11,14 +11,6 @@ do {								\
>  	flush_tlb_range(vma, vma->vm_start, vma->vm_end);	\
>  } while (0)
>  
> -#define __tlb_remove_tlb_entry(tlb, pte, address) \
> -	do { } while (0)
> -
> -#define tlb_flush(tlb) \
> -do {								\
> -	flush_tlb_mm((tlb)->mm);				\
> -} while (0)
> -
>  #include <asm-generic/tlb.h>
>  
>  #endif /* _SPARC_TLB_H */

This part looks OK.

> diff --git a/arch/sparc/include/asm/tlb_64.h b/arch/sparc/include/asm/tlb_64.h
> index 190e189..36fdcec 100644
> --- a/arch/sparc/include/asm/tlb_64.h
> +++ b/arch/sparc/include/asm/tlb_64.h
> @@ -22,9 +22,6 @@ extern void smp_flush_tlb_mm(struct mm_struct *mm);
>  extern void __flush_tlb_pending(unsigned long, unsigned long, unsigned long *);
>  extern void flush_tlb_pending(void);
>  
> -#define tlb_start_vma(tlb, vma) do { } while (0)
> -#define tlb_end_vma(tlb, vma)	do { } while (0)
> -#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)
>  #define tlb_flush(tlb)	flush_tlb_pending()
>  
>  #include <asm-generic/tlb.h>

This does not fly for sparc64.
__pte_free_tlb is a static inline in pgalloc_64.h so no
define exist to teach tlb.h that an arch override exist.

Likewise for __pmd_free_tlb

	Sam

Re: [PATCH 23/27] sparc: Use common bits from generic tlb.h

[Richard Weinberger]

Am 14.05.2014 21:55, schrieb Sam Ravnborg:
> On Wed, May 14, 2014 at 08:59:55PM +0200, Richard Weinberger wrote:
>> It is no longer needed to define them on our own.
>>
>> Cc: "David S. Miller" <davem@davemloft.net>
>> Cc: Richard Weinberger <richard@nod.at>
>> Cc: sparclinux@vger.kernel.org
>> Cc: linux-kernel@vger.kernel.org
>> Signed-off-by: Richard Weinberger <richard@nod.at>
>> ---
>>  arch/sparc/include/asm/tlb_32.h | 8 --------
>>  arch/sparc/include/asm/tlb_64.h | 3 ---
>>  2 files changed, 11 deletions(-)
>>
>> diff --git a/arch/sparc/include/asm/tlb_32.h b/arch/sparc/include/asm/tlb_32.h
>> index 6d02d1c..60641a1 100644
>> --- a/arch/sparc/include/asm/tlb_32.h
>> +++ b/arch/sparc/include/asm/tlb_32.h
>> @@ -11,14 +11,6 @@ do {								\
>>  	flush_tlb_range(vma, vma->vm_start, vma->vm_end);	\
>>  } while (0)
>>  
>> -#define __tlb_remove_tlb_entry(tlb, pte, address) \
>> -	do { } while (0)
>> -
>> -#define tlb_flush(tlb) \
>> -do {								\
>> -	flush_tlb_mm((tlb)->mm);				\
>> -} while (0)
>> -
>>  #include <asm-generic/tlb.h>
>>  
>>  #endif /* _SPARC_TLB_H */
> 
> This part looks OK.
> 
>> diff --git a/arch/sparc/include/asm/tlb_64.h b/arch/sparc/include/asm/tlb_64.h
>> index 190e189..36fdcec 100644
>> --- a/arch/sparc/include/asm/tlb_64.h
>> +++ b/arch/sparc/include/asm/tlb_64.h
>> @@ -22,9 +22,6 @@ extern void smp_flush_tlb_mm(struct mm_struct *mm);
>>  extern void __flush_tlb_pending(unsigned long, unsigned long, unsigned long *);
>>  extern void flush_tlb_pending(void);
>>  
>> -#define tlb_start_vma(tlb, vma) do { } while (0)
>> -#define tlb_end_vma(tlb, vma)	do { } while (0)
>> -#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)
>>  #define tlb_flush(tlb)	flush_tlb_pending()
>>  
>>  #include <asm-generic/tlb.h>
> 
> This does not fly for sparc64.
> __pte_free_tlb is a static inline in pgalloc_64.h so no
> define exist to teach tlb.h that an arch override exist.

Okay, we need a #define __pte_free_tlb __pte_free_tlb.

> Likewise for __pmd_free_tlb

__pmd_free_tlb is already a macro so the generic tlb.h should handle it correctly.

#define __pmd_free_tlb(tlb, pmd, addr)                \
        pgtable_free_tlb(tlb, pmd, false)

I'd move both __pmd_free_tlb and __pte_free_tlb into tlb.h such that the include order
of tlb.h vs pgalloc.h does not matter.
Are you fine with that?

Thanks,
//richard

Re: [PATCH 23/27] sparc: Use common bits from generic tlb.h

[Sam Ravnborg]

On Wed, May 14, 2014 at 10:04:41PM +0200, Richard Weinberger wrote:
> Am 14.05.2014 21:55, schrieb Sam Ravnborg:
> > On Wed, May 14, 2014 at 08:59:55PM +0200, Richard Weinberger wrote:
> >> It is no longer needed to define them on our own.
> >>
> >> Cc: "David S. Miller" <davem@davemloft.net>
> >> Cc: Richard Weinberger <richard@nod.at>
> >> Cc: sparclinux@vger.kernel.org
> >> Cc: linux-kernel@vger.kernel.org
> >> Signed-off-by: Richard Weinberger <richard@nod.at>
> >> ---
> >>  arch/sparc/include/asm/tlb_32.h | 8 --------
> >>  arch/sparc/include/asm/tlb_64.h | 3 ---
> >>  2 files changed, 11 deletions(-)
> >>
> >> diff --git a/arch/sparc/include/asm/tlb_32.h b/arch/sparc/include/asm/tlb_32.h
> >> index 6d02d1c..60641a1 100644
> >> --- a/arch/sparc/include/asm/tlb_32.h
> >> +++ b/arch/sparc/include/asm/tlb_32.h
> >> @@ -11,14 +11,6 @@ do {								\
> >>  	flush_tlb_range(vma, vma->vm_start, vma->vm_end);	\
> >>  } while (0)
> >>  
> >> -#define __tlb_remove_tlb_entry(tlb, pte, address) \
> >> -	do { } while (0)
> >> -
> >> -#define tlb_flush(tlb) \
> >> -do {								\
> >> -	flush_tlb_mm((tlb)->mm);				\
> >> -} while (0)
> >> -
> >>  #include <asm-generic/tlb.h>
> >>  
> >>  #endif /* _SPARC_TLB_H */
> > 
> > This part looks OK.
> > 
> >> diff --git a/arch/sparc/include/asm/tlb_64.h b/arch/sparc/include/asm/tlb_64.h
> >> index 190e189..36fdcec 100644
> >> --- a/arch/sparc/include/asm/tlb_64.h
> >> +++ b/arch/sparc/include/asm/tlb_64.h
> >> @@ -22,9 +22,6 @@ extern void smp_flush_tlb_mm(struct mm_struct *mm);
> >>  extern void __flush_tlb_pending(unsigned long, unsigned long, unsigned long *);
> >>  extern void flush_tlb_pending(void);
> >>  
> >> -#define tlb_start_vma(tlb, vma) do { } while (0)
> >> -#define tlb_end_vma(tlb, vma)	do { } while (0)
> >> -#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)
> >>  #define tlb_flush(tlb)	flush_tlb_pending()
> >>  
> >>  #include <asm-generic/tlb.h>
> > 
> > This does not fly for sparc64.
> > __pte_free_tlb is a static inline in pgalloc_64.h so no
> > define exist to teach tlb.h that an arch override exist.
> 
> Okay, we need a #define __pte_free_tlb __pte_free_tlb.
> 
> > Likewise for __pmd_free_tlb
> 
> __pmd_free_tlb is already a macro so the generic tlb.h should handle it correctly.
> 
> #define __pmd_free_tlb(tlb, pmd, addr)                \
>         pgtable_free_tlb(tlb, pmd, false)
> 
> I'd move both __pmd_free_tlb and __pte_free_tlb into tlb.h such that the include order
> of tlb.h vs pgalloc.h does not matter.
> Are you fine with that?
Yes, as long as sparc64 continue to build it makes good sense
to define these in the same file as done by most other architectures.

	Sam
> 
> Thanks,
> //richard

Re: [PATCH 23/27] sparc: Use common bits from generic tlb.h

[Richard Weinberger]

Am 14.05.2014 22:22, schrieb Sam Ravnborg:
> On Wed, May 14, 2014 at 10:04:41PM +0200, Richard Weinberger wrote:
>> Am 14.05.2014 21:55, schrieb Sam Ravnborg:
>>> On Wed, May 14, 2014 at 08:59:55PM +0200, Richard Weinberger wrote:
>>>> It is no longer needed to define them on our own.
>>>>
>>>> Cc: "David S. Miller" <davem@davemloft.net>
>>>> Cc: Richard Weinberger <richard@nod.at>
>>>> Cc: sparclinux@vger.kernel.org
>>>> Cc: linux-kernel@vger.kernel.org
>>>> Signed-off-by: Richard Weinberger <richard@nod.at>
>>>> ---
>>>>  arch/sparc/include/asm/tlb_32.h | 8 --------
>>>>  arch/sparc/include/asm/tlb_64.h | 3 ---
>>>>  2 files changed, 11 deletions(-)
>>>>
>>>> diff --git a/arch/sparc/include/asm/tlb_32.h b/arch/sparc/include/asm/tlb_32.h
>>>> index 6d02d1c..60641a1 100644
>>>> --- a/arch/sparc/include/asm/tlb_32.h
>>>> +++ b/arch/sparc/include/asm/tlb_32.h
>>>> @@ -11,14 +11,6 @@ do {								\
>>>>  	flush_tlb_range(vma, vma->vm_start, vma->vm_end);	\
>>>>  } while (0)
>>>>  
>>>> -#define __tlb_remove_tlb_entry(tlb, pte, address) \
>>>> -	do { } while (0)
>>>> -
>>>> -#define tlb_flush(tlb) \
>>>> -do {								\
>>>> -	flush_tlb_mm((tlb)->mm);				\
>>>> -} while (0)
>>>> -
>>>>  #include <asm-generic/tlb.h>
>>>>  
>>>>  #endif /* _SPARC_TLB_H */
>>>
>>> This part looks OK.
>>>
>>>> diff --git a/arch/sparc/include/asm/tlb_64.h b/arch/sparc/include/asm/tlb_64.h
>>>> index 190e189..36fdcec 100644
>>>> --- a/arch/sparc/include/asm/tlb_64.h
>>>> +++ b/arch/sparc/include/asm/tlb_64.h
>>>> @@ -22,9 +22,6 @@ extern void smp_flush_tlb_mm(struct mm_struct *mm);
>>>>  extern void __flush_tlb_pending(unsigned long, unsigned long, unsigned long *);
>>>>  extern void flush_tlb_pending(void);
>>>>  
>>>> -#define tlb_start_vma(tlb, vma) do { } while (0)
>>>> -#define tlb_end_vma(tlb, vma)	do { } while (0)
>>>> -#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)
>>>>  #define tlb_flush(tlb)	flush_tlb_pending()
>>>>  
>>>>  #include <asm-generic/tlb.h>
>>>
>>> This does not fly for sparc64.
>>> __pte_free_tlb is a static inline in pgalloc_64.h so no
>>> define exist to teach tlb.h that an arch override exist.
>>
>> Okay, we need a #define __pte_free_tlb __pte_free_tlb.
>>
>>> Likewise for __pmd_free_tlb
>>
>> __pmd_free_tlb is already a macro so the generic tlb.h should handle it correctly.
>>
>> #define __pmd_free_tlb(tlb, pmd, addr)                \
>>         pgtable_free_tlb(tlb, pmd, false)
>>
>> I'd move both __pmd_free_tlb and __pte_free_tlb into tlb.h such that the include order
>> of tlb.h vs pgalloc.h does not matter.
>> Are you fine with that?
> Yes, as long as sparc64 continue to build it makes good sense
> to define these in the same file as done by most other architectures.
> 
> 	Sam

Will do.
Sadly also with my (broken) patch sparc64 builds fine.

Is there an easy way to boot a sparc64 Linux within qemu?

Thanks,
//richard

Re: [PATCH 13/27] m68k: Use common bits from generic tlb.h

[Richard Weinberger]

Am 14.05.2014 21:34, schrieb Geert Uytterhoeven:
> Hi Richard,
> 
> On Wed, May 14, 2014 at 9:26 PM, Richard Weinberger <richard@nod.at> wrote:
>>> But why this sudden #ifdef checks?
>>
>> They are needed because in pgalloc.h you have:
>> #ifdef CONFIG_MMU
>> #include <asm/virtconvert.h>
>> #if defined(CONFIG_COLDFIRE)
>> #include <asm/mcf_pgalloc.h>
>> #elif defined(CONFIG_SUN3)
>> #include <asm/sun3_pgalloc.h>
>> #else
>> #include <asm/motorola_pgalloc.h>
>> #endif
>>
>> And only asm/motorola_pgalloc.h have __pte/pmd_free_tlb as static inline functions.
>> Therefore we need to define them such that the generic tlb.h versions will not clash
>> with yours.
> 
> Thanks for the clarification!

One problem which arises here is that me need to make sure that pgalloc.h is included before
tlb.h. Which kind of sucks.
I'll move __pte/pmd_free_tlb from *_pgalloc.h into tlb.h to prevent this issue.

Are you fine with that?

> Perhaps this deserves a comment:
> 
> /* Applies to Classic m68k MMU only */

Will add.

Thanks,
//richard

Re: [PATCH 23/27] sparc: Use common bits from generic tlb.h

[Guenter Roeck]

On 05/14/2014 01:27 PM, Richard Weinberger wrote:
> Am 14.05.2014 22:22, schrieb Sam Ravnborg:
>> On Wed, May 14, 2014 at 10:04:41PM +0200, Richard Weinberger wrote:
>>> Am 14.05.2014 21:55, schrieb Sam Ravnborg:
>>>> On Wed, May 14, 2014 at 08:59:55PM +0200, Richard Weinberger wrote:
>>>>> It is no longer needed to define them on our own.
>>>>>
>>>>> Cc: "David S. Miller" <davem@davemloft.net>
>>>>> Cc: Richard Weinberger <richard@nod.at>
>>>>> Cc: sparclinux@vger.kernel.org
>>>>> Cc: linux-kernel@vger.kernel.org
>>>>> Signed-off-by: Richard Weinberger <richard@nod.at>
>>>>> ---
>>>>>   arch/sparc/include/asm/tlb_32.h | 8 --------
>>>>>   arch/sparc/include/asm/tlb_64.h | 3 ---
>>>>>   2 files changed, 11 deletions(-)
>>>>>
>>>>> diff --git a/arch/sparc/include/asm/tlb_32.h b/arch/sparc/include/asm/tlb_32.h
>>>>> index 6d02d1c..60641a1 100644
>>>>> --- a/arch/sparc/include/asm/tlb_32.h
>>>>> +++ b/arch/sparc/include/asm/tlb_32.h
>>>>> @@ -11,14 +11,6 @@ do {								\
>>>>>   	flush_tlb_range(vma, vma->vm_start, vma->vm_end);	\
>>>>>   } while (0)
>>>>>
>>>>> -#define __tlb_remove_tlb_entry(tlb, pte, address) \
>>>>> -	do { } while (0)
>>>>> -
>>>>> -#define tlb_flush(tlb) \
>>>>> -do {								\
>>>>> -	flush_tlb_mm((tlb)->mm);				\
>>>>> -} while (0)
>>>>> -
>>>>>   #include <asm-generic/tlb.h>
>>>>>
>>>>>   #endif /* _SPARC_TLB_H */
>>>>
>>>> This part looks OK.
>>>>
>>>>> diff --git a/arch/sparc/include/asm/tlb_64.h b/arch/sparc/include/asm/tlb_64.h
>>>>> index 190e189..36fdcec 100644
>>>>> --- a/arch/sparc/include/asm/tlb_64.h
>>>>> +++ b/arch/sparc/include/asm/tlb_64.h
>>>>> @@ -22,9 +22,6 @@ extern void smp_flush_tlb_mm(struct mm_struct *mm);
>>>>>   extern void __flush_tlb_pending(unsigned long, unsigned long, unsigned long *);
>>>>>   extern void flush_tlb_pending(void);
>>>>>
>>>>> -#define tlb_start_vma(tlb, vma) do { } while (0)
>>>>> -#define tlb_end_vma(tlb, vma)	do { } while (0)
>>>>> -#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)
>>>>>   #define tlb_flush(tlb)	flush_tlb_pending()
>>>>>
>>>>>   #include <asm-generic/tlb.h>
>>>>
>>>> This does not fly for sparc64.
>>>> __pte_free_tlb is a static inline in pgalloc_64.h so no
>>>> define exist to teach tlb.h that an arch override exist.
>>>
>>> Okay, we need a #define __pte_free_tlb __pte_free_tlb.
>>>
>>>> Likewise for __pmd_free_tlb
>>>
>>> __pmd_free_tlb is already a macro so the generic tlb.h should handle it correctly.
>>>
>>> #define __pmd_free_tlb(tlb, pmd, addr)                \
>>>          pgtable_free_tlb(tlb, pmd, false)
>>>
>>> I'd move both __pmd_free_tlb and __pte_free_tlb into tlb.h such that the include order
>>> of tlb.h vs pgalloc.h does not matter.
>>> Are you fine with that?
>> Yes, as long as sparc64 continue to build it makes good sense
>> to define these in the same file as done by most other architectures.
>>
>> 	Sam
>
> Will do.
> Sadly also with my (broken) patch sparc64 builds fine.
>
> Is there an easy way to boot a sparc64 Linux within qemu?
>

Try rootfs/sparc64 from https://github.com/groeck/linux-build-test.git

Guenter

Re: [PATCH 09/27] cris: Use common bits from generic tlb.h

[Jesper Nilsson]

On Wed, May 14, 2014 at 08:59:41PM +0200, Richard Weinberger wrote:
> It is no longer needed to define them on our own.

Looks good!

Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>

> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: linux-cris-kernel@axis.com
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Richard Weinberger <richard@nod.at>
> ---
>  arch/cris/include/asm/tlb.h | 11 -----------
>  1 file changed, 11 deletions(-)
> 
> diff --git a/arch/cris/include/asm/tlb.h b/arch/cris/include/asm/tlb.h
> index 77384ea..4cc840f 100644
> --- a/arch/cris/include/asm/tlb.h
> +++ b/arch/cris/include/asm/tlb.h
> @@ -2,18 +2,7 @@
>  #define _CRIS_TLB_H
>  
>  #include <linux/pagemap.h>
> -
>  #include <arch/tlb.h>
> -
> -/*
> - * cris doesn't need any special per-pte or
> - * per-vma handling..
> - */
> -#define tlb_start_vma(tlb, vma) do { } while (0)
> -#define tlb_end_vma(tlb, vma) do { } while (0)
> -#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)
> -
> -#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
>  #include <asm-generic/tlb.h>
>  
>  #endif
> -- 
> 1.8.4.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

/^JN - Jesper Nilsson
-- 
               Jesper Nilsson -- jesper.nilsson@axis.com

Re: [PATCH 05/27] arc: Use common bits from generic tlb.h

[Vineet Gupta]

Hi Richard,

On Thursday 15 May 2014 12:29 AM, Richard Weinberger wrote:
> It is no longer needed to define them on our own.
> 
> Cc: Vineet Gupta <vgupta@synopsys.com>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Richard Weinberger <richard@nod.at>

Thx for the series.

Acked-by: Vineet Gupta <vgupta@synopsys.com>


> ---
>  arch/arc/include/asm/tlb.h | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/arch/arc/include/asm/tlb.h b/arch/arc/include/asm/tlb.h
> index a9db5f6..a0fa06d 100644
> --- a/arch/arc/include/asm/tlb.h
> +++ b/arch/arc/include/asm/tlb.h
> @@ -23,9 +23,7 @@ do {						\
>   *
>   * Note, read http://lkml.org/lkml/2004/1/15/6
>   */
> -#ifndef CONFIG_ARC_CACHE_VIPT_ALIASING
> -#define tlb_start_vma(tlb, vma)
> -#else
> +#ifdef CONFIG_ARC_CACHE_VIPT_ALIASING
>  #define tlb_start_vma(tlb, vma)						\
>  do {									\
>  	if (!tlb->fullmm)						\
> @@ -39,8 +37,6 @@ do {									\
>  		flush_tlb_range(vma, vma->vm_start, vma->vm_end);	\
>  } while (0)
>  
> -#define __tlb_remove_tlb_entry(tlb, ptep, address)
> -
>  #include <linux/pagemap.h>
>  #include <asm-generic/tlb.h>
>  
> 

Re: Consolidate tlb.h

[Peter Zijlstra]

[-- Attachment #1: Type: text/plain, Size: 554 bytes --]

On Wed, May 14, 2014 at 08:59:32PM +0200, Richard Weinberger wrote:
> While staring at an UML TLB bug I've noticed that most archs
> copy and pasted stuff from each others tlb.h.
> This patch series combines common stuff into the generic tlb.h.
> 

Were you aware of this series:

  http://www.spinics.net/lists/linux-mm/msg37369.html

I've been meaning to refresh and continue with it, but somehow I never
get time to actually do it :/

At the time only s390 still have a relatively trivial problem but all
archs were using generic code.

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: Consolidate tlb.h

[Richard Weinberger]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am 15.05.2014 10:32, schrieb Peter Zijlstra:
> On Wed, May 14, 2014 at 08:59:32PM +0200, Richard Weinberger wrote:
>> While staring at an UML TLB bug I've noticed that most archs copy and pasted stuff from each others tlb.h. This patch series combines common stuff into the generic tlb.h.
>> 
> 
> Were you aware of this series:
> 
> http://www.spinics.net/lists/linux-mm/msg37369.html

Nope.

> I've been meaning to refresh and continue with it, but somehow I never get time to actually do it :/
> 
> At the time only s390 still have a relatively trivial problem but all archs were using generic code.
> 

If it helps I can pickup your series and finalize it.
Actually I was abound to consolidate TLB gather implementations too.

Thanks,
//richard
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJTdH9lAAoJEPmeIjfg4UaaqowP/0I8COjZRvk1X39E1KibWxIK
epRiDWYgQenfc186ncwZA2wAU4rr1y+e5d7hoF0p6/WvN1svSgbX6A95tDa3/rLY
zu9/zX8TRT5QXU6xsUDzI3zD2t7N44jxX0ysDOHV6ZLOpMnoe8fR8j8Mn54qPd8T
LLmhgxhkp7NvYjv7VFEMP0DXtlPDskRFzzY7NwGks0uu36FPVMHyJIhz+koW7+hL
rzjZs57yO/t3EaGF4UGVRPwt8FyBzgxib3JfFHpr3D35La5lbhVRTu5FHfXeDhgu
Mv9iacyrMMOC0IlMVreC/O9Og2GmMKcC+ICFlvW4sCGKPcN/95rvUapvFKsAAAnw
EQicc86XnPJ8TJATKE9kg0YXB9GDu4hK0kzK09PsQBBO+L0SZstbwCXMfwHyGuoO
LRmsO+mRMtzeZYXEjO7oRvxPBeSm31i3f4wyoN49maLqlcJfrIeh4Bkdi3b3Zgz5
TB0+jaYR0FJVL9KawoB3T/c5XEB3Wu2U5bJ8dtANnfBWMKRo8WfEniIXmOUziYiU
lmP7cewmpc2AiJPG2Cm7g+huenP+j9Y+CzlwOYFIMBy+xrlT31SRp2/cVIclDHmL
A1CU3JFvcbwwLz59okMPdZQbbXsB3sMh4qsmbE/jXFCBUJr4iQUcOaB56weC9x84
lTYhoeqQDIM2h2q/2SnO
=Hk5i
-----END PGP SIGNATURE-----

Re: [PATCH 14/27] metag: Use common bits from generic tlb.h

[James Hogan]

[-- Attachment #1: Type: text/plain, Size: 1140 bytes --]

On 14/05/14 19:59, Richard Weinberger wrote:
> It is no longer needed to define them on our own.
> 
> Cc: James Hogan <james.hogan@imgtec.com>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: linux-metag@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Richard Weinberger <richard@nod.at>

Acked-by: James Hogan <james.hogan@imgtec.com>

Thanks
James

> ---
>  arch/metag/include/asm/tlb.h | 10 ----------
>  1 file changed, 10 deletions(-)
> 
> diff --git a/arch/metag/include/asm/tlb.h b/arch/metag/include/asm/tlb.h
> index 048282f1..0fb0b46 100644
> --- a/arch/metag/include/asm/tlb.h
> +++ b/arch/metag/include/asm/tlb.h
> @@ -19,18 +19,8 @@
>  		if (!tlb->fullmm)					      \
>  			flush_tlb_range(vma, vma->vm_start, vma->vm_end);     \
>  	} while (0)
> -
> -
> -#else
> -
> -#define tlb_start_vma(tlb, vma)			do { } while (0)
> -#define tlb_end_vma(tlb, vma)			do { } while (0)
> -
>  #endif
>  
> -#define __tlb_remove_tlb_entry(tlb, pte, addr)	do { } while (0)
> -#define tlb_flush(tlb)				flush_tlb_mm((tlb)->mm)
> -
>  #include <asm-generic/tlb.h>
>  
>  #endif
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: Consolidate tlb.h

[Peter Zijlstra]

[-- Attachment #1: Type: text/plain, Size: 263 bytes --]

On Thu, May 15, 2014 at 10:48:37AM +0200, Richard Weinberger wrote:

> If it helps I can pickup your series and finalize it.
> Actually I was abound to consolidate TLB gather implementations too.

If you have the cycles, please do. I'll try and help where I can.

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 01/27] arm64: Override defaults from generic/tlb.h

[Catalin Marinas]

On Wed, May 14, 2014 at 07:59:33PM +0100, Richard Weinberger wrote:
> --- a/arch/arm64/include/asm/tlb.h
> +++ b/arch/arm64/include/asm/tlb.h
> @@ -19,7 +19,14 @@
>  #ifndef __ASM_TLB_H
>  #define __ASM_TLB_H
>  
> +/* These defines are needed to override the defaults from asm-generic/tlb.h */
>  #define  __tlb_remove_pmd_tlb_entry __tlb_remove_pmd_tlb_entry
> +#define tlb_start_vma tlb_start_vma
> +#define tlb_end_vma tlb_end_vma
> +#define __tlb_remove_tlb_entry __tlb_remove_tlb_entry
> +#define tlb_flush tlb_flush
> +#define __pte_free_tlb __pte_free_tlb
> +#define __pmd_free_tlb __pmd_free_tlb
>  
>  #include <asm-generic/tlb.h>

Acked-by: Catalin Marinas <catalin.marinas@arm.com>

I hope subsequent series would consolidate some more of the above (for
example tlb_start_vma() is not really arm64 specific.

Re: [PATCH 01/27] arm64: Override defaults from generic/tlb.h

[Richard Weinberger]

Am 15.05.2014 11:34, schrieb Catalin Marinas:
> On Wed, May 14, 2014 at 07:59:33PM +0100, Richard Weinberger wrote:
>> --- a/arch/arm64/include/asm/tlb.h
>> +++ b/arch/arm64/include/asm/tlb.h
>> @@ -19,7 +19,14 @@
>>  #ifndef __ASM_TLB_H
>>  #define __ASM_TLB_H
>>  
>> +/* These defines are needed to override the defaults from asm-generic/tlb.h */
>>  #define  __tlb_remove_pmd_tlb_entry __tlb_remove_pmd_tlb_entry
>> +#define tlb_start_vma tlb_start_vma
>> +#define tlb_end_vma tlb_end_vma
>> +#define __tlb_remove_tlb_entry __tlb_remove_tlb_entry
>> +#define tlb_flush tlb_flush
>> +#define __pte_free_tlb __pte_free_tlb
>> +#define __pmd_free_tlb __pmd_free_tlb
>>  
>>  #include <asm-generic/tlb.h>
> 
> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
> 
> I hope subsequent series would consolidate some more of the above (for
> example tlb_start_vma() is not really arm64 specific.

Yes, peterz pointed me to a not jet merged series which consolidates
much more.
I'll revive it.

Thanks,
//richard

Re: [PATCH 13/27] m68k: Use common bits from generic tlb.h

[Geert Uytterhoeven]

Hi Richard,

On Wed, May 14, 2014 at 10:57 PM, Richard Weinberger <richard@nod.at> wrote:
>> On Wed, May 14, 2014 at 9:26 PM, Richard Weinberger <richard@nod.at> wrote:
>>>> But why this sudden #ifdef checks?
>>>
>>> They are needed because in pgalloc.h you have:
>>> #ifdef CONFIG_MMU
>>> #include <asm/virtconvert.h>
>>> #if defined(CONFIG_COLDFIRE)
>>> #include <asm/mcf_pgalloc.h>
>>> #elif defined(CONFIG_SUN3)
>>> #include <asm/sun3_pgalloc.h>
>>> #else
>>> #include <asm/motorola_pgalloc.h>
>>> #endif
>>>
>>> And only asm/motorola_pgalloc.h have __pte/pmd_free_tlb as static inline functions.
>>> Therefore we need to define them such that the generic tlb.h versions will not clash
>>> with yours.
>>
>> Thanks for the clarification!
>
> One problem which arises here is that me need to make sure that pgalloc.h is included before
> tlb.h. Which kind of sucks.

Indeed.

arch/m68k/include/asm/mmu_context.h includes pgalloc.h, but not tlb.h.
Didn't check whether it gets it indirectly.

> I'll move __pte/pmd_free_tlb from *_pgalloc.h into tlb.h to prevent this issue.
>
> Are you fine with that?

As long as it compiles, I'm happy ;-)

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 16/27] mips: Use common bits from generic tlb.h

[Leonid Yegoshin]

On 05/14/2014 11:59 AM, Richard Weinberger wrote:
> It is no longer needed to define them on our own.
>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: John Crispin <blogic@openwrt.org>
> Cc: Markos Chandras <markos.chandras@imgtec.com>
> Cc: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: linux-mips@linux-mips.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Richard Weinberger <richard@nod.at>
> ---
>   arch/mips/include/asm/tlb.h | 7 -------
>   1 file changed, 7 deletions(-)
>
> diff --git a/arch/mips/include/asm/tlb.h b/arch/mips/include/asm/tlb.h
> index 4a23493..5ea43ca 100644
> --- a/arch/mips/include/asm/tlb.h
> +++ b/arch/mips/include/asm/tlb.h
> @@ -10,13 +10,6 @@
>   		if (!tlb->fullmm)				\
>   			flush_cache_range(vma, vma->vm_start, vma->vm_end); \
>   	}  while (0)
> -#define tlb_end_vma(tlb, vma) do { } while (0)
> -#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)
> -
> -/*
> - * .. because we flush the whole mm when it fills up.
> - */
> -#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
>   
>   #define UNIQUE_ENTRYHI(idx)						\
>   		((CKSEG0 + ((idx) << (PAGE_SHIFT + 1))) |		\

I would like to know why these functions are eliminated (don't find any 
clue).
Is it just because there will be a generic one or the calls would be 
eliminated?
And if there are generic - can I tune it later?

Explanation of Q:  MIPS R6 architecture has now TLBINV instruction which 
eliminates TLB elements only for specific ASID (read here - "mm_struct") 
and I would like to use it for efficiency in tlb_flush()/flush_tlb_mm.
(Not sure about tlb_end_vma()/ __tlb_remove_tlb_entry() yet)

- Leonid.

Re: [PATCH 16/27] mips: Use common bits from generic tlb.h

[Richard Weinberger]

Am 15.05.2014 20:02, schrieb Leonid Yegoshin:
> On 05/14/2014 11:59 AM, Richard Weinberger wrote:
>> It is no longer needed to define them on our own.
>>
>> Cc: Ralf Baechle <ralf@linux-mips.org>
>> Cc: John Crispin <blogic@openwrt.org>
>> Cc: Markos Chandras <markos.chandras@imgtec.com>
>> Cc: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
>> Cc: Richard Weinberger <richard@nod.at>
>> Cc: linux-mips@linux-mips.org
>> Cc: linux-kernel@vger.kernel.org
>> Signed-off-by: Richard Weinberger <richard@nod.at>
>> ---
>>   arch/mips/include/asm/tlb.h | 7 -------
>>   1 file changed, 7 deletions(-)
>>
>> diff --git a/arch/mips/include/asm/tlb.h b/arch/mips/include/asm/tlb.h
>> index 4a23493..5ea43ca 100644
>> --- a/arch/mips/include/asm/tlb.h
>> +++ b/arch/mips/include/asm/tlb.h
>> @@ -10,13 +10,6 @@
>>           if (!tlb->fullmm)                \
>>               flush_cache_range(vma, vma->vm_start, vma->vm_end); \
>>       }  while (0)
>> -#define tlb_end_vma(tlb, vma) do { } while (0)
>> -#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)
>> -
>> -/*
>> - * .. because we flush the whole mm when it fills up.
>> - */
>> -#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
>>     #define UNIQUE_ENTRYHI(idx)                        \
>>           ((CKSEG0 + ((idx) << (PAGE_SHIFT + 1))) |        \
> 
> I would like to know why these functions are eliminated (don't find any clue).
> Is it just because there will be a generic one or the calls would be eliminated?

There will be a generic one.
See [PATCH 03/27] generic/tlb.h: Move common defines into generic tlb.h

> And if there are generic - can I tune it later?

Yes. You can always define your own and override the generic one.

Thanks,
//richard

Re: [PATCH 11/27] hexagon: Use common bits from generic tlb.h

[rkuo]

On Wed, May 14, 2014 at 08:59:43PM +0200, Richard Weinberger wrote:
> It is no longer needed to define them on our own.
> 
> Cc: Richard Kuo <rkuo@codeaurora.org>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Ingo Molnar <mingo@kernel.org>
> Cc: Tim Chen <tim.c.chen@linux.intel.com>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Chen Gang <gang.chen.5i5j@gmail.com>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: linux-hexagon@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Richard Weinberger <richard@nod.at>
> ---
>  arch/hexagon/include/asm/Kbuild |  1 +
>  arch/hexagon/include/asm/tlb.h  | 39 ---------------------------------------
>  2 files changed, 1 insertion(+), 39 deletions(-)
>  delete mode 100644 arch/hexagon/include/asm/tlb.h
> 

Worked for Hexagon, thanks.

Acked-by: Richard Kuo <rkuo@codeaurora.org>

-- 

Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

回复： [PATCH 25/27] unicore32: Use common bits from generic tlb.h

[管雪涛]

Great.

Btw, please cc first email in this patch series to everyone.

Acked-by: Xuetao Guan <gxt@mprc.pku.edu.cn>

----- Richard Weinberger <richard@nod.at> 写道：
> It is no longer needed to define them on our own.
> 
> Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Richard Weinberger <richard@nod.at>
> ---
>  arch/unicore32/include/asm/tlb.h | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/arch/unicore32/include/asm/tlb.h b/arch/unicore32/include/asm/tlb.h
> index 9cca15c..e6ba38a 100644
> --- a/arch/unicore32/include/asm/tlb.h
> +++ b/arch/unicore32/include/asm/tlb.h
> @@ -12,11 +12,6 @@
>  #ifndef __UNICORE_TLB_H__
>  #define __UNICORE_TLB_H__
>  
> -#define tlb_start_vma(tlb, vma)				do { } while (0)
> -#define tlb_end_vma(tlb, vma)				do { } while (0)
> -#define __tlb_remove_tlb_entry(tlb, ptep, address)	do { } while (0)
> -#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
> -
>  #define __pte_free_tlb(tlb, pte, addr)				\
>  	do {							\
>  		pgtable_page_dtor(pte);				\
> -- 
> 1.8.4.2
> 

Re: [PATCH 26/27] x86: Use common bits from generic tlb.h

[H. Peter Anvin]

On 05/14/2014 11:59 AM, Richard Weinberger wrote:
> It is no longer needed to define them on our own.
> 
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: x86@kernel.org
> Cc: Richard Weinberger <richard@nod.at>
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Richard Weinberger <richard@nod.at>
> ---
>  arch/x86/include/asm/tlb.h | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/arch/x86/include/asm/tlb.h b/arch/x86/include/asm/tlb.h
> index c779730..f4c76d6 100644
> --- a/arch/x86/include/asm/tlb.h
> +++ b/arch/x86/include/asm/tlb.h
> @@ -1,10 +1,6 @@
>  #ifndef _ASM_X86_TLB_H
>  #define _ASM_X86_TLB_H
>  
> -#define tlb_start_vma(tlb, vma) do { } while (0)
> -#define tlb_end_vma(tlb, vma) do { } while (0)
> -#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)
> -
>  #define tlb_flush(tlb)							\
>  {									\
>  	if (!tlb->fullmm && !tlb->need_flush_all) 			\
> 

Quite trivial, obviously.

Acked-by: H. Peter Anvin <hpa@linux.intel.com>

Re: [PATCH 16/27] mips: Use common bits from generic tlb.h

[Ralf Baechle]

On Wed, May 14, 2014 at 08:59:48PM +0200, Richard Weinberger wrote:

Acked-by: Ralf Baechle <ralf@linux-mips.org>

  Ralf