[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20090608120228.cb70e569.nishimura@mxp.nes.nec.co.jp>
Date: Mon, 8 Jun 2009 12:02:28 +0900
From: Daisuke Nishimura <nishimura@....nes.nec.co.jp>
To: LKML <linux-kernel@...r.kernel.org>, linux-mm <linux-mm@...ck.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
Johannes Weiner <hannes@...xchg.org>,
Balbir Singh <balbir@...ux.vnet.ibm.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>,
KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com>,
Daisuke Nishimura <nishimura@....nes.nec.co.jp>
Subject: [PATCH mmotm] vmscan: fix may_swap handling for memcg
From: Daisuke Nishimura <nishimura@....nes.nec.co.jp>
Commit 2e2e425989080cc534fc0fca154cae515f971cf5 ("vmscan,memcg: reintroduce
sc->may_swap) add may_swap flag and handle it at get_scan_ratio().
But the result of get_scan_ratio() is ignored when priority == 0, and this
means, when memcg hits the mem+swap limit, anon pages can be swapped
just in vain. Especially when memcg causes oom by mem+swap limit,
we can see many and many pages are swapped out.
Instead of not scanning anon lru completely when priority == 0, this patch adds
a hook to handle may_swap flag in shrink_page_list() to avoid using useless swaps,
and calls try_to_free_swap() if needed because it can reduce
both mem.usage and memsw.usage if the page(SwapCache) is unused anymore.
Such unused-but-managed-under-memcg SwapCache can be made in some paths,
for example trylock_page() failure in free_swap_cache().
Signed-off-by: Daisuke Nishimura <nishimura@....nes.nec.co.jp>
---
mm/vmscan.c | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 2ddcfc8..d9a3f54 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -640,6 +640,25 @@ static unsigned long shrink_page_list(struct list_head *page_list,
referenced && page_mapping_inuse(page))
goto activate_locked;
+ if (!sc->may_swap && PageSwapBacked(page)) {
+ /* SwapCache has already uses swap entry */
+ if (!PageSwapCache(page))
+ goto keep_locked;
+ /*
+ * From the view point of memcg, may_swap is false when
+ * memsw.usage hits the limit.
+ * But swaping out SwapCache to disk doesn't reduce the
+ * memsw.usage, so it is a waste of time.
+ * Call try_to_free_swap() if the page isn't used,
+ * because it can reduce both mem.usage and memsw.usage.
+ */
+ if (!scanning_global_lru(sc)) {
+ if (!page_mapped(page))
+ try_to_free_swap(page);
+ goto keep_locked;
+ }
+ }
+
/*
* Anonymous process memory has backing store?
* Try to allocate it some swap space here.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists