The patch titled
Subject: mm: move mem_cgroup_uncharge out of __page_cache_release()
has been removed from the -mm tree. Its filename was
mm-move-mem_cgroup_uncharge-out-of-__page_cache_release.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx>
Subject: mm: move mem_cgroup_uncharge out of __page_cache_release()
A later patch would make THP deferred split shrinker memcg aware, but it
needs page->mem_cgroup information in THP destructor, which is called
after mem_cgroup_uncharge() now.
So, move mem_cgroup_uncharge() from __page_cache_release() to compound
page destructor, which is called by both THP and other compound pages
except HugeTLB. And call it in __put_single_page() for single order page.
Link: http://lkml.kernel.org/r/1561507361-59349-3-git-send-email-yang.shi@xxxxxxxxxxxxxxxxx
Signed-off-by: Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx>
Suggested-by: "Kirill A . Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx>
Acked-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Shakeel Butt <shakeelb@xxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 1 +
mm/swap.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--- a/mm/page_alloc.c~mm-move-mem_cgroup_uncharge-out-of-__page_cache_release
+++ a/mm/page_alloc.c
@@ -623,6 +623,7 @@ out:
void free_compound_page(struct page *page)
{
+ mem_cgroup_uncharge(page);
__free_pages_ok(page, compound_order(page));
}
--- a/mm/swap.c~mm-move-mem_cgroup_uncharge-out-of-__page_cache_release
+++ a/mm/swap.c
@@ -71,12 +71,12 @@ static void __page_cache_release(struct
spin_unlock_irqrestore(&pgdat->lru_lock, flags);
}
__ClearPageWaiters(page);
- mem_cgroup_uncharge(page);
}
static void __put_single_page(struct page *page)
{
__page_cache_release(page);
+ mem_cgroup_uncharge(page);
free_unref_page(page);
}
_
Patches currently in -mm which might be from yang.shi@xxxxxxxxxxxxxxxxx are
mm-shrinker-make-shrinker-not-depend-on-memcg-kmem.patch
mm-thp-make-deferred-split-shrinker-memcg-aware.patch
mm-mempolicy-make-the-behavior-consistent-when-mpol_mf_move-and-mpol_mf_strict-were-specified.patch
mm-mempolicy-handle-vma-with-unmovable-pages-mapped-correctly-in-mbind.patch
mm-thp-make-transhuge_vma_suitable-available-for-anonymous-thp.patch
mm-thp-fix-false-negative-of-shmem-vmas-thp-eligibility.patch
