Commit db7ddef3 authored Aug 23, 2018 by Nicholas Piggin Committed by Linus Torvalds Aug 23, 2018

mm: move tlb_table_flush to tlb_flush_mmu_free



There is no need to call this from tlb_flush_mmu_tlbonly, it logically
belongs with tlb_flush_mmu_free.  This makes future fixes simpler.

[ This was originally done to allow code consolidation for the
  mmu_notifier fix, but it also ends up helping simplify the
  HAVE_RCU_TABLE_INVALIDATE fix.    - Linus ]

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 52a288c7

mm/memory.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -245,9 +245,6 @@ static void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb)

		tlb_flush(tlb);
		mmu_notifier_invalidate_range(tlb->mm, tlb->start, tlb->end);
		#ifdef CONFIG_HAVE_RCU_TABLE_FREE
		tlb_table_flush(tlb);
		#endif
		__tlb_reset_range(tlb);
		}

		@@ -255,6 +252,9 @@ static void tlb_flush_mmu_free(struct mmu_gather *tlb)
		{
		struct mmu_gather_batch *batch;

		#ifdef CONFIG_HAVE_RCU_TABLE_FREE
		tlb_table_flush(tlb);
		#endif
		for (batch = &tlb->local; batch && batch->nr; batch = batch->next) {
		free_pages_and_swap_cache(batch->pages, batch->nr);
		batch->nr = 0;

Admin message