This patch add ClearPageDirty() to clear AnonPage dirty flag, if not clear page dirty for this anon page, the page will never be treated as freeable. We also make sure the shared AnonPage is not freeable, we implement it by dirty all copyed AnonPage pte, so that make sure the Anonpage will not become freeable, unless all process which shared this page call madvise_free syscall. Signed-off-by: Yalin Wang <yalin.wang@xxxxxxxxxxxxxx> --- mm/madvise.c | 16 +++++++++------- mm/memory.c | 12 ++++++++++-- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 6d0fcb8..b61070d 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -297,23 +297,25 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned long addr, continue; page = vm_normal_page(vma, addr, ptent); - if (!page) + if (!page || !trylock_page(page)) continue; if (PageSwapCache(page)) { - if (!trylock_page(page)) - continue; - if (!try_to_free_swap(page)) { unlock_page(page); continue; } - - ClearPageDirty(page); - unlock_page(page); } /* + * we clear page dirty flag for AnonPage, no matter if this + * page is in swapcahce or not, AnonPage not in swapcache also set + * dirty flag sometimes, this happened when a AnonPage is removed + * from swapcahce by try_to_free_swap() + */ + ClearPageDirty(page); + unlock_page(page); + /* * Some of architecture(ex, PPC) don't update TLB * with set_pte_at and tlb_remove_tlb_entry so for * the portability, remap the pte with old|clean diff --git a/mm/memory.c b/mm/memory.c index 8068893..3d949b3 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -874,10 +874,18 @@ copy_one_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm, if (page) { get_page(page); page_dup_rmap(page); - if (PageAnon(page)) + if (PageAnon(page)) { + /* + * we dirty the copyed pte for anon page, + * this is useful for madvise_free_pte_range(), + * this can prevent shared anon page freed by madvise_free + * syscall + */ + pte = pte_mkdirty(pte); rss[MM_ANONPAGES]++; - else + } else { rss[MM_FILEPAGES]++; + } } out_set_pte: -- 2.2.2 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href