From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vineet Gupta Subject: [PATCH 2/3] asm-generic/tlb: stub out p4d_free_tlb() if __PAGETABLE_P4D_FOLDED ... Date: Wed, 9 Oct 2019 15:26:57 -0700 Message-ID: <20191009222658.961-3-vgupta@synopsys.com> References: <20191009222658.961-1-vgupta@synopsys.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20191009222658.961-1-vgupta@synopsys.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-mm@kvack.org Cc: linux-snps-arc@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Arnd Bergmann , Will Deacon , "Aneesh Kumar K . V" , Andrew Morton , Nick Piggin , Peter Zijlstra , "Kirill A . Shutemov" , Vineet Gupta List-Id: linux-arch.vger.kernel.org ... independent of __ARCH_HAS_5LEVEL_HACK This came up when removing __ARCH_HAS_5LEVEL_HACK for ARC as code bloat from p4d_free_tlb() despite pud being folded (with 2 levels on ARC) | 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% Signed-off-by: Vineet Gupta --- include/asm-generic/5level-fixup.h | 2 -- include/asm-generic/tlb.h | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/asm-generic/5level-fixup.h b/include/asm-generic/5level-fixup.h index f6947da70d71..c855b5cf4425 100644 --- a/include/asm-generic/5level-fixup.h +++ b/include/asm-generic/5level-fixup.h @@ -48,8 +48,6 @@ static inline int p4d_present(p4d_t p4d) #define __p4d(x) __pgd(x) #define set_p4d(p4dp, p4d) set_pgd(p4dp, 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) diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index 1f83188cb331..f3dad87f4ecc 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h @@ -598,7 +598,7 @@ static inline void tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vm #define pud_free_tlb(tlb, pudp, address) do { } while (0) #endif -#ifndef __ARCH_HAS_5LEVEL_HACK +#ifndef __PAGETABLE_P4D_FOLDED #ifndef p4d_free_tlb #define p4d_free_tlb(tlb, pudp, address) \ do { \ @@ -607,6 +607,8 @@ static inline void tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vm __p4d_free_tlb(tlb, pudp, address); \ } while (0) #endif +#else +#define p4d_free_tlb(tlb, pudp, address) do { } while (0) #endif #endif /* CONFIG_MMU */ -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dc2-smtprelay2.synopsys.com ([198.182.61.142]:55084 "EHLO smtprelay-out1.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732216AbfJIW1I (ORCPT ); Wed, 9 Oct 2019 18:27:08 -0400 From: Vineet Gupta Subject: [PATCH 2/3] asm-generic/tlb: stub out p4d_free_tlb() if __PAGETABLE_P4D_FOLDED ... Date: Wed, 9 Oct 2019 15:26:57 -0700 Message-ID: <20191009222658.961-3-vgupta@synopsys.com> In-Reply-To: <20191009222658.961-1-vgupta@synopsys.com> References: <20191009222658.961-1-vgupta@synopsys.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-mm@kvack.org Cc: linux-snps-arc@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Arnd Bergmann , Will Deacon , "Aneesh Kumar K . V" , Andrew Morton , Nick Piggin , Peter Zijlstra , "Kirill A . Shutemov" , Vineet Gupta Message-ID: <20191009222657.fFkq4TboXWjLIM8IIRxlI5d8SuB9o5d54ZxMMOIU9KE@z> ... independent of __ARCH_HAS_5LEVEL_HACK This came up when removing __ARCH_HAS_5LEVEL_HACK for ARC as code bloat from p4d_free_tlb() despite pud being folded (with 2 levels on ARC) | 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% Signed-off-by: Vineet Gupta --- include/asm-generic/5level-fixup.h | 2 -- include/asm-generic/tlb.h | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/asm-generic/5level-fixup.h b/include/asm-generic/5level-fixup.h index f6947da70d71..c855b5cf4425 100644 --- a/include/asm-generic/5level-fixup.h +++ b/include/asm-generic/5level-fixup.h @@ -48,8 +48,6 @@ static inline int p4d_present(p4d_t p4d) #define __p4d(x) __pgd(x) #define set_p4d(p4dp, p4d) set_pgd(p4dp, 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) diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index 1f83188cb331..f3dad87f4ecc 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h @@ -598,7 +598,7 @@ static inline void tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vm #define pud_free_tlb(tlb, pudp, address) do { } while (0) #endif -#ifndef __ARCH_HAS_5LEVEL_HACK +#ifndef __PAGETABLE_P4D_FOLDED #ifndef p4d_free_tlb #define p4d_free_tlb(tlb, pudp, address) \ do { \ @@ -607,6 +607,8 @@ static inline void tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vm __p4d_free_tlb(tlb, pudp, address); \ } while (0) #endif +#else +#define p4d_free_tlb(tlb, pudp, address) do { } while (0) #endif #endif /* CONFIG_MMU */ -- 2.20.1