[PATCH for-4.6-fixes] memcg: remove lru_add_drain_all() invocation from mem_cgroup_move_charge()

From: Tejun Heo
Date: Thu Apr 21 2016 - 11:56:59 EST


mem_cgroup_move_charge() invokes lru_add_drain_all() so that the pvec
pages can be moved too. lru_add_drain_all() schedules and flushes
work items on system_wq which depends on being able to create new
kworkers to make forward progress. Since 1ed1328792ff ("sched,
cgroup: replace signal_struct->group_rwsem with a global
percpu_rwsem"), a new task can't be created while in the cgroup
migration path and the described lru_add_drain_all() invocation can
easily lead to a deadlock.

Charge moving is best-effort and whether the pvec pages are migrated
or not doesn't really matter. Don't call it during charge moving.
Eventually, we want to move the actual charge moving outside the
migration path.

Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Debugged-and-tested-by: Petr Mladek <pmladek@xxxxxxxx>
Reported-by: Cyril Hrubis <chrubis@xxxxxxx>
Reported-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Suggested-by: Michal Hocko <mhocko@xxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
Fixes: 1ed1328792ff ("sched, cgroup: replace signal_struct->group_rwsem with a global percpu_rwsem")
Cc: stable@xxxxxxxxxxxxxxx # v4.4+
---
Hello, Andrew.

This fixes an easily triggered deadlock when using memcg charge
moving. While the issue requires more invasive changes, which are
being worked on, to plug completely, this works around the immediate
issue. Can you please route this through -mm?

Thanks.

mm/memcontrol.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 36db05f..56060c7 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -4859,7 +4859,6 @@ static void mem_cgroup_move_charge(struct mm_struct *mm)
.mm = mm,
};

- lru_add_drain_all();
/*
* Signal lock_page_memcg() to take the memcg's move_lock
* while we're moving its pages to another memcg. Then wait