aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMinchan Kim <minchan@kernel.org>2017-08-10 18:24:12 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-08-10 18:54:07 -0400
commit99baac21e4585f4258f919502c6e23f1e5edc98c (patch)
tree1511e316ade87f13a265425b18794fe8f29a8544
parent0a2dd266dd6b7a31503b5bbe63af05961a6b446d (diff)
mm: fix MADV_[FREE|DONTNEED] TLB flush miss problem
Nadav reported parallel MADV_DONTNEED on same range has a stale TLB problem and Mel fixed it[1] and found same problem on MADV_FREE[2]. Quote from Mel Gorman: "The race in question is CPU 0 running madv_free and updating some PTEs while CPU 1 is also running madv_free and looking at the same PTEs. CPU 1 may have writable TLB entries for a page but fail the pte_dirty check (because CPU 0 has updated it already) and potentially fail to flush. Hence, when madv_free on CPU 1 returns, there are still potentially writable TLB entries and the underlying PTE is still present so that a subsequent write does not necessarily propagate the dirty bit to the underlying PTE any more. Reclaim at some unknown time at the future may then see that the PTE is still clean and discard the page even though a write has happened in the meantime. I think this is possible but I could have missed some protection in madv_free that prevents it happening." This patch aims for solving both problems all at once and is ready for other problem with KSM, MADV_FREE and soft-dirty story[3]. TLB batch API(tlb_[gather|finish]_mmu] uses [inc|dec]_tlb_flush_pending and mmu_tlb_flush_pending so that when tlb_finish_mmu is called, we can catch there are parallel threads going on. In that case, forcefully, flush TLB to prevent for user to access memory via stale TLB entry although it fail to gather page table entry. I confirmed this patch works with [4] test program Nadav gave so this patch supersedes "mm: Always flush VMA ranges affected by zap_page_range v2" in current mmotm. NOTE: This patch modifies arch-specific TLB gathering interface(x86, ia64, s390, sh, um). It seems most of architecture are straightforward but s390 need to be careful because tlb_flush_mmu works only if mm->context.flush_mm is set to non-zero which happens only a pte entry really is cleared by ptep_get_and_clear and friends. However, this problem never changes the pte entries but need to flush to prevent memory access from stale tlb. [1] http://lkml.kernel.org/r/20170725101230.5v7gvnjmcnkzzql3@techsingularity.net [2] http://lkml.kernel.org/r/20170725100722.2dxnmgypmwnrfawp@suse.de [3] http://lkml.kernel.org/r/BD3A0EBE-ECF4-41D4-87FA-C755EA9AB6BD@gmail.com [4] https://patchwork.kernel.org/patch/9861621/ [minchan@kernel.org: decrease tlb flush pending count in tlb_finish_mmu] Link: http://lkml.kernel.org/r/20170808080821.GA31730@bbox Link: http://lkml.kernel.org/r/20170802000818.4760-7-namit@vmware.com Signed-off-by: Minchan Kim <minchan@kernel.org> Signed-off-by: Nadav Amit <namit@vmware.com> Reported-by: Nadav Amit <namit@vmware.com> Reported-by: Mel Gorman <mgorman@techsingularity.net> Acked-by: Mel Gorman <mgorman@techsingularity.net> Cc: Ingo Molnar <mingo@redhat.com> Cc: Russell King <linux@armlinux.org.uk> Cc: Tony Luck <tony.luck@intel.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Jeff Dike <jdike@addtoit.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Hugh Dickins <hughd@google.com> Cc: Mel Gorman <mgorman@suse.de> Cc: Nadav Amit <nadav.amit@gmail.com> Cc: Rik van Riel <riel@redhat.com> Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/arm/include/asm/tlb.h7
-rw-r--r--arch/ia64/include/asm/tlb.h4
-rw-r--r--arch/s390/include/asm/tlb.h7
-rw-r--r--arch/sh/include/asm/tlb.h4
-rw-r--r--arch/um/include/asm/tlb.h7
-rw-r--r--include/asm-generic/tlb.h2
-rw-r--r--include/linux/mm_types.h8
-rw-r--r--mm/memory.c18
8 files changed, 48 insertions, 9 deletions
diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h
index 7f5b2a2d3861..d5562f9ce600 100644
--- a/arch/arm/include/asm/tlb.h
+++ b/arch/arm/include/asm/tlb.h
@@ -168,8 +168,13 @@ arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,
168 168
169static inline void 169static inline void
170arch_tlb_finish_mmu(struct mmu_gather *tlb, 170arch_tlb_finish_mmu(struct mmu_gather *tlb,
171 unsigned long start, unsigned long end) 171 unsigned long start, unsigned long end, bool force)
172{ 172{
173 if (force) {
174 tlb->range_start = start;
175 tlb->range_end = end;
176 }
177
173 tlb_flush_mmu(tlb); 178 tlb_flush_mmu(tlb);
174 179
175 /* keep the page table cache within bounds */ 180 /* keep the page table cache within bounds */
diff --git a/arch/ia64/include/asm/tlb.h b/arch/ia64/include/asm/tlb.h
index 93cadc04ac62..cbe5ac3699bf 100644
--- a/arch/ia64/include/asm/tlb.h
+++ b/arch/ia64/include/asm/tlb.h
@@ -187,8 +187,10 @@ arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,
187 */ 187 */
188static inline void 188static inline void
189arch_tlb_finish_mmu(struct mmu_gather *tlb, 189arch_tlb_finish_mmu(struct mmu_gather *tlb,
190 unsigned long start, unsigned long end) 190 unsigned long start, unsigned long end, bool force)
191{ 191{
192 if (force)
193 tlb->need_flush = 1;
192 /* 194 /*
193 * Note: tlb->nr may be 0 at this point, so we can't rely on tlb->start_addr and 195 * Note: tlb->nr may be 0 at this point, so we can't rely on tlb->start_addr and
194 * tlb->end_addr. 196 * tlb->end_addr.
diff --git a/arch/s390/include/asm/tlb.h b/arch/s390/include/asm/tlb.h
index d574d0820dc8..2eb8ff0d6fca 100644
--- a/arch/s390/include/asm/tlb.h
+++ b/arch/s390/include/asm/tlb.h
@@ -77,8 +77,13 @@ static inline void tlb_flush_mmu(struct mmu_gather *tlb)
77 77
78static inline void 78static inline void
79arch_tlb_finish_mmu(struct mmu_gather *tlb, 79arch_tlb_finish_mmu(struct mmu_gather *tlb,
80 unsigned long start, unsigned long end) 80 unsigned long start, unsigned long end, bool force)
81{ 81{
82 if (force) {
83 tlb->start = start;
84 tlb->end = end;
85 }
86
82 tlb_flush_mmu(tlb); 87 tlb_flush_mmu(tlb);
83} 88}
84 89
diff --git a/arch/sh/include/asm/tlb.h b/arch/sh/include/asm/tlb.h
index 89786560dbd4..51a8bc967e75 100644
--- a/arch/sh/include/asm/tlb.h
+++ b/arch/sh/include/asm/tlb.h
@@ -49,9 +49,9 @@ arch_tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,
49 49
50static inline void 50static inline void
51arch_tlb_finish_mmu(struct mmu_gather *tlb, 51arch_tlb_finish_mmu(struct mmu_gather *tlb,
52 unsigned long start, unsigned long end) 52 unsigned long start, unsigned long end, bool force)
53{ 53{
54 if (tlb->fullmm) 54 if (tlb->fullmm || force)
55 flush_tlb_mm(tlb->mm); 55 flush_tlb_mm(tlb->mm);
56 56
57 /* keep the page table cache within bounds */ 57 /* keep the page table cache within bounds */
diff --git a/arch/um/include/asm/tlb.h b/arch/um/include/asm/tlb.h
index 2a901eca7145..344d95619d03 100644
--- a/arch/um/include/asm/tlb.h
+++ b/arch/um/include/asm/tlb.h
@@ -87,8 +87,13 @@ tlb_flush_mmu(struct mmu_gather *tlb)
87 */ 87 */
88static inline void 88static inline void
89arch_tlb_finish_mmu(struct mmu_gather *tlb, 89arch_tlb_finish_mmu(struct mmu_gather *tlb,
90 unsigned long start, unsigned long end) 90 unsigned long start, unsigned long end, bool force)
91{ 91{
92 if (force) {
93 tlb->start = start;
94 tlb->end = end;
95 tlb->need_flush = 1;
96 }
92 tlb_flush_mmu(tlb); 97 tlb_flush_mmu(tlb);
93 98
94 /* keep the page table cache within bounds */ 99 /* keep the page table cache within bounds */
diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
index 8f71521e7a44..faddde44de8c 100644
--- a/include/asm-generic/tlb.h
+++ b/include/asm-generic/tlb.h
@@ -116,7 +116,7 @@ void arch_tlb_gather_mmu(struct mmu_gather *tlb,
116 struct mm_struct *mm, unsigned long start, unsigned long end); 116 struct mm_struct *mm, unsigned long start, unsigned long end);
117void tlb_flush_mmu(struct mmu_gather *tlb); 117void tlb_flush_mmu(struct mmu_gather *tlb);
118void arch_tlb_finish_mmu(struct mmu_gather *tlb, 118void arch_tlb_finish_mmu(struct mmu_gather *tlb,
119 unsigned long start, unsigned long end); 119 unsigned long start, unsigned long end, bool force);
120extern bool __tlb_remove_page_size(struct mmu_gather *tlb, struct page *page, 120extern bool __tlb_remove_page_size(struct mmu_gather *tlb, struct page *page,
121 int page_size); 121 int page_size);
122 122
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 892a7b0196fd..3cadee0a3508 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -538,6 +538,14 @@ static inline bool mm_tlb_flush_pending(struct mm_struct *mm)
538 return atomic_read(&mm->tlb_flush_pending) > 0; 538 return atomic_read(&mm->tlb_flush_pending) > 0;
539} 539}
540 540
541/*
542 * Returns true if there are two above TLB batching threads in parallel.
543 */
544static inline bool mm_tlb_flush_nested(struct mm_struct *mm)
545{
546 return atomic_read(&mm->tlb_flush_pending) > 1;
547}
548
541static inline void init_tlb_flush_pending(struct mm_struct *mm) 549static inline void init_tlb_flush_pending(struct mm_struct *mm)
542{ 550{
543 atomic_set(&mm->tlb_flush_pending, 0); 551 atomic_set(&mm->tlb_flush_pending, 0);
diff --git a/mm/memory.c b/mm/memory.c
index 34cba5113e06..e158f7ac6730 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -272,10 +272,13 @@ void tlb_flush_mmu(struct mmu_gather *tlb)
272 * that were required. 272 * that were required.
273 */ 273 */
274void arch_tlb_finish_mmu(struct mmu_gather *tlb, 274void arch_tlb_finish_mmu(struct mmu_gather *tlb,
275 unsigned long start, unsigned long end) 275 unsigned long start, unsigned long end, bool force)
276{ 276{
277 struct mmu_gather_batch *batch, *next; 277 struct mmu_gather_batch *batch, *next;
278 278
279 if (force)
280 __tlb_adjust_range(tlb, start, end - start);
281
279 tlb_flush_mmu(tlb); 282 tlb_flush_mmu(tlb);
280 283
281 /* keep the page table cache within bounds */ 284 /* keep the page table cache within bounds */
@@ -404,12 +407,23 @@ void tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,
404 unsigned long start, unsigned long end) 407 unsigned long start, unsigned long end)
405{ 408{
406 arch_tlb_gather_mmu(tlb, mm, start, end); 409 arch_tlb_gather_mmu(tlb, mm, start, end);
410 inc_tlb_flush_pending(tlb->mm);
407} 411}
408 412
409void tlb_finish_mmu(struct mmu_gather *tlb, 413void tlb_finish_mmu(struct mmu_gather *tlb,
410 unsigned long start, unsigned long end) 414 unsigned long start, unsigned long end)
411{ 415{
412 arch_tlb_finish_mmu(tlb, start, end); 416 /*
417 * If there are parallel threads are doing PTE changes on same range
418 * under non-exclusive lock(e.g., mmap_sem read-side) but defer TLB
419 * flush by batching, a thread has stable TLB entry can fail to flush
420 * the TLB by observing pte_none|!pte_dirty, for example so flush TLB
421 * forcefully if we detect parallel PTE batching threads.
422 */
423 bool force = mm_tlb_flush_nested(tlb->mm);
424
425 arch_tlb_finish_mmu(tlb, start, end, force);
426 dec_tlb_flush_pending(tlb->mm);
413} 427}
414 428
415/* 429/*