[PATCH 3/3] mmu_notifier: Call invalidate_range_free_pages() notifier
From: Joerg Roedel <hidden>
Date: 2011-10-21 12:22:21
Also in:
lkml
Subsystem:
hugetlb subsystem, memory management, memory management - core, the rest · Maintainers:
Muchun Song, Oscar Salvador, Andrew Morton, David Hildenbrand, Linus Torvalds
This patch adds the necessary calls to the new notifier. Signed-off-by: Joerg Roedel <redacted> --- mm/hugetlb.c | 1 + mm/memory.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index dae27ba..d08998d 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c@@ -2278,6 +2278,7 @@ void __unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start, } spin_unlock(&mm->page_table_lock); flush_tlb_range(vma, start, end); + mmu_notifier_invalidate_range_free_pages(mm); mmu_notifier_invalidate_range_end(mm, start, end); list_for_each_entry_safe(page, tmp, &page_list, lru) { page_remove_rmap(page);
diff --git a/mm/memory.c b/mm/memory.c
index b31f9e0..a5cc335 100644
--- a/mm/memory.c
+++ b/mm/memory.c@@ -1207,6 +1207,7 @@ again: * and page-free while holding it. */ if (force_flush) { + mmu_notifier_invalidate_range_free_pages(mm); force_flush = 0; tlb_flush_mmu(tlb); if (addr != end)
@@ -1359,6 +1360,16 @@ unsigned long unmap_vmas(struct mmu_gather *tlb, } } + /* + * In theory it would be sufficient to do the final flush for the last + * bunch of pages queued by mmu_gather in mn_invalidate_range_end(). + * But that would break the API definition because in the _end notifier + * the called subsystem has to assume that the pages are alread freed. + * So call mn_invalidate_range_free_pages() explicitly here for the + * final bunch of pages. + */ + mmu_notifier_invalidate_range_free_pages(mm); + mmu_notifier_invalidate_range_end(mm, start_addr, end_addr); return start; /* which is now the end (or restart) address */ }
--
1.7.5.4
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>