Commit 20841405 authored by Rik van Riel's avatar Rik van Riel Committed by Linus Torvalds
Browse files

mm: fix TLB flush race between migration, and change_protection_range 



There are a few subtle races, between change_protection_range (used by
mprotect and change_prot_numa) on one side, and NUMA page migration and
compaction on the other side.

The basic race is that there is a time window between when the PTE gets
made non-present (PROT_NONE or NUMA), and the TLB is flushed.

During that time, a CPU may continue writing to the page.

This is fine most of the time, however compaction or the NUMA migration
code may come in, and migrate the page away.

When that happens, the CPU may continue writing, through the cached
translation, to what is no longer the current memory location of the
process.

This only affects x86, which has a somewhat optimistic pte_accessible.
All other architectures appear to be safe, and will either always flush,
or flush whenever there is a valid mapping, even with no permissions
(SPARC).

The basic race looks like this:

CPU A			CPU B			CPU C

						load TLB entry
make entry PTE/PMD_NUMA
			fault on entry
						read/write old page
			start migrating page
			change PTE/PMD to new page
						read/write old page [*]
flush TLB
						reload TLB from new entry
						read/write new page
						lose data

[*] the old page may belong to a new user at this point!

The obvious fix is to flush remote TLB entries, by making sure that
pte_accessible aware of the fact that PROT_NONE and PROT_NUMA memory may
still be accessible if there is a TLB flush pending for the mm.

This should fix both NUMA migration and compaction.

[mgorman@suse.de: fix build]
Signed-off-by: default avatarRik van Riel <riel@redhat.com>
Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
Cc: Alex Thorlton <athorlton@sgi.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent de466bd6

arch/sparc/include/asm/pgtable_64.h

+2 −2
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ static inline unsigned long pte_present(pte_t pte) 
}



#define pte_accessible pte_accessible

static inline unsigned long pte_accessible(pte_t a)

static inline unsigned long pte_accessible(struct mm_struct *mm, pte_t a)

{

	return pte_val(a) & _PAGE_VALID;

}
@@ -847,7 +847,7 @@ static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr, 
	 * SUN4V NOTE: _PAGE_VALID is the same value in both the SUN4U

	 *             and SUN4V pte layout, so this inline test is fine.

	 */

	if (likely(mm != &init_mm) && pte_accessible(orig))

	if (likely(mm != &init_mm) && pte_accessible(mm, orig))

		tlb_batch_add(mm, addr, ptep, orig, fullmm);

}

arch/x86/include/asm/pgtable.h

+9 −2
Original line number Diff line number Diff line
@@ -452,9 +452,16 @@ static inline int pte_present(pte_t a) 
}



#define pte_accessible pte_accessible

static inline int pte_accessible(pte_t a)

static inline bool pte_accessible(struct mm_struct *mm, pte_t a)

{

	return pte_flags(a) & _PAGE_PRESENT;

	if (pte_flags(a) & _PAGE_PRESENT)

		return true;



	if ((pte_flags(a) & (_PAGE_PROTNONE | _PAGE_NUMA)) &&

			mm_tlb_flush_pending(mm))

		return true;



	return false;

}



static inline int pte_hidden(pte_t pte)

include/asm-generic/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static inline int pmd_same(pmd_t pmd_a, pmd_t pmd_b) 
#endif



#ifndef pte_accessible

# define pte_accessible(pte)		((void)(pte),1)

# define pte_accessible(mm, pte)	((void)(pte), 1)

#endif



#ifndef flush_tlb_fix_spurious_fault

include/linux/mm_types.h

+44 −0
Original line number Diff line number Diff line
@@ -442,6 +442,14 @@ struct mm_struct { 


	/* numa_scan_seq prevents two threads setting pte_numa */

	int numa_scan_seq;

#endif

#if defined(CONFIG_NUMA_BALANCING) || defined(CONFIG_COMPACTION)

	/*

	 * An operation with batched TLB flushing is going on. Anything that

	 * can move process memory needs to flush the TLB when moving a

	 * PROT_NONE or PROT_NUMA mapped page.

	 */

	bool tlb_flush_pending;

#endif

	struct uprobes_state uprobes_state;

};
@@ -459,4 +467,40 @@ static inline cpumask_t *mm_cpumask(struct mm_struct *mm) 
	return mm->cpu_vm_mask_var;

}



#if defined(CONFIG_NUMA_BALANCING) || defined(CONFIG_COMPACTION)

/*

 * Memory barriers to keep this state in sync are graciously provided by

 * the page table locks, outside of which no page table modifications happen.

 * The barriers below prevent the compiler from re-ordering the instructions

 * around the memory barriers that are already present in the code.

 */

static inline bool mm_tlb_flush_pending(struct mm_struct *mm)

{

	barrier();

	return mm->tlb_flush_pending;

}

static inline void set_tlb_flush_pending(struct mm_struct *mm)

{

	mm->tlb_flush_pending = true;

	barrier();

}

/* Clearing is done after a TLB flush, which also provides a barrier. */

static inline void clear_tlb_flush_pending(struct mm_struct *mm)

{

	barrier();

	mm->tlb_flush_pending = false;

}

#else

static inline bool mm_tlb_flush_pending(struct mm_struct *mm)

{

	return false;

}

static inline void set_tlb_flush_pending(struct mm_struct *mm)

{

}

static inline void clear_tlb_flush_pending(struct mm_struct *mm)

{

}

#endif



#endif /* _LINUX_MM_TYPES_H */

kernel/fork.c

+1 −0
Original line number Diff line number Diff line
@@ -537,6 +537,7 @@ static struct mm_struct *mm_init(struct mm_struct *mm, struct task_struct *p) 
	spin_lock_init(&mm->page_table_lock);

	mm_init_aio(mm);

	mm_init_owner(mm, p);

	clear_tlb_flush_pending(mm);



	if (likely(!mm_alloc_pgd(mm))) {

		mm->def_flags = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE