xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert "vmscan, memcg: do softlimit reclaim also for targeted reclaim"

Browse Source 
Revert commit a5b7c87f92 ("vmscan, memcg: do softlimit reclaim also
for targeted reclaim")

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:38 -07:00
committed by Linus Torvalds
parent 694fbc0fe7
commit b1aff7fcf8
3 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mm/memcontrol.c
View File

@@ -1760,13 +1760,11 @@ int mem_cgroup_select_victim_node(struct mem_cgroup *memcg)
#endif
/*
* A group is eligible for the soft limit reclaim under the given root
* hierarchy if
* a) it is over its soft limit
* A group is eligible for the soft limit reclaim if
* a) it is over its soft limit
* b) any parent up the hierarchy is over its soft limit
*/
bool mem_cgroup_soft_reclaim_eligible(struct mem_cgroup *memcg,
struct mem_cgroup *root)
bool mem_cgroup_soft_reclaim_eligible(struct mem_cgroup *memcg)
{
struct mem_cgroup *parent = memcg;
@@ -1774,14 +1772,12 @@ bool mem_cgroup_soft_reclaim_eligible(struct mem_cgroup *memcg,
return true;
/*
* If any parent up to the root in the hierarchy is over its soft limit
* then we have to obey and reclaim from this group as well.
* If any parent up the hierarchy is over its soft limit then we
* have to obey and reclaim from this group as well.
*/
while ((parent = parent_mem_cgroup(parent))) {
if (res_counter_soft_limit_excess(&parent->res))
return true;
if (parent == root)
break;
}
return false;