Skip to content

Commit 405eb87

Browse files
Peter ZijlstraCannedShroud
authored andcommitted
asm-generic/tlb: avoid potential double flush
Aneesh reported that: tlb_flush_mmu() tlb_flush_mmu_tlbonly() tlb_flush() <-- adithya2306#1 tlb_flush_mmu_free() tlb_table_flush() tlb_table_invalidate() tlb_flush_mmu_tlbonly() tlb_flush() <-- adithya2306#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) <peterz@infradead.org> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> Reported-by: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Change-Id: I323269ebcbc967a6a887c756942d262696da016f
1 parent 9afc29a commit 405eb87

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

include/asm-generic/tlb.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,12 @@ tlb_update_vma_flags(struct mmu_gather *tlb, struct vm_area_struct *vma) { }
402402

403403
static inline void tlb_flush_mmu_tlbonly(struct mmu_gather *tlb)
404404
{
405-
if (!tlb->end)
405+
/*
406+
* Anything calling __tlb_adjust_range() also sets at least one of
407+
* these bits.
408+
*/
409+
if (!(tlb->freed_tables || tlb->cleared_ptes || tlb->cleared_pmds ||
410+
tlb->cleared_puds || tlb->cleared_p4ds))
406411
return;
407412

408413
tlb_flush(tlb);

0 commit comments

Comments
 (0)