From patchwork Thu Feb 20 08:42:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Sivaraj X-Patchwork-Id: 231059 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 395CCC11D04 for ; Thu, 20 Feb 2020 08:42:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0481024654 for ; Thu, 20 Feb 2020 08:42:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=fossix-org.20150623.gappssmtp.com header.i=@fossix-org.20150623.gappssmtp.com header.b="Cejc6rF0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726859AbgBTIm5 (ORCPT ); Thu, 20 Feb 2020 03:42:57 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:43149 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726764AbgBTIm5 (ORCPT ); Thu, 20 Feb 2020 03:42:57 -0500 Received: by mail-pf1-f195.google.com with SMTP id s1so1566268pfh.10 for ; Thu, 20 Feb 2020 00:42:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fossix-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IkHbAFVrF1jLtsVkRPZ8g60XoOSh85f3XbwjYIfo/8M=; b=Cejc6rF0G0seIsR5OFOR4jf09gox5PBaMeXGKrI3OY7LJ/y+A0HGIruOfwbnv39nB1 1o8Ze2e8JgJRQ0ke3i3pOMPM8kgrPIMDxI2KSwPAbk+TAmVu8MPLq8kYSCqF7wjIwO30 zTDKG2IBQUfj1+14LeWlXlddjUzaaidsSvds8+zenwh/epPKXh3iCGMillcTQwC8dfbW uU+e6v/64zC4Y+Ro8xDLzap3BgF3VeYEUvw3RWzPZRfeo3s9yoFyOnaUYA4clP05NmZf m35FqnQTrt/qaw/PrZD0DiiZwq9/BkH/O7zlymkbixm/mYMkPetMRJs3/PiZH9VX29MD B9ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IkHbAFVrF1jLtsVkRPZ8g60XoOSh85f3XbwjYIfo/8M=; b=DwZIuxqNb17p80FIK3Sh1P/992n2Ws+vuOwliT8dNizuOwpByucgJhZvD5Vox0rAqi E1IrCs/odMwIziBX/VIgJthSsxl401D9HOV1pA6QaJ85cqD5hdny95Ch2Gwtt07ItpnZ DGjNmk667lwNpBvPo3Pk8up6PcFJbgxKcdfbfpUn+z9U3obrZOyo2t161MTv6wogYk5q ki8MEepfGmWeUwEZ20vzAB1iIpltnV6JJ2THfO4LdLRjMzSqrzSjroTdeFCOJomfG7Fc mooRQufgmsVBVCT0u3k5tt4j8GQ6mPGR4pwj7KHf60rodnokdNhwYZb3Wy7bXTr6qmgn dRUw== X-Gm-Message-State: APjAAAURLxmHooMflVUvNTPuR8cgr7jl1ovyMamjK3C0BBsqag6FK7KT fpO2XnAKzsQv5SdPVPaINK6Yg4+Iixs= X-Google-Smtp-Source: APXvYqxkadfEg0KbGXAWwuE/+B2zs6X/g8vC+BlOvou97XaH5FF16e6eDu2uP4x0Z6FyRu3ODMYjYw== X-Received: by 2002:a62:1a16:: with SMTP id a22mr30986817pfa.34.1582188175934; Thu, 20 Feb 2020 00:42:55 -0800 (PST) Received: from santosiv.in.ibm.com ([129.41.84.72]) by smtp.gmail.com with ESMTPSA id r145sm2512381pfr.5.2020.02.20.00.42.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 00:42:55 -0800 (PST) From: Santosh Sivaraj To: linuxppc-dev , stable@vger.kernel.org Cc: peterz@infradead.org, aneesh.kumar@linux.ibm.com, akshay.adiga@linux.ibm.com, gregkh@linuxfoundation.org, Will Deacon Subject: [PATCH 2/6] asm-generic/tlb: Track which levels of the page tables have been cleared Date: Thu, 20 Feb 2020 14:12:25 +0530 Message-Id: <20200220084229.1278137-3-santosh@fossix.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200220084229.1278137-1-santosh@fossix.org> References: <20200220084229.1278137-1-santosh@fossix.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Will Deacon It is common for architectures with hugepage support to require only a single TLB invalidation operation per hugepage during unmap(), rather than iterating through the mapping at a PAGE_SIZE increment. Currently, however, the level in the page table where the unmap() operation occurs is not stored in the mmu_gather structure, therefore forcing architectures to issue additional TLB invalidation operations or to give up and over-invalidate by e.g. invalidating the entire TLB. Ideally, we could add an interval rbtree to the mmu_gather structure, which would allow us to associate the correct mapping granule with the various sub-mappings within the range being invalidated. However, this is costly in terms of book-keeping and memory management, so instead we approximate by keeping track of the page table levels that are cleared and provide a means to query the smallest granule required for invalidation. a6d60245d6d9 in upstream Signed-off-by: Will Deacon Cc: # 4.19 Signed-off-by: Santosh Sivaraj [santosh: prerequisite for upcoming tlbflush backports] --- include/asm-generic/tlb.h | 58 +++++++++++++++++++++++++++++++++------ mm/memory.c | 4 ++- 2 files changed, 53 insertions(+), 9 deletions(-) diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index 97306b32d8d2..f2b9dc9cbaf8 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h @@ -114,6 +114,14 @@ struct mmu_gather { */ unsigned int freed_tables : 1; + /* + * at which levels have we cleared entries? + */ + unsigned int cleared_ptes : 1; + unsigned int cleared_pmds : 1; + unsigned int cleared_puds : 1; + unsigned int cleared_p4ds : 1; + struct mmu_gather_batch *active; struct mmu_gather_batch local; struct page *__pages[MMU_GATHER_BUNDLE]; @@ -148,6 +156,10 @@ static inline void __tlb_reset_range(struct mmu_gather *tlb) tlb->end = 0; } tlb->freed_tables = 0; + tlb->cleared_ptes = 0; + tlb->cleared_pmds = 0; + tlb->cleared_puds = 0; + tlb->cleared_p4ds = 0; } static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb) @@ -197,6 +209,25 @@ static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb, } #endif +static inline unsigned long tlb_get_unmap_shift(struct mmu_gather *tlb) +{ + if (tlb->cleared_ptes) + return PAGE_SHIFT; + if (tlb->cleared_pmds) + return PMD_SHIFT; + if (tlb->cleared_puds) + return PUD_SHIFT; + if (tlb->cleared_p4ds) + return P4D_SHIFT; + + return PAGE_SHIFT; +} + +static inline unsigned long tlb_get_unmap_size(struct mmu_gather *tlb) +{ + return 1UL << tlb_get_unmap_shift(tlb); +} + /* * 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, @@ -230,13 +261,19 @@ static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb, #define tlb_remove_tlb_entry(tlb, ptep, address) \ do { \ __tlb_adjust_range(tlb, address, PAGE_SIZE); \ + tlb->cleared_ptes = 1; \ __tlb_remove_tlb_entry(tlb, ptep, address); \ } while (0) -#define tlb_remove_huge_tlb_entry(h, tlb, ptep, address) \ - do { \ - __tlb_adjust_range(tlb, address, huge_page_size(h)); \ - __tlb_remove_tlb_entry(tlb, ptep, address); \ +#define tlb_remove_huge_tlb_entry(h, tlb, ptep, address) \ + do { \ + unsigned long _sz = huge_page_size(h); \ + __tlb_adjust_range(tlb, address, _sz); \ + if (_sz == PMD_SIZE) \ + tlb->cleared_pmds = 1; \ + else if (_sz == PUD_SIZE) \ + tlb->cleared_puds = 1; \ + __tlb_remove_tlb_entry(tlb, ptep, address); \ } while (0) /** @@ -250,6 +287,7 @@ static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb, #define tlb_remove_pmd_tlb_entry(tlb, pmdp, address) \ do { \ __tlb_adjust_range(tlb, address, HPAGE_PMD_SIZE); \ + tlb->cleared_pmds = 1; \ __tlb_remove_pmd_tlb_entry(tlb, pmdp, address); \ } while (0) @@ -264,6 +302,7 @@ static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb, #define tlb_remove_pud_tlb_entry(tlb, pudp, address) \ do { \ __tlb_adjust_range(tlb, address, HPAGE_PUD_SIZE); \ + tlb->cleared_puds = 1; \ __tlb_remove_pud_tlb_entry(tlb, pudp, address); \ } while (0) @@ -289,7 +328,8 @@ static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb, #define pte_free_tlb(tlb, ptep, address) \ do { \ __tlb_adjust_range(tlb, address, PAGE_SIZE); \ - tlb->freed_tables = 1; \ + tlb->freed_tables = 1; \ + tlb->cleared_pmds = 1; \ __pte_free_tlb(tlb, ptep, address); \ } while (0) #endif @@ -298,7 +338,8 @@ static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb, #define pmd_free_tlb(tlb, pmdp, address) \ do { \ __tlb_adjust_range(tlb, address, PAGE_SIZE); \ - tlb->freed_tables = 1; \ + tlb->freed_tables = 1; \ + tlb->cleared_puds = 1; \ __pmd_free_tlb(tlb, pmdp, address); \ } while (0) #endif @@ -308,7 +349,8 @@ static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb, #define pud_free_tlb(tlb, pudp, address) \ do { \ __tlb_adjust_range(tlb, address, PAGE_SIZE); \ - tlb->freed_tables = 1; \ + tlb->freed_tables = 1; \ + tlb->cleared_p4ds = 1; \ __pud_free_tlb(tlb, pudp, address); \ } while (0) #endif @@ -319,7 +361,7 @@ static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb, #define p4d_free_tlb(tlb, pudp, address) \ do { \ __tlb_adjust_range(tlb, address, PAGE_SIZE); \ - tlb->freed_tables = 1; \ + tlb->freed_tables = 1; \ __p4d_free_tlb(tlb, pudp, address); \ } while (0) #endif diff --git a/mm/memory.c b/mm/memory.c index bbf0cc4066c8..1832c5ed6ac0 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -267,8 +267,10 @@ void arch_tlb_finish_mmu(struct mmu_gather *tlb, { struct mmu_gather_batch *batch, *next; - if (force) + if (force) { + __tlb_reset_range(tlb); __tlb_adjust_range(tlb, start, end - start); + } tlb_flush_mmu(tlb); From patchwork Thu Feb 20 08:42:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Sivaraj X-Patchwork-Id: 231058 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17C03C11D00 for ; Thu, 20 Feb 2020 08:43:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D7736207FD for ; Thu, 20 Feb 2020 08:43:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=fossix-org.20150623.gappssmtp.com header.i=@fossix-org.20150623.gappssmtp.com header.b="s94zVd+q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726865AbgBTInC (ORCPT ); Thu, 20 Feb 2020 03:43:02 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:39474 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726764AbgBTInC (ORCPT ); Thu, 20 Feb 2020 03:43:02 -0500 Received: by mail-pl1-f193.google.com with SMTP id g6so1280629plp.6 for ; Thu, 20 Feb 2020 00:43:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fossix-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3gKgbuQ+qyW6cSoObrFJbrpeEDkVLaM+BEDocK6BCUQ=; b=s94zVd+qdhp6grErmY5Om0h7V3Zf02oLkoMoLb2t/AQywv7xojk7BWN7lnaefzDX4V fAy7b+AZfMB+PzeQJ0ZkzxrGXZJS6KOoo0X4sUuiDZUO6fxM8XfOafVJ3w+N7VtrJgzH FQ3BuAczsNhmzctG/kdf+0e2Yu9zAS1NkMyVvHt9GzDXEdhAOIOjVUMeVhpfwLO4M5E7 +VXpM7/rrYU+E2+Vz+PgJIZ8/4hOX0wHm3nI+Tb1gLD59Toer402jVvaBH/tee1eRrhB XcaW0MLfEaeLPuTf2Z5kxMPV3huqDBJyPVW0/F77Te52Fmtbj2mXO18AvjKeVPURj7bB btrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3gKgbuQ+qyW6cSoObrFJbrpeEDkVLaM+BEDocK6BCUQ=; b=YNorxmZsmcZExrI3cW0f2JqeMfYKDz6ggmcR3dGAt/6JAwNUpDq0eKSz9RpcV0ZCwC 06xHCLBbnDTijJnyDlQ0gEIMkc8JQ86ZRKBc13JZ4TYJzXNkNuDRxDdLu7qC0pLV6f2l pgXkXhQKQaztu56QgYD3Xm3gwjsuTDUDDsH9TwE590Lkd+qxh9Gr1nor7pXd60EgnrhH mAJZmNeEbf140aDrYgirdJtZYGQXR1tJxjtlPYkcfJzpnwwySZDVZn/HoeL+Qv+llMRU iMjRpU5AosKa0tRLvCyTCIkSXhPTuu+B/M8B5nMCMrVsXo4xYA23DHYtCKUw7INChzSU 9xeA== X-Gm-Message-State: APjAAAU8Xt2/IkG//+zJcK/b8AUq7nSYw5ZUbjTYE0CaR3epzz6qnUE5 r/uyMajckXnQ+QdsyWPX2qvLOAnv/Qo= X-Google-Smtp-Source: APXvYqyRBfvUbgHm/BRv3pVhx5sTcraF9XyZo4Mho4MdiH1Tp0615HezjwCAFENHyx5dXPgJ8yqeMg== X-Received: by 2002:a17:90b:30c9:: with SMTP id hi9mr2250522pjb.81.1582188181592; Thu, 20 Feb 2020 00:43:01 -0800 (PST) Received: from santosiv.in.ibm.com ([129.41.84.72]) by smtp.gmail.com with ESMTPSA id r145sm2512381pfr.5.2020.02.20.00.42.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 00:43:01 -0800 (PST) From: Santosh Sivaraj To: linuxppc-dev , stable@vger.kernel.org Cc: peterz@infradead.org, aneesh.kumar@linux.ibm.com, akshay.adiga@linux.ibm.com, gregkh@linuxfoundation.org Subject: [PATCH 4/6] powerpc/mmu_gather: enable RCU_TABLE_FREE even for !SMP case Date: Thu, 20 Feb 2020 14:12:27 +0530 Message-Id: <20200220084229.1278137-5-santosh@fossix.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200220084229.1278137-1-santosh@fossix.org> References: <20200220084229.1278137-1-santosh@fossix.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: "Aneesh Kumar K.V" Patch series "Fixup page directory freeing", v4. This is a repost of patch series from Peter with the arch specific changes except ppc64 dropped. ppc64 changes are added here because we are redoing the patch series on top of ppc64 changes. This makes it easy to backport these changes. Only the first 2 patches need to be backported to stable. The thing is, on anything SMP, freeing page directories should observe the exact same order as normal page freeing: 1) unhook page/directory 2) TLB invalidate 3) free page/directory Without this, any concurrent page-table walk could end up with a Use-after-Free. This is esp. trivial for anything that has software page-table walkers (HAVE_FAST_GUP / software TLB fill) or the hardware caches partial page-walks (ie. caches page directories). Even on UP this might give issues since mmu_gather is preemptible these days. An interrupt or preempted task accessing user pages might stumble into the free page if the hardware caches page directories. This patch series fixes ppc64 and add generic MMU_GATHER changes to support the conversion of other architectures. I haven't added patches w.r.t other architecture because they are yet to be acked. This patch (of 9): A followup patch is going to make sure we correctly invalidate page walk cache before we free page table pages. In order to keep things simple enable RCU_TABLE_FREE even for !SMP so that we don't have to fixup the !SMP case differently in the followup patch !SMP case is right now broken for radix translation w.r.t page walk cache flush. We can get interrupted in between page table free and that would imply we have page walk cache entries pointing to tables which got freed already. Michael said "both our platforms that run on Power9 force SMP on in Kconfig, so the !SMP case is unlikely to be a problem for anyone in practice, unless they've hacked their kernel to build it !SMP." 12e4d53f3f04e in upstream. Link: http://lkml.kernel.org/r/20200116064531.483522-2-aneesh.kumar@linux.ibm.com Signed-off-by: Aneesh Kumar K.V Cc: # 4.19 Signed-off-by: Santosh Sivaraj [santosh: backported for 4.19 stable] --- arch/powerpc/Kconfig | 2 +- arch/powerpc/include/asm/book3s/32/pgalloc.h | 8 -------- arch/powerpc/include/asm/book3s/64/pgalloc.h | 2 -- arch/powerpc/mm/pgtable-book3s64.c | 7 ------- 4 files changed, 1 insertion(+), 18 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index f7f046ff6407..fa231130eee1 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -215,7 +215,7 @@ config PPC select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP - select HAVE_RCU_TABLE_FREE if SMP + select HAVE_RCU_TABLE_FREE select HAVE_RCU_TABLE_NO_INVALIDATE if HAVE_RCU_TABLE_FREE select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_RELIABLE_STACKTRACE if PPC64 && CPU_LITTLE_ENDIAN diff --git a/arch/powerpc/include/asm/book3s/32/pgalloc.h b/arch/powerpc/include/asm/book3s/32/pgalloc.h index 82e44b1a00ae..79ba3fbb512e 100644 --- a/arch/powerpc/include/asm/book3s/32/pgalloc.h +++ b/arch/powerpc/include/asm/book3s/32/pgalloc.h @@ -110,7 +110,6 @@ static inline void pgtable_free(void *table, unsigned index_size) #define check_pgt_cache() do { } while (0) #define get_hugepd_cache_index(x) (x) -#ifdef CONFIG_SMP static inline void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift) { @@ -127,13 +126,6 @@ static inline void __tlb_remove_table(void *_table) pgtable_free(table, shift); } -#else -static inline void pgtable_free_tlb(struct mmu_gather *tlb, - void *table, int shift) -{ - pgtable_free(table, shift); -} -#endif static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table, unsigned long address) diff --git a/arch/powerpc/include/asm/book3s/64/pgalloc.h b/arch/powerpc/include/asm/book3s/64/pgalloc.h index f9019b579903..1013c0214213 100644 --- a/arch/powerpc/include/asm/book3s/64/pgalloc.h +++ b/arch/powerpc/include/asm/book3s/64/pgalloc.h @@ -47,9 +47,7 @@ extern pmd_t *pmd_fragment_alloc(struct mm_struct *, unsigned long); extern void pte_fragment_free(unsigned long *, int); extern void pmd_fragment_free(unsigned long *); extern void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift); -#ifdef CONFIG_SMP extern void __tlb_remove_table(void *_table); -#endif static inline pgd_t *radix__pgd_alloc(struct mm_struct *mm) { diff --git a/arch/powerpc/mm/pgtable-book3s64.c b/arch/powerpc/mm/pgtable-book3s64.c index 297db665d953..5b4e9fd8990c 100644 --- a/arch/powerpc/mm/pgtable-book3s64.c +++ b/arch/powerpc/mm/pgtable-book3s64.c @@ -432,7 +432,6 @@ static inline void pgtable_free(void *table, int index) } } -#ifdef CONFIG_SMP void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int index) { unsigned long pgf = (unsigned long)table; @@ -449,12 +448,6 @@ void __tlb_remove_table(void *_table) return pgtable_free(table, index); } -#else -void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int index) -{ - return pgtable_free(table, index); -} -#endif #ifdef CONFIG_PROC_FS atomic_long_t direct_pages_count[MMU_PAGE_COUNT]; From patchwork Thu Feb 20 08:42:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Sivaraj X-Patchwork-Id: 231057 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8610CC11D00 for ; Thu, 20 Feb 2020 08:43:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5BF3224654 for ; Thu, 20 Feb 2020 08:43:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=fossix-org.20150623.gappssmtp.com header.i=@fossix-org.20150623.gappssmtp.com header.b="YP6DVlHE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726771AbgBTInI (ORCPT ); Thu, 20 Feb 2020 03:43:08 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:44223 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726764AbgBTInH (ORCPT ); Thu, 20 Feb 2020 03:43:07 -0500 Received: by mail-pl1-f193.google.com with SMTP id d9so1270867plo.11 for ; Thu, 20 Feb 2020 00:43:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fossix-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SJRnSTuI/8zzV3f8/u1V+qMXPVhPYkwWrGGc/VKLtP0=; b=YP6DVlHEhvPNKpxsQeQrzyBc9RO9nidiyP7Dl5hj/Ch80VkDp1H1/TIDcZDfeBDErY W5gs7Xnx7ukwpH3p8ljjfeBjZGuCV6DeyNxDIfPw0H3XK7CD5dEquEGrH4vZu9hM+lcH SwnVI7KG/TCubvZIbLa2SKfBRYu1G8Upy/QczOyohf5ZEgnCZ+JOdsJknudkKF8eY6Xb iL7Qi27cpbSz6CxzigM9Tvg0Nz4uBZN424lmOcRFL2yt51BjFeEmb+mieUWWh+FWwxfF gnmW+/wvBsXU5vPyBpEQbdqcTc0PCHZkSIxx+QzEGFuwYCdwOIdWtU4YL6BavyPY6JRb +PrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SJRnSTuI/8zzV3f8/u1V+qMXPVhPYkwWrGGc/VKLtP0=; b=YUHaOdhz7J4z9f3uf2qjKHqXV8Ppj0s7KJaNYDrApPJV5XKhAaq+8Dxnfvc+o54nkz Z7wjhXoezKzrRqXWICOs/8GxPs6OY6LDa4jktjULPM+JAkTOjHy6F2Y4QS+UanT9+4ki qaiLg2s5/lN/GcsNjwxSTqZZaz3Kh9z9EUnNZZml+xM+RmuLrovYc6SHAXV6cXQ+1S+w CdMTdR9XjXSaRTTxijG2COahYgE1fuqjwCgqIerIOcF9Ngv5uW936K8+WdikRqdzjGCL qBuS5cyRcwh/As9ZA3NW2MsKOHUJyK0AzWcZ1W5eOtDgly1kAGRVTnyhLbjclJ0nPvyC FOlw== X-Gm-Message-State: APjAAAW6H2HYZV+UcjJHq58xxkLbp3BWYXly0CPZq2nbTNAwiDc0uet2 tUJjoBqXAEMvlID8zCMS0EdtCDRHRoc= X-Google-Smtp-Source: APXvYqwDnRcG/lr4R5iDfPif3Db22kcoDa6X/w7akzniEc0hf35zQvVnVlYTjqHTUyFAOB08cy306g== X-Received: by 2002:a17:90a:f012:: with SMTP id bt18mr2370624pjb.8.1582188187138; Thu, 20 Feb 2020 00:43:07 -0800 (PST) Received: from santosiv.in.ibm.com ([129.41.84.72]) by smtp.gmail.com with ESMTPSA id r145sm2512381pfr.5.2020.02.20.00.43.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 00:43:06 -0800 (PST) From: Santosh Sivaraj To: linuxppc-dev , stable@vger.kernel.org Cc: peterz@infradead.org, aneesh.kumar@linux.ibm.com, akshay.adiga@linux.ibm.com, gregkh@linuxfoundation.org Subject: [PATCH 6/6] asm-generic/tlb: avoid potential double flush Date: Thu, 20 Feb 2020 14:12:29 +0530 Message-Id: <20200220084229.1278137-7-santosh@fossix.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200220084229.1278137-1-santosh@fossix.org> References: <20200220084229.1278137-1-santosh@fossix.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Peter Zijlstra Aneesh reported that: tlb_flush_mmu() tlb_flush_mmu_tlbonly() tlb_flush() <-- #1 tlb_flush_mmu_free() tlb_table_flush() tlb_table_invalidate() tlb_flush_mmu_tlbonly() tlb_flush() <-- #2 does two TLBIs when tlb->fullmm, because __tlb_reset_range() will not clear tlb->end in that case. Observe that any caller to __tlb_adjust_range() also sets at least one of the tlb->freed_tables || tlb->cleared_p* bits, and those are unconditionally cleared by __tlb_reset_range(). Change the condition for actually issuing TLBI to having one of those bits set, as opposed to having tlb->end != 0. 0758cd830494 in upstream. Link: http://lkml.kernel.org/r/20200116064531.483522-4-aneesh.kumar@linux.ibm.com Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Aneesh Kumar K.V Reported-by: "Aneesh Kumar K.V" Cc: # 4.19 Signed-off-by: Santosh Sivaraj [santosh: backported to 4.19 stable] --- include/asm-generic/tlb.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index 19934cdd143e..427a70c56ddd 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h @@ -179,7 +179,12 @@ static inline void __tlb_reset_range(struct mmu_gather *tlb) static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb) { - if (!tlb->end) + /* + * Anything calling __tlb_adjust_range() also sets at least one of + * these bits. + */ + if (!(tlb->freed_tables || tlb->cleared_ptes || tlb->cleared_pmds || + tlb->cleared_puds || tlb->cleared_p4ds)) return; tlb_flush(tlb);