linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [Resend PATCH 1/6] mm/memcg: warning on !memcg after readahead page charged
@ 2020-08-11 11:10 Alex Shi
  2020-08-11 11:10 ` [Resend PATCH 2/6] mm/memcg: remove useless check on page->mem_cgroup Alex Shi
                   ` (5 more replies)
  0 siblings, 6 replies; 27+ messages in thread
From: Alex Shi @ 2020-08-11 11:10 UTC (permalink / raw)
  To: akpm
  Cc: Johannes Weiner, Michal Hocko, Vladimir Davydov, cgroups,
	linux-mm, linux-kernel

Since readahead page is charged on memcg too, in theory we don't have to
check this exception now. Before safely remove them all, add a warning
for the unexpected !memcg.

Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: cgroups@vger.kernel.org
Cc: linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org
---
 include/linux/mmdebug.h | 13 +++++++++++++
 mm/memcontrol.c         | 15 ++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/include/linux/mmdebug.h b/include/linux/mmdebug.h
index 2ad72d2c8cc5..4ed52879ce55 100644
--- a/include/linux/mmdebug.h
+++ b/include/linux/mmdebug.h
@@ -37,6 +37,18 @@
 			BUG();						\
 		}							\
 	} while (0)
+#define VM_WARN_ON_ONCE_PAGE(cond, page)	({			\
+	static bool __section(.data.once) __warned;			\
+	int __ret_warn_once = !!(cond);					\
+									\
+	if (unlikely(__ret_warn_once && !__warned)) {			\
+		dump_page(page, "VM_WARN_ON_ONCE_PAGE(" __stringify(cond)")");\
+		__warned = true;					\
+		WARN_ON(1);						\
+	}								\
+	unlikely(__ret_warn_once);					\
+})
+
 #define VM_WARN_ON(cond) (void)WARN_ON(cond)
 #define VM_WARN_ON_ONCE(cond) (void)WARN_ON_ONCE(cond)
 #define VM_WARN_ONCE(cond, format...) (void)WARN_ONCE(cond, format)
@@ -48,6 +60,7 @@
 #define VM_BUG_ON_MM(cond, mm) VM_BUG_ON(cond)
 #define VM_WARN_ON(cond) BUILD_BUG_ON_INVALID(cond)
 #define VM_WARN_ON_ONCE(cond) BUILD_BUG_ON_INVALID(cond)
+#define VM_WARN_ON_ONCE_PAGE(cond, page)  BUILD_BUG_ON_INVALID(cond)
 #define VM_WARN_ONCE(cond, format...) BUILD_BUG_ON_INVALID(cond)
 #define VM_WARN(cond, format...) BUILD_BUG_ON_INVALID(cond)
 #endif
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 130093bdf74b..299382fc55a9 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1322,10 +1322,8 @@ struct lruvec *mem_cgroup_page_lruvec(struct page *page, struct pglist_data *pgd
 	}
 
 	memcg = page->mem_cgroup;
-	/*
-	 * Swapcache readahead pages are added to the LRU - and
-	 * possibly migrated - before they are charged.
-	 */
+	/* Readahead page is charged too, to see if other page uncharged */
+	VM_WARN_ON_ONCE_PAGE(!memcg, page);
 	if (!memcg)
 		memcg = root_mem_cgroup;
 
@@ -6906,8 +6904,9 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage)
 	if (newpage->mem_cgroup)
 		return;
 
-	/* Swapcache readahead pages can get replaced before being charged */
 	memcg = oldpage->mem_cgroup;
+	/* Readahead page is charged too, to see if other page uncharged */
+	VM_WARN_ON_ONCE_PAGE(!memcg, oldpage);
 	if (!memcg)
 		return;
 
@@ -7104,7 +7103,8 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
 
 	memcg = page->mem_cgroup;
 
-	/* Readahead page, never charged */
+	/* Readahead page is charged too, to see if other page uncharged */
+	VM_WARN_ON_ONCE_PAGE(!memcg, page);
 	if (!memcg)
 		return;
 
@@ -7168,7 +7168,8 @@ int mem_cgroup_try_charge_swap(struct page *page, swp_entry_t entry)
 
 	memcg = page->mem_cgroup;
 
-	/* Readahead page, never charged */
+	/* Readahead page is charged too, to see if other page uncharged */
+	VM_WARN_ON_ONCE_PAGE(!memcg, page);
 	if (!memcg)
 		return 0;
 
-- 
1.8.3.1



^ permalink raw reply related	[flat|nested] 27+ messages in thread

end of thread, other threads:[~2020-08-27  6:00 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-11 11:10 [Resend PATCH 1/6] mm/memcg: warning on !memcg after readahead page charged Alex Shi
2020-08-11 11:10 ` [Resend PATCH 2/6] mm/memcg: remove useless check on page->mem_cgroup Alex Shi
2020-08-11 11:30   ` Michal Hocko
2020-08-11 12:42     ` Alex Shi
2020-08-11 12:54     ` Alex Shi
2020-08-11 13:56       ` Michal Hocko
2020-08-12  3:25         ` Alex Shi
2020-08-13  6:20           ` Michal Hocko
2020-08-13  9:45             ` Alex Shi
2020-08-13 11:01               ` Michal Hocko
2020-08-11 11:10 ` [Resend PATCH 3/6] mm/thp: move lru_add_page_tail func to huge_memory.c Alex Shi
2020-08-11 11:10 ` [Resend PATCH 4/6] mm/thp: clean up lru_add_page_tail Alex Shi
2020-08-11 11:10 ` [Resend PATCH 5/6] mm/thp: remove code path which never got into Alex Shi
2020-08-11 11:10 ` [Resend PATCH 6/6] mm/thp: narrow lru locking Alex Shi
2020-08-20 14:58 ` [Resend PATCH 1/6] mm/memcg: warning on !memcg after readahead page charged Qian Cai
2020-08-21  8:01   ` Michal Hocko
2020-08-21 12:39     ` Qian Cai
2020-08-21 13:48       ` Michal Hocko
2020-08-24 15:10         ` Michal Hocko
2020-08-25  1:25           ` Alex Shi
2020-08-25  2:04             ` Hugh Dickins
2020-08-27  6:00               ` Hugh Dickins
2020-08-25  7:25             ` Michal Hocko
2020-08-24 14:52   ` Qian Cai
2020-08-24 15:10     ` Michal Hocko
2020-08-24 23:00       ` Stephen Rothwell
2020-08-24 23:14         ` Alex Shi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).