From patchwork Wed Mar 4 04:30:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Sivaraj X-Patchwork-Id: 229855 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,URIBL_BLOCKED,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 E62E0C3F2CD for ; Wed, 4 Mar 2020 04:30:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B55DE20838 for ; Wed, 4 Mar 2020 04:30:54 +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="X+wBnqQ5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726490AbgCDEay (ORCPT ); Tue, 3 Mar 2020 23:30:54 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:41661 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725877AbgCDEay (ORCPT ); Tue, 3 Mar 2020 23:30:54 -0500 Received: by mail-pg1-f195.google.com with SMTP id b1so358951pgm.8 for ; Tue, 03 Mar 2020 20:30:52 -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=OWUR5oTygA9h8IedsUL9OoKv5C2XK4YyN0lJTOYOESQ=; b=X+wBnqQ507bZ3g7ePamjOT29SPt6GRh1rwxnBTGc3ggsB3e1YynS7A8tjOeP/KqlJn U7uThOWUncfU9mBijeMB3JxYYGVaSIroGIEv9SZpiHMQMWUrXImjyAgSdnCOHwvMRVtj nDYhfRA8EA+WdY0KrNn8XsodmHoXD2MtsUJNxKXHBNncgboLVAx5zii0zNnV704Sw2hE 6RWru/fUcV8rJ9B0m74GgO7VN0DZ1xKab2ysdLUWT0n8+R5yK/vaNEzAvCWkUCESEkgK QR3ukvyLTLgbMscSLikLhruans6pbg61KT3SIq2YuETbntMl6cOJreyKo9oO6pDBvOzL NUww== 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=OWUR5oTygA9h8IedsUL9OoKv5C2XK4YyN0lJTOYOESQ=; b=QI9zcoaQA01PbtpfEXTo+2d8bFc3RZexc+QhbHXXuksunEf9hPfNzTmTcx56gJ4uPE /geVKLJjY2mCx2bkcckKAYkLnVVCUscqChTPCiIoeEhCarrSMQEZubJEHynFtfG4fzG/ tBSbkYX3GXk0YoEDKD4ZLTO5+rpjZBs6j98EH1uATtYQwimEZjEY23NbI7GSK5g07QG0 DJWcGD3LlSF72wJgUFaLVFQR3I+leJDW+1vp85lAQoRLu1c8Gz/HXxKP+nxeYpzDHL1P LEshtCEGHKhnWebyVDcHteKEXbiVq7B9L2PVnV7cC2QqSyD0i63pbO9rXDPhsyi5vvt2 o4bQ== X-Gm-Message-State: ANhLgQ2wG7gMRhZaocNsQZMlUPdKbOut/SCYDIOoUZlztapDqK6FSD0B i5WVU0xMtKN5ocGLDYVOjVmfC8qyk1w= X-Google-Smtp-Source: ADFU+vvnsEn2WNvd87oF3eBM1krzSggwmxshIXznZaRCXv1VNvhx94YnFoKF+FpchUmSh8lyZZel0g== X-Received: by 2002:a63:a052:: with SMTP id u18mr895128pgn.210.1583296251294; Tue, 03 Mar 2020 20:30:51 -0800 (PST) Received: from santosiv.in.ibm.com ([2401:4900:16ee:7b5f:eac:4364:ff14:3aaa]) by smtp.gmail.com with ESMTPSA id y193sm10775723pfg.162.2020.03.03.20.30.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2020 20:30:50 -0800 (PST) From: Santosh Sivaraj To: , linuxppc-dev Cc: Michael Ellerman , Greg KH , Sasha Levin , Will Deacon Subject: [PATCH v2 2/6] asm-generic/tlb: Track which levels of the page tables have been cleared Date: Wed, 4 Mar 2020 10:00:24 +0530 Message-Id: <20200304043028.280136-3-santosh@fossix.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200304043028.280136-1-santosh@fossix.org> References: <20200304043028.280136-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 commit a6d60245d6d9b1caf66b0d94419988c4836980af upstream 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. 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 Wed Mar 4 04:30:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Sivaraj X-Patchwork-Id: 229854 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,URIBL_BLOCKED,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 B28F4C3F2CD for ; Wed, 4 Mar 2020 04:31:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8174A2146E for ; Wed, 4 Mar 2020 04:31:00 +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="CTy1/m9r" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725877AbgCDEbA (ORCPT ); Tue, 3 Mar 2020 23:31:00 -0500 Received: from mail-pj1-f68.google.com ([209.85.216.68]:36099 "EHLO mail-pj1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725861AbgCDEbA (ORCPT ); Tue, 3 Mar 2020 23:31:00 -0500 Received: by mail-pj1-f68.google.com with SMTP id d7so340181pjw.1 for ; Tue, 03 Mar 2020 20:30:58 -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=tkgbxGTiv6piVRKbNX9ksR7st+vRYwUGKl28isP4EyE=; b=CTy1/m9rPRtu5aqcm/g32C39uVkhnCm1CDK1E3MoKc72DOf/N1EKMJIr3pw/5uxWiW aQFZ7PPtcecTMpCikzs89Vk6Cd7zwKeEp2DpEyqvuO1y3m5wQAko5SuBSHZ6oMK7+tcn 7a26kNEeAhSpGcezR6hg1kdf7py+ldhA+suXv45gWVb0/eyHk/EY5R9hwk19TtNozwsE GJTBwKQ/qGSe8dmtUqsZ67daT1R0Zr+wHM041ryjmGcfLt9pUrkl19nF6KQe8NkZOPNT lgtmG8kJFJ5Bb6ZxYNoXUddLIOl7aFVtPx8cQB7Atml4+G/gpweGhOsKVZdU9RXZtdFT wp0w== 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=tkgbxGTiv6piVRKbNX9ksR7st+vRYwUGKl28isP4EyE=; b=G9wvzwboufm3pI9Sf1IgspRtAryq0BXT5DjwOT1yj6bb9dExLhFeLw58UIPtkgtdJl IK4zfxbBCXwzC/qqohKrzXD9pp933g8zypx50rQCDAkO35A+uNz8lfsm48zB/r5WoXDJ XHzpoxuQToH3vOAKIBBJ7Yt3pYNce7B+3zPDGVUf+pSDo9ypucrAuxW7C1T9L/ecQF0w G2/Dh9aDKFK2qCqH4CZcDJdqxSu1Cgq5+H7zRpxIPlpCinXPuU5rwINhxtZ1YbHL9ekl mkf93bOHl+KM2KuJWJJljIGJJRhtkrlN5fbDXJ/mlol9XU4rnFn7juBEmJVkE/CyR8bd Zs3w== X-Gm-Message-State: ANhLgQ0Z900LYxbNz5FatZfGTs3IRNipwhrp5q8IAq82TDK/dIyaQo7v fPi2n0w6RaLNzamxFEU8N3JqrJj1m/k= X-Google-Smtp-Source: ADFU+vs42YnfFoDBWropckxwcqamVQFJr8JXz3WKntS902p8kIlNkYJMI4GVpocQ6GUGg2mBvy2tIA== X-Received: by 2002:a17:90a:eb18:: with SMTP id j24mr1052188pjz.85.1583296257790; Tue, 03 Mar 2020 20:30:57 -0800 (PST) Received: from santosiv.in.ibm.com ([2401:4900:16ee:7b5f:eac:4364:ff14:3aaa]) by smtp.gmail.com with ESMTPSA id y193sm10775723pfg.162.2020.03.03.20.30.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2020 20:30:57 -0800 (PST) From: Santosh Sivaraj To: , linuxppc-dev Cc: Michael Ellerman , Greg KH , Sasha Levin , "Aneesh Kumar K.V" Subject: [PATCH v2 4/6] powerpc/mmu_gather: enable RCU_TABLE_FREE even for !SMP case Date: Wed, 4 Mar 2020 10:00:26 +0530 Message-Id: <20200304043028.280136-5-santosh@fossix.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200304043028.280136-1-santosh@fossix.org> References: <20200304043028.280136-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" commit 12e4d53f3f04e81f9e83d6fc10edc7314ab9f6b9 upstream. 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." 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 e09cfb109b8c..1a00ce4b0040 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 Wed Mar 4 04:30:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Sivaraj X-Patchwork-Id: 229853 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,URIBL_BLOCKED,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 27A2CC3F2D7 for ; Wed, 4 Mar 2020 04:31:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F302B20838 for ; Wed, 4 Mar 2020 04:31:06 +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="0Z6NBiKR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726894AbgCDEbG (ORCPT ); Tue, 3 Mar 2020 23:31:06 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:42346 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725861AbgCDEbG (ORCPT ); Tue, 3 Mar 2020 23:31:06 -0500 Received: by mail-pf1-f193.google.com with SMTP id f5so283207pfk.9 for ; Tue, 03 Mar 2020 20:31:05 -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=ceobO9udD14LrQZbpBJ6o1PQGbHK97VsLgC6qxhMQAM=; b=0Z6NBiKRFCWjzPWR2W7+nHAwEQThe3hew9DuWu9EOYdRwCC71Xz8hZfHpO+yWB3o14 vadUBEWiMCjKgKYVB1JxvAK2Cf6z3ncaevaA93d+ettcOFgImBZrFo03pac0lTnv+OwA LccRajjfj2yVFbT+HbsVgqt6MWByFq/43KzJHopPoAmmDfcnLLRANRpVgg/fTHKTuULc Mon39UQS0DVPVnBp3IS2RypS8+zhiQ8invKQhhHSy3MPPzjagx4fWEk6ebdcFTzkd7sH k1n9U/iXdQbRkhNwmur48zwOLZwAk2GMw9wHNQ50DpYFwinLRI3+6jUboxwCYkXurl7t /fnA== 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=ceobO9udD14LrQZbpBJ6o1PQGbHK97VsLgC6qxhMQAM=; b=D3Tdr30990BsDQvxaJRRhckVeYgsJhSnhON5qV2ElUgbGdRIKswmJxTFgTBB6HXH5u QPfWGAiVO0MTVGrAMFRoBKbTxJaHznbgd4edClmheImkQQCKv349tgenjvl/3sfULA5Z woAB3N2giQ27p5L/ll4Ctk8dykPF2+hFLCFjOqYRAv5wwuV21XNWb5xXgcQknYhmsF92 DvOx92OahWjPTmhBdLSs2WNuV7sMIl3uRVdtM21k0Vt4u/K3M+Yr7hXZSN8ZWljhbQT7 Gsd1N8fi56O7fK5Kzv3bauvtAHOCybFx8HZ8sR9/9KSEJwPLR2OBoZEA2fZGutoNzgGm kBSw== X-Gm-Message-State: ANhLgQ2+vxWdoqGyVCXDVrmWfd5SwZE5H9X+wW1MCSsVAHppRHfAU9iK /HCxELlVNfprAUqDdq5KMCU+XA12LVI= X-Google-Smtp-Source: ADFU+vvWsNPG7rU/DyzKJYUwznyLv6qCZXlkRFfTwmMavqC94g/If0c0AoLHv1q5XLJZ4Yh7Lo2nHQ== X-Received: by 2002:aa7:85d9:: with SMTP id z25mr1241447pfn.223.1583296265089; Tue, 03 Mar 2020 20:31:05 -0800 (PST) Received: from santosiv.in.ibm.com ([2401:4900:16ee:7b5f:eac:4364:ff14:3aaa]) by smtp.gmail.com with ESMTPSA id y193sm10775723pfg.162.2020.03.03.20.31.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2020 20:31:04 -0800 (PST) From: Santosh Sivaraj To: , linuxppc-dev Cc: Michael Ellerman , Greg KH , Sasha Levin , Peter Zijlstra , "Aneesh Kumar K . V" Subject: [PATCH v2 6/6] asm-generic/tlb: avoid potential double flush Date: Wed, 4 Mar 2020 10:00:28 +0530 Message-Id: <20200304043028.280136-7-santosh@fossix.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200304043028.280136-1-santosh@fossix.org> References: <20200304043028.280136-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 commit 0758cd8304942292e95a0f750c374533db378b32 upstream. 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. 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);