memcg-infrastructure-to-flush-memcg-stats-v5

fix sleep-in-wrong context bug

Link: https://lkml.kernel.org/r/20210716212137.1391164-2-shakeelb@google.com
Signed-off-by: Shakeel Butt <shakeelb@google.com>
Reported-by: Yang Yingliang <yangyingliang@huawei.com>
Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Hillf Danton <hdanton@sina.com>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Michal Koutný <mkoutny@suse.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: Roman Gushchin <guro@fb.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 3dc6bc48b73f500e46c5b04249f18fa477e8d309..4d8c9afecf98572b1cf557896ce0346911b1c907 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -5350,7 +5350,7 @@ void mem_cgroup_flush_stats(void)
        if (!spin_trylock(&stats_flush_lock))
                return;
 
-       cgroup_rstat_flush(root_mem_cgroup->css.cgroup);
+       cgroup_rstat_flush_irqsafe(root_mem_cgroup->css.cgroup);
        spin_unlock(&stats_flush_lock);
 }