diff mbox series

[039/158] asm-generic/tlb: stub out p4d_free_tlb() if nop4d ...

Message ID 20191201015113.4sakLx4B5%akpm@linux-foundation.org (mailing list archive)
State New, archived
Headers show
Series [001/158] scripts/spelling.txt: add more spellings to spelling.txt | expand

Commit Message

Andrew Morton Dec. 1, 2019, 1:51 a.m. UTC
From: Vineet Gupta <Vineet.Gupta1@synopsys.com>
Subject: asm-generic/tlb: stub out p4d_free_tlb() if nop4d ...

... independent of __ARCH_HAS_5LEVEL_HACK

This came up when removing __ARCH_HAS_5LEVEL_HACK for ARC as code bloat.
With this patch we see the following code reduction

| bloat-o-meter2 vmlinux-C-elide-pud_free_tlb vmlinux-D-elide-p4d_free_tlb
| add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-104 (-104)
| function                                     old     new   delta
| free_pgd_range                               552     422    -130
| Total: Before=4137172, After=4137042, chg -1.000000%

Link: http://lkml.kernel.org/r/20191016162400.14796-4-vgupta@synopsys.com
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: "Aneesh Kumar K . V" <aneesh.kumar@linux.ibm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Nick Piggin <npiggin@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/asm-generic/5level-fixup.h  |    1 -
 include/asm-generic/pgtable-nop4d.h |    2 +-
 include/asm-generic/tlb.h           |    2 --
 3 files changed, 1 insertion(+), 4 deletions(-)
diff mbox series

Patch

--- a/include/asm-generic/5level-fixup.h~asm-generic-tlb-stub-out-p4d_free_tlb-if-nop4d
+++ a/include/asm-generic/5level-fixup.h
@@ -51,7 +51,6 @@  static inline int p4d_present(p4d_t p4d)
 #undef p4d_free_tlb
 #define p4d_free_tlb(tlb, x, addr)	do { } while (0)
 #define p4d_free(mm, x)			do { } while (0)
-#define __p4d_free_tlb(tlb, x, addr)	do { } while (0)
 
 #undef  p4d_addr_end
 #define p4d_addr_end(addr, end)		(end)
--- a/include/asm-generic/pgtable-nop4d.h~asm-generic-tlb-stub-out-p4d_free_tlb-if-nop4d
+++ a/include/asm-generic/pgtable-nop4d.h
@@ -50,7 +50,7 @@  static inline p4d_t *p4d_offset(pgd_t *p
  */
 #define p4d_alloc_one(mm, address)		NULL
 #define p4d_free(mm, x)				do { } while (0)
-#define __p4d_free_tlb(tlb, x, a)		do { } while (0)
+#define p4d_free_tlb(tlb, x, a)			do { } while (0)
 
 #undef  p4d_addr_end
 #define p4d_addr_end(addr, end)			(end)
--- a/include/asm-generic/tlb.h~asm-generic-tlb-stub-out-p4d_free_tlb-if-nop4d
+++ a/include/asm-generic/tlb.h
@@ -594,7 +594,6 @@  static inline void tlb_end_vma(struct mm
 	} while (0)
 #endif
 
-#ifndef __ARCH_HAS_5LEVEL_HACK
 #ifndef p4d_free_tlb
 #define p4d_free_tlb(tlb, pudp, address)			\
 	do {							\
@@ -603,7 +602,6 @@  static inline void tlb_end_vma(struct mm
 		__p4d_free_tlb(tlb, pudp, address);		\
 	} while (0)
 #endif
-#endif
 
 #endif /* CONFIG_MMU */