From: Nicholas Piggin <npiggin@gmail.com>
To: Peter Zijlstra <peterz@infradead.org>
Cc: Nicholas Piggin <npiggin@gmail.com>,
torvalds@linux-foundation.org, luto@kernel.org, x86@kernel.org,
bp@alien8.de, will.deacon@arm.com, riel@surriel.com,
jannh@google.com, ascannell@google.com, dave.hansen@intel.com,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
David Miller <davem@davemloft.net>,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Michael Ellerman <mpe@ellerman.id.au>,
linux-arch@vger.kernel.org
Subject: [RFC PATCH 2/2] mm: mmu_notifier fix for tlb_end_vma
Date: Thu, 23 Aug 2018 18:47:09 +1000 [thread overview]
Message-ID: <20180823084709.19717-3-npiggin@gmail.com> (raw)
In-Reply-To: <20180823084709.19717-1-npiggin@gmail.com>
The generic tlb_end_vma does not call invalidate_range mmu notifier,
and it resets resets the mmu_gather range, which means the notifier
won't be called on part of the range in case of an unmap that spans
multiple vmas.
ARM64 seems to be the only arch I could see that has notifiers and
uses the generic tlb_end_vma. I have not actually tested it.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
include/asm-generic/tlb.h | 17 +++++++++++++----
mm/memory.c | 10 ----------
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
index e811ef7b8350..79cb76b89c26 100644
--- a/include/asm-generic/tlb.h
+++ b/include/asm-generic/tlb.h
@@ -15,6 +15,7 @@
#ifndef _ASM_GENERIC__TLB_H
#define _ASM_GENERIC__TLB_H
+#include <linux/mmu_notifier.h>
#include <linux/swap.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
@@ -138,6 +139,16 @@ static inline void __tlb_reset_range(struct mmu_gather *tlb)
}
}
+static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb)
+{
+ if (!tlb->end)
+ return;
+
+ tlb_flush(tlb);
+ mmu_notifier_invalidate_range(tlb->mm, tlb->start, tlb->end);
+ __tlb_reset_range(tlb);
+}
+
static inline void tlb_remove_page_size(struct mmu_gather *tlb,
struct page *page, int page_size)
{
@@ -186,10 +197,8 @@ static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,
#define __tlb_end_vma(tlb, vma) \
do { \
- if (!tlb->fullmm && tlb->end) { \
- tlb_flush(tlb); \
- __tlb_reset_range(tlb); \
- } \
+ if (!tlb->fullmm) \
+ tlb_flush_mmu_tlbonly(tlb); \
} while (0)
#ifndef tlb_end_vma
diff --git a/mm/memory.c b/mm/memory.c
index 7c58310734eb..c4a7b6cb17c8 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -238,16 +238,6 @@ void arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,
__tlb_reset_range(tlb);
}
-static void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb)
-{
- if (!tlb->end)
- return;
-
- tlb_flush(tlb);
- mmu_notifier_invalidate_range(tlb->mm, tlb->start, tlb->end);
- __tlb_reset_range(tlb);
-}
-
static void tlb_flush_mmu_free(struct mmu_gather *tlb)
{
struct mmu_gather_batch *batch;
--
2.17.0
next prev parent reply other threads:[~2018-08-23 8:47 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-23 8:47 [RFC PATCH 0/2] minor mmu_gather patches Nicholas Piggin
2018-08-23 8:47 ` Nicholas Piggin
2018-08-23 8:47 ` [RFC PATCH 1/2] mm: move tlb_table_flush to tlb_flush_mmu_free Nicholas Piggin
2018-08-23 8:47 ` Nicholas Piggin
2018-08-23 13:40 ` Will Deacon
2018-08-23 13:40 ` Will Deacon
2018-09-06 20:29 ` Rik van Riel
2018-09-06 20:29 ` Rik van Riel
2018-09-07 13:44 ` Will Deacon
2018-09-07 13:44 ` Will Deacon
2018-09-07 14:28 ` Rik van Riel
2018-09-07 14:28 ` Rik van Riel
2018-08-23 8:47 ` Nicholas Piggin [this message]
2018-08-23 8:47 ` [RFC PATCH 2/2] mm: mmu_notifier fix for tlb_end_vma Nicholas Piggin
2018-08-23 12:46 ` Catalin Marinas
2018-08-23 12:46 ` Catalin Marinas
2018-08-23 13:41 ` Will Deacon
2018-08-23 13:41 ` Will Deacon
2018-08-24 13:07 ` [RFC PATCH 2/2] mm: mmu_notifier fix for tlb_end_vma (build failures) Guenter Roeck
2018-08-24 13:07 ` Guenter Roeck
2018-08-24 13:10 ` Will Deacon
2018-08-24 13:10 ` Will Deacon
2018-08-24 13:24 ` Guenter Roeck
2018-08-24 13:24 ` Guenter Roeck
2018-08-24 13:34 ` Will Deacon
2018-08-24 13:34 ` Will Deacon
2018-08-24 13:50 ` Will Deacon
2018-08-24 13:50 ` Will Deacon
2018-08-24 13:54 ` Guenter Roeck
2018-08-24 13:54 ` Guenter Roeck
2018-08-24 14:06 ` Guenter Roeck
2018-08-24 14:06 ` Guenter Roeck
2018-08-24 14:25 ` Will Deacon
2018-08-24 14:25 ` Will Deacon
2018-08-24 18:22 ` Guenter Roeck
2018-08-24 18:22 ` Guenter Roeck
2018-08-24 23:32 ` Palmer Dabbelt
2018-08-24 23:32 ` Palmer Dabbelt
2018-08-23 19:15 ` [RFC PATCH 0/2] minor mmu_gather patches Linus Torvalds
2018-08-23 19:15 ` Linus Torvalds
2018-08-23 19:37 ` Linus Torvalds
2018-08-23 19:37 ` Linus Torvalds
2018-08-23 23:27 ` Will Deacon
2018-08-23 23:27 ` Will Deacon
2018-08-23 23:42 ` Nicholas Piggin
2018-08-23 23:42 ` Nicholas Piggin
2018-08-23 23:35 ` Nicholas Piggin
2018-08-23 23:35 ` Nicholas Piggin
2018-08-24 8:05 ` Peter Zijlstra
2018-08-24 8:05 ` Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180823084709.19717-3-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=ascannell@google.com \
--cc=bp@alien8.de \
--cc=dave.hansen@intel.com \
--cc=davem@davemloft.net \
--cc=jannh@google.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=mpe@ellerman.id.au \
--cc=peterz@infradead.org \
--cc=riel@surriel.com \
--cc=schwidefsky@de.ibm.com \
--cc=torvalds@linux-foundation.org \
--cc=will.deacon@arm.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).