From: Shaohua Li <shli@fb.com> To: <linux-kernel@vger.kernel.org>, <linux-mm@kvack.org> Cc: <Kernel-team@fb.com>, <danielmicay@gmail.com>, <mhocko@suse.com>, <minchan@kernel.org>, <hughd@google.com>, <hannes@cmpxchg.org>, <riel@redhat.com>, <mgorman@techsingularity.net>, <akpm@linux-foundation.org> Subject: [PATCH V2 1/7] mm: don't assume anonymous pages have SwapBacked flag Date: Fri, 3 Feb 2017 15:33:17 -0800 [thread overview] Message-ID: <5f73795b14f18dec9aa2d995b60467e374a4d906.1486163864.git.shli@fb.com> (raw) In-Reply-To: <cover.1486163864.git.shli@fb.com> There are a few places the code assumes anonymous pages should have SwapBacked flag set. MADV_FREE pages are anonymous pages but we are going to add them to LRU_INACTIVE_FILE list and clear SwapBacked flag for them. The assumption doesn't hold any more, so fix them. Cc: Michal Hocko <mhocko@suse.com> Cc: Minchan Kim <minchan@kernel.org> Cc: Hugh Dickins <hughd@google.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Rik van Riel <riel@redhat.com> Cc: Mel Gorman <mgorman@techsingularity.net> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Shaohua Li <shli@fb.com> --- mm/huge_memory.c | 1 - mm/khugepaged.c | 8 +++----- mm/migrate.c | 3 ++- mm/rmap.c | 3 ++- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 40bd376..ecf569d 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2118,7 +2118,6 @@ int split_huge_page_to_list(struct page *page, struct list_head *list) VM_BUG_ON_PAGE(is_huge_zero_page(page), page); VM_BUG_ON_PAGE(!PageLocked(page), page); - VM_BUG_ON_PAGE(!PageSwapBacked(page), page); VM_BUG_ON_PAGE(!PageCompound(page), page); if (PageAnon(head)) { diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 34bce5c..a4b499f 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -481,8 +481,7 @@ void __khugepaged_exit(struct mm_struct *mm) static void release_pte_page(struct page *page) { - /* 0 stands for page_is_file_cache(page) == false */ - dec_node_page_state(page, NR_ISOLATED_ANON + 0); + dec_node_page_state(page, NR_ISOLATED_ANON + page_is_file_cache(page)); unlock_page(page); putback_lru_page(page); } @@ -530,7 +529,6 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, VM_BUG_ON_PAGE(PageCompound(page), page); VM_BUG_ON_PAGE(!PageAnon(page), page); - VM_BUG_ON_PAGE(!PageSwapBacked(page), page); /* * We can do it before isolate_lru_page because the @@ -577,8 +575,8 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, result = SCAN_DEL_PAGE_LRU; goto out; } - /* 0 stands for page_is_file_cache(page) == false */ - inc_node_page_state(page, NR_ISOLATED_ANON + 0); + inc_node_page_state(page, + NR_ISOLATED_ANON + page_is_file_cache(page)); VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(PageLRU(page), page); diff --git a/mm/migrate.c b/mm/migrate.c index 87f4d0f..eb76f87 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1963,7 +1963,8 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm, /* Prepare a page as a migration target */ __SetPageLocked(new_page); - __SetPageSwapBacked(new_page); + if (PageSwapBacked(page)) + __SetPageSwapBacked(new_page); /* anon mapping, we can simply copy page->mapping to the new page: */ new_page->mapping = page->mapping; diff --git a/mm/rmap.c b/mm/rmap.c index c48e9c1..c8d6204 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1546,7 +1546,8 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma, * Store the swap location in the pte. * See handle_pte_fault() ... */ - VM_BUG_ON_PAGE(!PageSwapCache(page), page); + VM_BUG_ON_PAGE(!PageSwapCache(page) && PageSwapBacked(page), + page); if (!PageDirty(page) && (flags & TTU_LZFREE)) { /* It's a freeable page by MADV_FREE */ -- 2.9.3
WARNING: multiple messages have this Message-ID (diff)
From: Shaohua Li <shli@fb.com> To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Kernel-team@fb.com, danielmicay@gmail.com, mhocko@suse.com, minchan@kernel.org, hughd@google.com, hannes@cmpxchg.org, riel@redhat.com, mgorman@techsingularity.net, akpm@linux-foundation.org Subject: [PATCH V2 1/7] mm: don't assume anonymous pages have SwapBacked flag Date: Fri, 3 Feb 2017 15:33:17 -0800 [thread overview] Message-ID: <5f73795b14f18dec9aa2d995b60467e374a4d906.1486163864.git.shli@fb.com> (raw) In-Reply-To: <cover.1486163864.git.shli@fb.com> There are a few places the code assumes anonymous pages should have SwapBacked flag set. MADV_FREE pages are anonymous pages but we are going to add them to LRU_INACTIVE_FILE list and clear SwapBacked flag for them. The assumption doesn't hold any more, so fix them. Cc: Michal Hocko <mhocko@suse.com> Cc: Minchan Kim <minchan@kernel.org> Cc: Hugh Dickins <hughd@google.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Rik van Riel <riel@redhat.com> Cc: Mel Gorman <mgorman@techsingularity.net> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Shaohua Li <shli@fb.com> --- mm/huge_memory.c | 1 - mm/khugepaged.c | 8 +++----- mm/migrate.c | 3 ++- mm/rmap.c | 3 ++- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 40bd376..ecf569d 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2118,7 +2118,6 @@ int split_huge_page_to_list(struct page *page, struct list_head *list) VM_BUG_ON_PAGE(is_huge_zero_page(page), page); VM_BUG_ON_PAGE(!PageLocked(page), page); - VM_BUG_ON_PAGE(!PageSwapBacked(page), page); VM_BUG_ON_PAGE(!PageCompound(page), page); if (PageAnon(head)) { diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 34bce5c..a4b499f 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -481,8 +481,7 @@ void __khugepaged_exit(struct mm_struct *mm) static void release_pte_page(struct page *page) { - /* 0 stands for page_is_file_cache(page) == false */ - dec_node_page_state(page, NR_ISOLATED_ANON + 0); + dec_node_page_state(page, NR_ISOLATED_ANON + page_is_file_cache(page)); unlock_page(page); putback_lru_page(page); } @@ -530,7 +529,6 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, VM_BUG_ON_PAGE(PageCompound(page), page); VM_BUG_ON_PAGE(!PageAnon(page), page); - VM_BUG_ON_PAGE(!PageSwapBacked(page), page); /* * We can do it before isolate_lru_page because the @@ -577,8 +575,8 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, result = SCAN_DEL_PAGE_LRU; goto out; } - /* 0 stands for page_is_file_cache(page) == false */ - inc_node_page_state(page, NR_ISOLATED_ANON + 0); + inc_node_page_state(page, + NR_ISOLATED_ANON + page_is_file_cache(page)); VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(PageLRU(page), page); diff --git a/mm/migrate.c b/mm/migrate.c index 87f4d0f..eb76f87 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1963,7 +1963,8 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm, /* Prepare a page as a migration target */ __SetPageLocked(new_page); - __SetPageSwapBacked(new_page); + if (PageSwapBacked(page)) + __SetPageSwapBacked(new_page); /* anon mapping, we can simply copy page->mapping to the new page: */ new_page->mapping = page->mapping; diff --git a/mm/rmap.c b/mm/rmap.c index c48e9c1..c8d6204 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1546,7 +1546,8 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma, * Store the swap location in the pte. * See handle_pte_fault() ... */ - VM_BUG_ON_PAGE(!PageSwapCache(page), page); + VM_BUG_ON_PAGE(!PageSwapCache(page) && PageSwapBacked(page), + page); if (!PageDirty(page) && (flags & TTU_LZFREE)) { /* It's a freeable page by MADV_FREE */ -- 2.9.3 -- 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/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-02-03 23:33 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-02-03 23:33 [PATCH V2 0/7] mm: fix some MADV_FREE issues Shaohua Li 2017-02-03 23:33 ` Shaohua Li 2017-02-03 23:33 ` Shaohua Li [this message] 2017-02-03 23:33 ` [PATCH V2 1/7] mm: don't assume anonymous pages have SwapBacked flag Shaohua Li 2017-02-03 23:33 ` [PATCH V2 2/7] mm: move MADV_FREE pages into LRU_INACTIVE_FILE list Shaohua Li 2017-02-03 23:33 ` Shaohua Li 2017-02-04 6:38 ` Hillf Danton 2017-02-04 6:38 ` Hillf Danton 2017-02-09 6:33 ` Hillf Danton 2017-02-09 6:33 ` Hillf Danton 2017-02-10 6:50 ` Minchan Kim 2017-02-10 6:50 ` Minchan Kim 2017-02-10 17:30 ` Shaohua Li 2017-02-10 17:30 ` Shaohua Li 2017-02-13 4:57 ` Minchan Kim 2017-02-13 4:57 ` Minchan Kim 2017-02-10 13:02 ` Michal Hocko 2017-02-10 13:02 ` Michal Hocko 2017-02-10 17:33 ` Shaohua Li 2017-02-10 17:33 ` Shaohua Li 2017-02-03 23:33 ` [PATCH V2 3/7] mm: reclaim MADV_FREE pages Shaohua Li 2017-02-03 23:33 ` Shaohua Li 2017-02-10 6:58 ` Minchan Kim 2017-02-10 6:58 ` Minchan Kim 2017-02-10 17:43 ` Shaohua Li 2017-02-10 17:43 ` Shaohua Li 2017-02-13 5:06 ` Minchan Kim 2017-02-13 5:06 ` Minchan Kim 2017-02-10 13:23 ` Michal Hocko 2017-02-10 13:23 ` Michal Hocko 2017-02-03 23:33 ` [PATCH V2 4/7] mm: enable MADV_FREE for swapless system Shaohua Li 2017-02-03 23:33 ` Shaohua Li 2017-02-03 23:33 ` [PATCH V2 5/7] mm: add vmstat account for MADV_FREE pages Shaohua Li 2017-02-03 23:33 ` Shaohua Li 2017-02-10 13:27 ` Michal Hocko 2017-02-10 13:27 ` Michal Hocko 2017-02-10 17:50 ` Shaohua Li 2017-02-10 17:50 ` Shaohua Li 2017-02-21 9:43 ` Michal Hocko 2017-02-21 9:43 ` Michal Hocko 2017-02-03 23:33 ` [PATCH V2 6/7] proc: show MADV_FREE pages info in smaps Shaohua Li 2017-02-03 23:33 ` Shaohua Li 2017-02-10 13:30 ` Michal Hocko 2017-02-10 13:30 ` Michal Hocko 2017-02-10 17:52 ` Shaohua Li 2017-02-10 17:52 ` Shaohua Li 2017-02-22 2:47 ` Minchan Kim 2017-02-22 2:47 ` Minchan Kim 2017-02-22 4:11 ` Shaohua Li 2017-02-22 4:11 ` Shaohua Li 2017-02-03 23:33 ` [PATCH V2 7/7] mm: add a separate RSS for MADV_FREE pages Shaohua Li 2017-02-03 23:33 ` Shaohua Li 2017-02-10 13:35 ` Michal Hocko 2017-02-10 13:35 ` Michal Hocko 2017-02-10 18:01 ` Shaohua Li 2017-02-10 18:01 ` Shaohua Li 2017-02-21 9:45 ` Michal Hocko 2017-02-21 9:45 ` Michal Hocko 2017-02-22 0:46 ` Minchan Kim 2017-02-22 0:46 ` Minchan Kim 2017-02-22 1:27 ` Shaohua Li 2017-02-22 1:27 ` Shaohua Li
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=5f73795b14f18dec9aa2d995b60467e374a4d906.1486163864.git.shli@fb.com \ --to=shli@fb.com \ --cc=Kernel-team@fb.com \ --cc=akpm@linux-foundation.org \ --cc=danielmicay@gmail.com \ --cc=hannes@cmpxchg.org \ --cc=hughd@google.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mgorman@techsingularity.net \ --cc=mhocko@suse.com \ --cc=minchan@kernel.org \ --cc=riel@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.