Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754911Ab1FPD7W (ORCPT ); Wed, 15 Jun 2011 23:59:22 -0400 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:37579 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754793Ab1FPD7U (ORCPT ); Wed, 15 Jun 2011 23:59:20 -0400 X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 Date: Thu, 16 Jun 2011 12:52:22 +0900 From: KAMEZAWA Hiroyuki To: KAMEZAWA Hiroyuki Cc: "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , "akpm@linux-foundation.org" , "nishimura@mxp.nes.nec.co.jp" , "bsingharora@gmail.com" , Ying Han , Michal Hocko , "hannes@cmpxchg.org" Subject: [PATCH 2/7] export memory cgroup's swappines by mem_cgroup_swappiness() Message-Id: <20110616125222.71bcdff3.kamezawa.hiroyu@jp.fujitsu.com> In-Reply-To: <20110616124730.d6960b8b.kamezawa.hiroyu@jp.fujitsu.com> References: <20110616124730.d6960b8b.kamezawa.hiroyu@jp.fujitsu.com> Organization: FUJITSU Co. LTD. X-Mailer: Sylpheed 3.1.1 (GTK+ 2.10.14; i686-pc-mingw32) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5936 Lines: 157 >From 6f9c40172947fb92ab0ea6f7d73d577473879636 Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki Date: Wed, 15 Jun 2011 12:06:31 +0900 Subject: [PATCH 2/7] export memory cgroup's swappines by mem_cgroup_swappiness() Each memory cgroup has 'swappiness' value and it can be accessed by get_swappiness(memcg). The major user is try_to_free_mem_cgroup_pages() and swappiness is passed by argument. It's now static function but some planned updates will need to get swappiness from files other than memcontrol.c This patch exports get_swappiness() as mem_cgroup_swappiness(). By this, we can remove the argument of swapiness from try_to_fre... I think this makes sense because passed swapiness is always from memory cgroup passed as an argument and this duplication of argument is not very good. Signed-off-by: KAMEZAWA Hiroyuki --- include/linux/memcontrol.h | 1 + include/linux/swap.h | 4 +--- mm/memcontrol.c | 14 ++++++-------- mm/vmscan.c | 8 +++----- 4 files changed, 11 insertions(+), 16 deletions(-) Index: mmotm-0615/include/linux/memcontrol.h =================================================================== --- mmotm-0615.orig/include/linux/memcontrol.h +++ mmotm-0615/include/linux/memcontrol.h @@ -110,6 +110,7 @@ extern void mem_cgroup_end_migration(str int mem_cgroup_inactive_anon_is_low(struct mem_cgroup *memcg); int mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg); int mem_cgroup_select_victim_node(struct mem_cgroup *memcg); +unsigned int mem_cgroup_swappiness(struct mem_cgroup *memcg); unsigned long mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg, struct zone *zone, enum lru_list lru); Index: mmotm-0615/include/linux/swap.h =================================================================== --- mmotm-0615.orig/include/linux/swap.h +++ mmotm-0615/include/linux/swap.h @@ -254,11 +254,9 @@ static inline void lru_cache_add_file(st extern unsigned long try_to_free_pages(struct zonelist *zonelist, int order, gfp_t gfp_mask, nodemask_t *mask); extern unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem, - gfp_t gfp_mask, bool noswap, - unsigned int swappiness); + gfp_t gfp_mask, bool noswap); extern unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem, gfp_t gfp_mask, bool noswap, - unsigned int swappiness, struct zone *zone, unsigned long *nr_scanned); extern int __isolate_lru_page(struct page *page, int mode, int file); Index: mmotm-0615/mm/memcontrol.c =================================================================== --- mmotm-0615.orig/mm/memcontrol.c +++ mmotm-0615/mm/memcontrol.c @@ -1325,7 +1325,7 @@ static unsigned long mem_cgroup_margin(s return margin >> PAGE_SHIFT; } -static unsigned int get_swappiness(struct mem_cgroup *memcg) +unsigned int mem_cgroup_swappiness(struct mem_cgroup *memcg) { struct cgroup *cgrp = memcg->css.cgroup; @@ -1698,12 +1698,11 @@ again: /* we use swappiness of local cgroup */ if (check_soft) { ret = mem_cgroup_shrink_node_zone(victim, gfp_mask, - noswap, get_swappiness(victim), zone, - &nr_scanned); + noswap, zone, &nr_scanned); *total_scanned += nr_scanned; } else ret = try_to_free_mem_cgroup_pages(victim, gfp_mask, - noswap, get_swappiness(victim)); + noswap); css_put(&victim->css); total += ret; @@ -3758,8 +3757,7 @@ try_to_free: ret = -EINTR; goto out; } - progress = try_to_free_mem_cgroup_pages(mem, GFP_KERNEL, - false, get_swappiness(mem)); + progress = try_to_free_mem_cgroup_pages(mem, GFP_KERNEL, false); if (!progress) { nr_retries--; /* maybe some writeback is necessary */ @@ -4221,7 +4219,7 @@ static u64 mem_cgroup_swappiness_read(st { struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp); - return get_swappiness(memcg); + return mem_cgroup_swappiness(memcg); } static int mem_cgroup_swappiness_write(struct cgroup *cgrp, struct cftype *cft, @@ -4930,7 +4928,7 @@ mem_cgroup_create(struct cgroup_subsys * INIT_LIST_HEAD(&mem->oom_notify); if (parent) - mem->swappiness = get_swappiness(parent); + mem->swappiness = mem_cgroup_swappiness(parent); atomic_set(&mem->refcnt, 1); mem->move_charge_at_immigrate = 0; mutex_init(&mem->thresholds_lock); Index: mmotm-0615/mm/vmscan.c =================================================================== --- mmotm-0615.orig/mm/vmscan.c +++ mmotm-0615/mm/vmscan.c @@ -2200,7 +2200,6 @@ unsigned long try_to_free_pages(struct z unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem, gfp_t gfp_mask, bool noswap, - unsigned int swappiness, struct zone *zone, unsigned long *nr_scanned) { @@ -2210,7 +2209,7 @@ unsigned long mem_cgroup_shrink_node_zon .may_writepage = !laptop_mode, .may_unmap = 1, .may_swap = !noswap, - .swappiness = swappiness, + .swappiness = mem_cgroup_swappiness(mem), .order = 0, .mem_cgroup = mem, }; @@ -2239,8 +2238,7 @@ unsigned long mem_cgroup_shrink_node_zon unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem_cont, gfp_t gfp_mask, - bool noswap, - unsigned int swappiness) + bool noswap) { struct zonelist *zonelist; unsigned long nr_reclaimed; @@ -2250,7 +2248,7 @@ unsigned long try_to_free_mem_cgroup_pag .may_unmap = 1, .may_swap = !noswap, .nr_to_reclaim = SWAP_CLUSTER_MAX, - .swappiness = swappiness, + .swappiness = mem_cgroup_swappiness(mem_cont), .order = 0, .mem_cgroup = mem_cont, .nodemask = NULL, /* we don't care the placement */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/