The patch titled
Subject: memcg-add-per-memcg-vmalloc-stat-v2
has been removed from the -mm tree. Its filename was
memcg-add-per-memcg-vmalloc-stat-v2.patch
This patch was dropped because it was folded into memcg-add-per-memcg-vmalloc-stat.patch
------------------------------------------------------
From: Shakeel Butt <shakeelb@xxxxxxxxxx>
Subject: memcg-add-per-memcg-vmalloc-stat-v2
page_memcg() within rcu lock, per Muchun
Link: https://lkml.kernel.org/r/20211222052457.1960701-1-shakeelb@xxxxxxxxxx
Signed-off-by: Shakeel Butt <shakeelb@xxxxxxxxxx>
Cc: Muchun Song <songmuchun@xxxxxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Cc: Roman Gushchin <guro@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/memcontrol.h | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--- a/include/linux/memcontrol.h~memcg-add-per-memcg-vmalloc-stat-v2
+++ a/include/linux/memcontrol.h
@@ -996,10 +996,16 @@ static inline void mod_memcg_state(struc
static inline void mod_memcg_page_state(struct page *page,
int idx, int val)
{
- struct mem_cgroup *memcg = page_memcg(page);
+ struct mem_cgroup *memcg;
- if (!mem_cgroup_disabled() && memcg)
+ if (mem_cgroup_disabled())
+ return;
+
+ rcu_read_lock();
+ memcg = page_memcg(page);
+ if (memcg)
mod_memcg_state(memcg, idx, val);
+ rcu_read_unlock();
}
static inline unsigned long memcg_page_state(struct mem_cgroup *memcg, int idx)
_
Patches currently in -mm which might be from shakeelb@xxxxxxxxxx are
memcg-better-bounds-on-the-memcg-stats-updates.patch
memcg-add-per-memcg-vmalloc-stat.patch
memcg-add-per-memcg-vmalloc-stat-v4.patch
