From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756533Ab0LERaQ (ORCPT ); Sun, 5 Dec 2010 12:30:16 -0500 Received: from mail-pw0-f46.google.com ([209.85.160.46]:54975 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756496Ab0LERaG (ORCPT ); Sun, 5 Dec 2010 12:30:06 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=ss0NA9Nse+PjDOblbHeBD1dpAx2ppLzIosyN5W6jcNwNoKdRVvJ+vNbjClzg6TBObF UPjB1/UK5HiOxdOv80tJ89XgnFsLhIONjYqCrvS8q4UEBdyXqOb8xo1HLnTS1fuO/7c5 MnFKecooHQ4bWrpVWsL1HwzAtdqo7+Rgc5uFw= From: Minchan Kim To: Andrew Morton Cc: Rik van Riel , KOSAKI Motohiro , linux-mm , LKML , Minchan Kim , Balbir Singh , KAMEZAWA Hiroyuki Subject: [PATCH v4 3/7] move memcg reclaimable page into tail of inactive list Date: Mon, 6 Dec 2010 02:29:11 +0900 Message-Id: X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Golbal page reclaim moves reclaimalbe pages into inactive list to reclaim asap. This patch apply the rule in memcg. It can help to prevent unnecessary working page eviction of memcg. Cc: Balbir Singh Cc: KAMEZAWA Hiroyuki Cc: Rik van Riel Cc: KOSAKI Motohiro Signed-off-by: Minchan Kim --- include/linux/memcontrol.h | 6 ++++++ mm/memcontrol.c | 27 +++++++++++++++++++++++++++ mm/swap.c | 3 ++- 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 067115c..8317f5c 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -62,6 +62,7 @@ extern int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm, gfp_t gfp_mask); extern void mem_cgroup_add_lru_list(struct page *page, enum lru_list lru); extern void mem_cgroup_del_lru_list(struct page *page, enum lru_list lru); +extern void mem_cgroup_rotate_reclaimable_page(struct page *page); extern void mem_cgroup_rotate_lru_list(struct page *page, enum lru_list lru); extern void mem_cgroup_del_lru(struct page *page); extern void mem_cgroup_move_lists(struct page *page, @@ -207,6 +208,11 @@ static inline void mem_cgroup_del_lru_list(struct page *page, int lru) return ; } +static inline inline void mem_cgroup_rotate_reclaimable_page(struct page *page) +{ + return ; +} + static inline void mem_cgroup_rotate_lru_list(struct page *page, int lru) { return ; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 729beb7..f9435be 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -829,6 +829,33 @@ void mem_cgroup_del_lru(struct page *page) mem_cgroup_del_lru_list(page, page_lru(page)); } +/* + * Writeback is about to end against a page which has been marked for immediate + * reclaim. If it still appears to be reclaimable, move it to the tail of the + * inactive list. + */ +void mem_cgroup_rotate_reclaimable_page(struct page *page) +{ + struct mem_cgroup_per_zone *mz; + struct page_cgroup *pc; + enum lru_list lru = page_lru_base_type(page); + + if (mem_cgroup_disabled()) + return; + + pc = lookup_page_cgroup(page); + /* + * Used bit is set without atomic ops but after smp_wmb(). + * For making pc->mem_cgroup visible, insert smp_rmb() here. + */ + smp_rmb(); + /* unused or root page is not rotated. */ + if (!PageCgroupUsed(pc) || mem_cgroup_is_root(pc->mem_cgroup)) + return; + mz = page_cgroup_zoneinfo(pc); + list_move_tail(&pc->lru, &mz->lists[lru]); +} + void mem_cgroup_rotate_lru_list(struct page *page, enum lru_list lru) { struct mem_cgroup_per_zone *mz; diff --git a/mm/swap.c b/mm/swap.c index 1f36f6f..0fe98e7 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -122,8 +122,9 @@ static void pagevec_move_tail(struct pagevec *pvec) } if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) { - int lru = page_lru_base_type(page); + enum lru_list lru = page_lru_base_type(page); list_move_tail(&page->lru, &zone->lru[lru].list); + mem_cgroup_rotate_reclaimable_page(page); pgmoved++; } } -- 1.7.0.4