All of
 help / color / mirror / Atom feed
* [folded-merged] mm-memcontrol-rewrite-mem_cgroup_page_lruvec-fix-fix.patch removed from -mm tree
@ 2020-12-18 20:05 akpm
  0 siblings, 0 replies; only message in thread
From: akpm @ 2020-12-18 20:05 UTC (permalink / raw)
  To: mm-commits, sh_def, shakeelb, sfr, richard.weiyang, mhocko,
	laoar.shao, hannes, guro, alex.shi, alexander.h.duyck, lstoakes

The patch titled
     Subject: mm/memcg: warn on missing memcg on mem_cgroup_page_lruvec()
has been removed from the -mm tree.  Its filename was

This patch was dropped because it was folded into mm-memcontrol-rewrite-mem_cgroup_page_lruvec.patch

From: Lorenzo Stoakes <>
Subject: mm/memcg: warn on missing memcg on mem_cgroup_page_lruvec()

Move memcg check to mem_cgroup_page_lruvec() as there are callers which
may invoke this with !memcg in mem_cgroup_lruvec(), whereas they should
not in mem_cgroup_page_lruvec().

We expect that we have always charged a page to the memcg before
mem_cgroup_page_lruvec() is invoked, so add a warning to assert that this
is the case.

Signed-off-by: Lorenzo Stoakes <>
Acked-by: Alex Shi <>
Cc: Stephen Rothwell <>
Cc: Johannes Weiner <>
Cc: Shakeel Butt <>
Cc: Roman Gushchin <>
Cc: Michal Hocko <>
Cc: Yafang Shao <>
Cc: Alexander Duyck <>
Cc: Hui Su <>
Cc: Wei Yang <>
Signed-off-by: Andrew Morton <>

 include/linux/memcontrol.h |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- a/include/linux/memcontrol.h~mm-memcontrol-rewrite-mem_cgroup_page_lruvec-fix-fix
+++ a/include/linux/memcontrol.h
@@ -613,8 +613,6 @@ static inline struct lruvec *mem_cgroup_
 	struct mem_cgroup_per_node *mz;
 	struct lruvec *lruvec;
-	VM_WARN_ON_ONCE(!memcg);
 	if (mem_cgroup_disabled()) {
 		lruvec = &pgdat->__lruvec;
 		goto out;
@@ -646,7 +644,10 @@ out:
 static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page,
 						struct pglist_data *pgdat)
-	return mem_cgroup_lruvec(page_memcg(page), pgdat);
+	struct mem_cgroup *memcg = page_memcg(page);
+	VM_WARN_ON_ONCE_PAGE(!memcg, page);
+	return mem_cgroup_lruvec(memcg, pgdat);
 static inline bool lruvec_holds_page_lru_lock(struct page *page,

Patches currently in -mm which might be from are


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2020-12-18 20:06 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-18 20:05 [folded-merged] mm-memcontrol-rewrite-mem_cgroup_page_lruvec-fix-fix.patch removed from -mm tree akpm

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.