From d7546506f438f2cfda0596b90042bc93429be16d Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Tue, 2 Feb 2021 09:12:34 -0500 Subject: [PATCH] mm/memory: Fix zap_page_range Use mas_for_each to avoid calling unmap_single_vma for the start VMA twice. Signed-off-by: Liam R. Howlett --- mm/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 1e5794a54249..03f3ae8068e4 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1551,9 +1551,9 @@ void zap_page_range(struct vm_area_struct *vma, unsigned long start, tlb_gather_mmu(&tlb, vma->vm_mm, start, end); update_hiwater_rss(vma->vm_mm); mmu_notifier_invalidate_range_start(&range); - do { + mas_for_each(&mas, vma, end - 1) unmap_single_vma(&tlb, vma, start, end, NULL); - } while ((vma = mas_find(&mas, end - 1)) != NULL); + mmu_notifier_invalidate_range_end(&range); tlb_finish_mmu(&tlb, start, end); } -- 2.50.1