2 files changed, 20 insertions, 2 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 028d07c79104..6187ca4d5dc2 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1367,6 +1367,20 @@ int mem_cgroup_inactive_anon_is_low(struct lruvec *lruvec)
         return inactive * inactive_ratio < active;
 }
 
+bool mem_cgroup_lruvec_online(struct lruvec *lruvec)
+{
+        struct mem_cgroup_per_zone *mz;
+        struct mem_cgroup *memcg;
+
+        if (mem_cgroup_disabled())
+                return true;
+
+        mz = container_of(lruvec, struct mem_cgroup_per_zone, lruvec);
+        memcg = mz->memcg;
+
+        return !!(memcg->css.flags & CSS_ONLINE);
+}
+
 #define mem_cgroup_from_counter(counter, member)        \
         container_of(counter, struct mem_cgroup, member)
 
diff --git a/mm/vmscan.c b/mm/vmscan.c
index f756a202d5d5..b6dfa0081a8e 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1903,8 +1903,12 @@ static void get_scan_count(struct lruvec *lruvec, int swappiness,
          * latencies, so it's better to scan a minimum amount there as
          * well.
          */
-        if (current_is_kswapd() && !zone_reclaimable(zone))
-                force_scan = true;
+        if (current_is_kswapd()) {
+                if (!zone_reclaimable(zone))
+                        force_scan = true;
+                if (!mem_cgroup_lruvec_online(lruvec))
+                        force_scan = true;
+        }
         if (!global_reclaim(sc))
                 force_scan = true;