From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
To: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: "linux-mm@kvack.org" <linux-mm@kvack.org>,
"akpm@linux-foundation.org" <akpm@linux-foundation.org>,
"balbir@linux.vnet.ibm.com" <balbir@linux.vnet.ibm.com>,
"nishimura@mxp.nes.nec.co.jp" <nishimura@mxp.nes.nec.co.jp>,
"kosaki.motohiro@jp.fujitsu.com" <kosaki.motohiro@jp.fujitsu.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH 16/21] memcg-rename-scan-glonal-lru.patch
Date: Wed, 3 Dec 2008 14:06:54 +0900 [thread overview]
Message-ID: <20081203140654.ec38be9d.kamezawa.hiroyu@jp.fujitsu.com> (raw)
In-Reply-To: <20081203134718.6b60986f.kamezawa.hiroyu@jp.fujitsu.com>
Rename scan_global_lru() to scanning_global_lru().
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
mm/vmscan.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
Index: mmotm-2.6.28-Dec02/mm/vmscan.c
===================================================================
--- mmotm-2.6.28-Dec02.orig/mm/vmscan.c
+++ mmotm-2.6.28-Dec02/mm/vmscan.c
@@ -126,15 +126,15 @@ static LIST_HEAD(shrinker_list);
static DECLARE_RWSEM(shrinker_rwsem);
#ifdef CONFIG_CGROUP_MEM_RES_CTLR
-#define scan_global_lru(sc) (!(sc)->mem_cgroup)
+#define scanning_global_lru(sc) (!(sc)->mem_cgroup)
#else
-#define scan_global_lru(sc) (1)
+#define scanning_global_lru(sc) (1)
#endif
static struct zone_reclaim_stat *get_reclaim_stat(struct zone *zone,
struct scan_control *sc)
{
- if (!scan_global_lru(sc))
+ if (!scanning_global_lru(sc))
mem_cgroup_get_reclaim_stat(sc->mem_cgroup, zone);
return &zone->reclaim_stat;
@@ -143,7 +143,7 @@ static struct zone_reclaim_stat *get_rec
static unsigned long zone_nr_pages(struct zone *zone, struct scan_control *sc,
enum lru_list lru)
{
- if (!scan_global_lru(sc))
+ if (!scanning_global_lru(sc))
return mem_cgroup_zone_nr_pages(sc->mem_cgroup, zone, lru);
return zone_page_state(zone, NR_LRU_BASE + lru);
@@ -1144,7 +1144,7 @@ static unsigned long shrink_inactive_lis
__mod_zone_page_state(zone, NR_INACTIVE_ANON,
-count[LRU_INACTIVE_ANON]);
- if (scan_global_lru(sc))
+ if (scanning_global_lru(sc))
zone->pages_scanned += nr_scan;
reclaim_stat->recent_scanned[0] += count[LRU_INACTIVE_ANON];
@@ -1183,7 +1183,7 @@ static unsigned long shrink_inactive_lis
if (current_is_kswapd()) {
__count_zone_vm_events(PGSCAN_KSWAPD, zone, nr_scan);
__count_vm_events(KSWAPD_STEAL, nr_freed);
- } else if (scan_global_lru(sc))
+ } else if (scanning_global_lru(sc))
__count_zone_vm_events(PGSCAN_DIRECT, zone, nr_scan);
__count_zone_vm_events(PGSTEAL, zone, nr_freed);
@@ -1282,7 +1282,7 @@ static void shrink_active_list(unsigned
* zone->pages_scanned is used for detect zone's oom
* mem_cgroup remembers nr_scan by itself.
*/
- if (scan_global_lru(sc)) {
+ if (scanning_global_lru(sc)) {
zone->pages_scanned += pgscanned;
}
reclaim_stat->recent_scanned[!!file] += pgmoved;
@@ -1391,7 +1391,7 @@ static int inactive_anon_is_low(struct z
{
int low;
- if (scan_global_lru(sc))
+ if (scanning_global_lru(sc))
low = inactive_anon_is_low_global(zone);
else
low = mem_cgroup_inactive_anon_is_low(sc->mem_cgroup, zone);
@@ -1445,7 +1445,7 @@ static void get_scan_ratio(struct zone *
file = zone_nr_pages(zone, sc, LRU_ACTIVE_FILE) +
zone_nr_pages(zone, sc, LRU_INACTIVE_FILE);
- if (scan_global_lru(sc)) {
+ if (scanning_global_lru(sc)) {
free = zone_page_state(zone, NR_FREE_PAGES);
/* If we have very few page cache pages,
force-scan anon pages. */
@@ -1527,7 +1527,7 @@ static void shrink_zone(int priority, st
scan >>= priority;
scan = (scan * percent[file]) / 100;
}
- if (scan_global_lru(sc)) {
+ if (scanning_global_lru(sc)) {
zone->lru[l].nr_scan += scan;
nr[l] = zone->lru[l].nr_scan;
if (nr[l] >= sc->swap_cluster_max)
@@ -1602,7 +1602,7 @@ static void shrink_zones(int priority, s
* Take care memory controller reclaiming has small influence
* to global LRU.
*/
- if (scan_global_lru(sc)) {
+ if (scanning_global_lru(sc)) {
if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
continue;
note_zone_scanning_priority(zone, priority);
@@ -1655,12 +1655,12 @@ static unsigned long do_try_to_free_page
delayacct_freepages_start();
- if (scan_global_lru(sc))
+ if (scanning_global_lru(sc))
count_vm_event(ALLOCSTALL);
/*
* mem_cgroup will not do shrink_slab.
*/
- if (scan_global_lru(sc)) {
+ if (scanning_global_lru(sc)) {
for_each_zone_zonelist(zone, z, zonelist, high_zoneidx) {
if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
@@ -1679,7 +1679,7 @@ static unsigned long do_try_to_free_page
* Don't shrink slabs when reclaiming memory from
* over limit cgroups
*/
- if (scan_global_lru(sc)) {
+ if (scanning_global_lru(sc)) {
shrink_slab(sc->nr_scanned, sc->gfp_mask, lru_pages, NULL);
if (reclaim_state) {
sc->nr_reclaimed += reclaim_state->reclaimed_slab;
@@ -1710,7 +1710,7 @@ static unsigned long do_try_to_free_page
congestion_wait(WRITE, HZ/10);
}
/* top priority shrink_zones still had more to do? don't OOM, then */
- if (!sc->all_unreclaimable && scan_global_lru(sc))
+ if (!sc->all_unreclaimable && scanning_global_lru(sc))
ret = sc->nr_reclaimed;
out:
/*
@@ -1723,7 +1723,7 @@ out:
if (priority < 0)
priority = 0;
- if (scan_global_lru(sc)) {
+ if (scanning_global_lru(sc)) {
for_each_zone_zonelist(zone, z, zonelist, high_zoneidx) {
if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2008-12-03 5:07 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-03 4:47 [PATCH 0/21] memcg updates 2008/12/03 KAMEZAWA Hiroyuki
2008-12-03 4:48 ` [PATCH 1/21] memcg-revert-gfp-mask-fix.patch KAMEZAWA Hiroyuki
2008-12-03 4:50 ` [PATCH 2/21] memcg-check-group-leader-fix.patch KAMEZAWA Hiroyuki
2008-12-03 4:51 ` [PATCH 3/21] memcg-memoryswap-controller-fix-limit-check.patch KAMEZAWA Hiroyuki
2008-12-03 4:52 ` [PATCH 4/21] memcg-swapout-refcnt-fix.patch KAMEZAWA Hiroyuki
2008-12-03 4:53 ` [PATCH 5/21] memcg-hierarchy-avoid-unnecessary-reclaim.patch KAMEZAWA Hiroyuki
2008-12-03 4:54 ` [PATCH 6/21] inactive_anon_is_low-move-to-vmscan.patch KAMEZAWA Hiroyuki
2008-12-03 4:55 ` [PATCH 7/21] introduce-zone_reclaim-struct.patch KAMEZAWA Hiroyuki
2008-12-03 4:55 ` [PATCH 8/21] make-zone-nr_pages-helper-function.patch KAMEZAWA Hiroyuki
2008-12-03 4:57 ` [PATCH 9/21] make-get_scan_ratio-to-memcg-safe.patch KAMEZAWA Hiroyuki
2008-12-03 4:58 ` [PATCH 10/21] memcg-add-null-check-to-page_cgroup_zoneinfo.patch KAMEZAWA Hiroyuki
2008-12-03 5:00 ` [PATCH 11/21] memcg-make-inactive_anon_is_low.patch KAMEZAWA Hiroyuki
2008-12-03 5:01 ` [PATCH 12/21] memcg-make-mem_cgroup_zone_nr_pages.patch KAMEZAWA Hiroyuki
2008-12-03 5:02 ` [PATCH 13/21] memcg-make-zone_reclaim_stat.patch KAMEZAWA Hiroyuki
2008-12-03 5:04 ` [PATCH 14/21] memcg-remove-mem_cgroup_cal_reclaim.patch KAMEZAWA Hiroyuki
2008-12-03 5:05 ` [PATCH 15/21] memcg-show-reclaim-stat.patch KAMEZAWA Hiroyuki
2008-12-03 5:06 ` KAMEZAWA Hiroyuki [this message]
2008-12-03 5:08 ` [PATCH 17/21] memcg_prev_priority_protect.patch KAMEZAWA Hiroyuki
2008-12-03 5:09 ` [PATCH 18/21] memcg-swappiness.patch KAMEZAWA Hiroyuki
2008-12-03 5:11 ` [Experimental][PATCH 19/21] memcg-fix-pre-destroy.patch KAMEZAWA Hiroyuki
2008-12-04 9:34 ` Daisuke Nishimura
2008-12-04 9:43 ` KAMEZAWA Hiroyuki
2008-12-04 9:49 ` KAMEZAWA Hiroyuki
2008-12-04 10:17 ` Daisuke Nishimura
2008-12-03 5:12 ` [Experimental][PATCH 20/21] cgroup_id.patch KAMEZAWA Hiroyuki
2008-12-03 5:14 ` [Experimental][PATCH 21/21] memcg-new-hierarchical-reclaim.patch KAMEZAWA Hiroyuki
2008-12-04 11:00 ` Daisuke Nishimura
2008-12-04 12:44 ` [Experimental][PATCH 21/21]memcg-new-hierarchical-reclaim.patch KAMEZAWA Hiroyuki
2008-12-03 5:15 ` [PATCH 22/21] memcg-explain-details-and-test-document.patch KAMEZAWA Hiroyuki
2008-12-03 5:20 ` [PATCH 0/21] memcg updates 2008/12/03 KAMEZAWA Hiroyuki
2008-12-03 5:56 ` Andrew Morton
2008-12-03 6:17 ` KAMEZAWA Hiroyuki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081203140654.ec38be9d.kamezawa.hiroyu@jp.fujitsu.com \
--to=kamezawa.hiroyu@jp.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=balbir@linux.vnet.ibm.com \
--cc=kosaki.motohiro@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=nishimura@mxp.nes.nec.co.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox