android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert "memcg, vmscan: do not attempt soft limit reclaim if it would not scan anything"

Browse Source 
Revert commit e839b6a1c8 ("memcg, vmscan: do not attempt soft limit
reclaim if it would not scan anything")

I merged this prematurely - Michal and Johannes still disagree about the
overall design direction and the future remains unclear.

Cc: Michal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andrew Morton 2013-09-24 15:27:35 -07:00 committed by Linus Torvalds
parent 8f939a9f4c
commit 3120055e86
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mm/memcontrol.c
View File

@ -1872,11 +1872,7 @@ enum mem_cgroup_filter_t
mem_cgroup_soft_reclaim_eligible(struct mem_cgroup *memcg, mem_cgroup_soft_reclaim_eligible(struct mem_cgroup *memcg,
struct mem_cgroup *root) struct mem_cgroup *root)
{ {
struct mem_cgroup *parent; struct mem_cgroup *parent = memcg;
if (!memcg)
memcg = root_mem_cgroup;
parent = memcg;
if (res_counter_soft_limit_excess(&memcg->res)) if (res_counter_soft_limit_excess(&memcg->res))
return VISIT; return VISIT;

4
mm/vmscan.c
View File

@ -142,9 +142,7 @@ static bool global_reclaim(struct scan_control *sc)
static bool mem_cgroup_should_soft_reclaim(struct scan_control *sc) static bool mem_cgroup_should_soft_reclaim(struct scan_control *sc)
{ {
struct mem_cgroup *root = sc->target_mem_cgroup; return !mem_cgroup_disabled();
return !mem_cgroup_disabled() &&
mem_cgroup_soft_reclaim_eligible(root, root) != SKIP_TREE;
} }
#else #else
static bool global_reclaim(struct scan_control *sc) static bool global_reclaim(struct scan_control *sc)