The patch titled
Subject: mm: memcontrol: use page lists for uncharge batching fix - hugetlb page->lru
has been removed from the -mm tree. Its filename was
mm-memcontrol-use-page-lists-for-uncharge-batching-fix-hugetlb-page-lru.patch
This patch was dropped because it was folded into mm-memcontrol-use-page-lists-for-uncharge-batching.patch
------------------------------------------------------
From: Johannes Weiner <hannes@xxxxxxxxxxx>
Subject: mm: memcontrol: use page lists for uncharge batching fix - hugetlb page->lru
Naoya-san reports that page->lru of hugetlb pages gets corrupted when they
hit the uncharge path from put_page().
Add a preliminary check for whether the page is even a valid memcg page
before messing with it's ->lru list.
Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Reported-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 7 +++++++
1 file changed, 7 insertions(+)
diff -puN mm/memcontrol.c~mm-memcontrol-use-page-lists-for-uncharge-batching-fix-hugetlb-page-lru mm/memcontrol.c
--- a/mm/memcontrol.c~mm-memcontrol-use-page-lists-for-uncharge-batching-fix-hugetlb-page-lru
+++ a/mm/memcontrol.c
@@ -6583,9 +6583,16 @@ static void uncharge_list(struct list_he
*/
void mem_cgroup_uncharge(struct page *page)
{
+ struct page_cgroup *pc;
+
if (mem_cgroup_disabled())
return;
+ /* Don't touch page->lru of any random page, pre-check: */
+ pc = lookup_page_cgroup(page);
+ if (!PageCgroupUsed(pc))
+ return;
+
INIT_LIST_HEAD(&page->lru);
uncharge_list(&page->lru);
}
_
Patches currently in -mm which might be from hannes@xxxxxxxxxxx are
origin.patch
mm-memcontrol-rewrite-charge-api.patch
mm-memcontrol-rewrite-uncharge-api.patch
mm-memcontrol-rewrite-uncharge-api-fix-page-cache-migration.patch
mm-memcontrol-use-page-lists-for-uncharge-batching.patch
page-cgroup-trivial-cleanup.patch
page-cgroup-get-rid-of-nr_pcg_flags.patch
memcg-remove-lookup_cgroup_page-prototype.patch
mm-memcontrol-avoid-charge-statistics-churn-during-page-migration.patch
nilfs2-integrate-sysfs-support-into-driver-fix.patch
linux-next.patch
debugging-keep-track-of-page-owners.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
