openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mm/vmscan: more restrictive condition for retry in do_try_to_free_pages 

By reviewing code, I find that when enter do_try_to_free_pages, the
may_thrash is always clear, and it will retry shrink zones to tap
cgroup's reserves memory by setting may_thrash when the former
shrink_zones reclaim nothing.

However, when memcg is disabled or on legacy hierarchy, or there do not
have any memcg protected by low limit, it should not do this useless
retry at all, for we do not have any cgroup's reserves memory to tap,
and we have already done hard work but made no progress, which as Michal
pointed out in former version, we are trying hard to control the retry
logical of page alloctor, and the current additional round of reclaim is
just lame.

Therefore, to avoid this unneeded retrying and make code more readable,
we remove the may_thrash field in scan_control, instead, introduce
memcg_low_reclaim and memcg_low_skipped, and only retry when
memcg_low_skipped, by setting memcg_low_reclaim.

[xieyisheng1@huawei.com: remove may_thrash field, introduce mem_cgroup_reclaim]
  Link: http://lkml.kernel.org/r/1490191893-5923-1-git-send-email-ysxie@foxmail.com
Link: http://lkml.kernel.org/r/1490191893-5923-1-git-send-email-ysxie@foxmail.com
Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Suggested-by: Johannes Weiner <hannes@cmpxchg.org>
Suggested-by: Michal Hocko <mhocko@kernel.org>
Suggested-by: Shakeel Butt <shakeelb@google.com>
Reviewed-by: Shakeel Butt <shakeelb@google.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Yisheng Xie 2017-05-03 14:53:57 -07:00 committed by Linus Torvalds
parent 1ef36db2a9
commit d6622f6365
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mm/vmscan.c
View File

@ -97,8 +97,13 @@ struct scan_control {
/* Can pages be swapped as part of reclaim? */ /* Can pages be swapped as part of reclaim? */
unsigned int may_swap:1; unsigned int may_swap:1;
/* Can cgroups be reclaimed below their normal consumption range? */ /*
unsigned int may_thrash:1; * Cgroups are not reclaimed below their configured memory.low,
* unless we threaten to OOM. If any cgroups are skipped due to
* memory.low and nothing was reclaimed, go back for memory.low.
*/
unsigned int memcg_low_reclaim:1;
unsigned int memcg_low_skipped:1;
unsigned int hibernation_mode:1; unsigned int hibernation_mode:1;
@ -2512,8 +2517,10 @@ static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc)
unsigned long scanned; unsigned long scanned;
if (mem_cgroup_low(root, memcg)) { if (mem_cgroup_low(root, memcg)) {
if (!sc->may_thrash) if (!sc->memcg_low_reclaim) {
sc->memcg_low_skipped = 1;
continue; continue;
}
mem_cgroup_events(memcg, MEMCG_LOW, 1); mem_cgroup_events(memcg, MEMCG_LOW, 1);
} }
@ -2768,9 +2775,10 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
return 1; return 1;
/* Untapped cgroup reserves? Don't OOM, retry. */ /* Untapped cgroup reserves? Don't OOM, retry. */
if (!sc->may_thrash) { if (sc->memcg_low_skipped) {
sc->priority = initial_priority; sc->priority = initial_priority;
sc->may_thrash = 1; sc->memcg_low_reclaim = 1;
sc->memcg_low_skipped = 0;
goto retry; goto retry;
} }