[rh7] mm/page_alloc.c: check if page cgroup still in use during alloc/free.

Submitted by Andrey Ryabinin on Aug. 7, 2019, 12:47 p.m.

Details

Message ID 20190807124706.18647-1-aryabinin@virtuozzo.com
State New
Series "mm/page_alloc.c: check if page cgroup still in use during alloc/free."
Headers show

Commit Message

Andrey Ryabinin Aug. 7, 2019, 12:47 p.m.
Add debug check to free_page() patch to make sure that we don't allocate/free
pages with memcg marked as used.

https://jira.sw.ru/browse/PSBM-96036
Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
---
 mm/page_alloc.c  | 23 +++++++++++++++++++++++
 mm/page_cgroup.c |  3 ++-
 2 files changed, 25 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 78c68ba512e9..47192a09ea7c 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -975,6 +975,26 @@  void __meminit reserve_bootmem_region(unsigned long start, unsigned long end)
 	}
 }
 
+static void check_memcg(struct page *page)
+{
+	struct page_cgroup *pc;
+	extern int page_cgroup_inited;
+
+	if (!page_cgroup_inited)
+		return;
+
+	pc = lookup_page_cgroup(page);
+	/*
+	 * Fast unlocked return. Theoretically might have changed, have to
+	 * check again after locking.
+	 */
+	if (!pc || !PageCgroupUsed(pc))
+		return;
+
+	if (WARN(PageCgroupUsed(pc), "memcg %p\n", pc->mem_cgroup))
+		pc->flags = 0;
+}
+
 static bool free_pages_prepare(struct page *page, unsigned int order)
 {
 	int i;
@@ -987,6 +1007,8 @@  static bool free_pages_prepare(struct page *page, unsigned int order)
 	if (PageAnon(page))
 		page->mapping = NULL;
 	memcg_kmem_uncharge_pages(page, order);
+	check_memcg(page);
+
 	for (i = 0; i < (1 << order); i++) {
 		bad += free_pages_check(page + i);
 		if (static_key_false(&zero_free_pages))
@@ -1580,6 +1602,7 @@  static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
 	arch_alloc_page(page, order);
 	kernel_map_pages(page, 1 << order, 1);
 	kasan_alloc_pages(page, order);
+	check_memcg(page);
 
 	if (gfp_flags & __GFP_ZERO)
 		prep_zero_page(page, order, gfp_flags);
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c
index 452f59a4fe90..a856d993f274 100644
--- a/mm/page_cgroup.c
+++ b/mm/page_cgroup.c
@@ -266,7 +266,7 @@  static int __meminit page_cgroup_callback(struct notifier_block *self,
 }
 
 #endif
-
+int page_cgroup_inited;
 void __init page_cgroup_init(void)
 {
 	unsigned long pfn;
@@ -309,6 +309,7 @@  void __init page_cgroup_init(void)
 	printk(KERN_INFO "please try 'cgroup_disable=memory' option if you "
 			 "don't want memory cgroups\n");
 	invoke_page_ext_init_callbacks();
+	page_cgroup_inited = true;
 	return;
 oom:
 	printk(KERN_CRIT "try 'cgroup_disable=memory' boot option\n");