From: Johannes Weiner <hannes@cmpxchg.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>,
Mel Gorman <mel@csn.ul.ie>,
linux-mm@kvack.org
Subject: [patch 2/5] vmscan: remove may_unmap scan control
Date: Sat, 1 May 2010 01:05:30 +0200 [thread overview]
Message-ID: <20100430224315.978273568@cmpxchg.org> (raw)
In-Reply-To: <20100430222009.379195565@cmpxchg.org>
[-- Attachment #1: vmscan-remove-may_unmap-scan-control.patch --]
[-- Type: text/plain, Size: 2611 bytes --]
Every reclaim entry function sets this to the same value.
Make it default behaviour and remove the knob.
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
---
mm/vmscan.c | 12 ------------
1 file changed, 12 deletions(-)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -65,9 +65,6 @@ struct scan_control {
int may_writepage;
- /* Can mapped pages be reclaimed? */
- int may_unmap;
-
/* Can pages be swapped as part of reclaim? */
int may_swap;
@@ -655,9 +652,6 @@ static unsigned long shrink_page_list(st
if (unlikely(!page_evictable(page, NULL)))
goto cull_mlocked;
- if (!sc->may_unmap && page_mapped(page))
- goto keep_locked;
-
/* Double the slab pressure for mapped and swapcache pages */
if (page_mapped(page) || PageSwapCache(page))
sc->nr_scanned++;
@@ -1868,7 +1862,6 @@ unsigned long try_to_free_pages(struct z
.gfp_mask = gfp_mask,
.may_writepage = !laptop_mode,
.nr_to_reclaim = SWAP_CLUSTER_MAX,
- .may_unmap = 1,
.may_swap = 1,
.swappiness = vm_swappiness,
.order = order,
@@ -1889,7 +1882,6 @@ unsigned long mem_cgroup_shrink_node_zon
{
struct scan_control sc = {
.may_writepage = !laptop_mode,
- .may_unmap = 1,
.may_swap = !noswap,
.swappiness = swappiness,
.order = 0,
@@ -1922,7 +1914,6 @@ unsigned long try_to_free_mem_cgroup_pag
struct zonelist *zonelist;
struct scan_control sc = {
.may_writepage = !laptop_mode,
- .may_unmap = 1,
.may_swap = !noswap,
.nr_to_reclaim = SWAP_CLUSTER_MAX,
.swappiness = swappiness,
@@ -1996,7 +1987,6 @@ static unsigned long balance_pgdat(pg_da
struct reclaim_state *reclaim_state = current->reclaim_state;
struct scan_control sc = {
.gfp_mask = GFP_KERNEL,
- .may_unmap = 1,
.may_swap = 1,
/*
* kswapd doesn't want to be bailed out while reclaim. because
@@ -2379,7 +2369,6 @@ unsigned long shrink_all_memory(unsigned
struct scan_control sc = {
.gfp_mask = GFP_HIGHUSER_MOVABLE,
.may_swap = 1,
- .may_unmap = 1,
.may_writepage = 1,
.nr_to_reclaim = nr_to_reclaim,
.hibernation_mode = 1,
@@ -2563,7 +2552,6 @@ static int __zone_reclaim(struct zone *z
int priority;
struct scan_control sc = {
.may_writepage = !!(zone_reclaim_mode & RECLAIM_WRITE),
- .may_unmap = 1,
.may_swap = !!(zone_reclaim_mode & RECLAIM_SWAP),
.nr_to_reclaim = max_t(unsigned long, nr_pages,
SWAP_CLUSTER_MAX),
--
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:[~2010-04-30 23:06 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-30 23:05 [patch 0/5] vmscan: cut down on struct scan_control Johannes Weiner
2010-04-30 23:05 ` [patch 1/5] vmscan: fix unmapping behaviour for RECLAIM_SWAP Johannes Weiner
2010-05-13 3:02 ` KOSAKI Motohiro
2010-05-19 21:32 ` Johannes Weiner
2010-04-30 23:05 ` Johannes Weiner [this message]
2010-04-30 23:05 ` [patch 3/5] vmscan: remove all_unreclaimable scan control Johannes Weiner
2010-05-13 3:25 ` KOSAKI Motohiro
2010-05-19 21:34 ` Johannes Weiner
2010-05-31 18:32 ` Greg Thelen
2010-06-01 3:29 ` [PATCH] vmscan: Fix do_try_to_free_pages() return value when priority==0 reclaim failure KOSAKI Motohiro
2010-06-01 6:48 ` KAMEZAWA Hiroyuki
2010-06-01 8:10 ` Balbir Singh
2010-06-02 0:33 ` KAMEZAWA Hiroyuki
2010-06-01 14:50 ` Greg Thelen
2010-06-04 14:32 ` Johannes Weiner
2010-04-30 23:05 ` [patch 4/5] vmscan: remove isolate_pages callback scan control Johannes Weiner
2010-05-13 3:29 ` KOSAKI Motohiro
2010-05-19 21:42 ` Johannes Weiner
2010-05-20 23:23 ` KOSAKI Motohiro
2010-04-30 23:05 ` [patch 5/5] vmscan: remove may_swap " Johannes Weiner
2010-05-13 3:36 ` KOSAKI Motohiro
2010-05-19 21:44 ` Johannes Weiner
2010-05-21 0:15 ` KOSAKI Motohiro
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=20100430224315.978273568@cmpxchg.org \
--to=hannes@cmpxchg.org \
--cc=akpm@linux-foundation.org \
--cc=kosaki.motohiro@jp.fujitsu.com \
--cc=linux-mm@kvack.org \
--cc=mel@csn.ul.ie \
/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