diff options
| author | Rik van Riel <riel@redhat.com> | 2008-10-18 23:26:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 11:50:25 -0400 |
| commit | 4f98a2fee8acdb4ac84545df98cccecfd130f8db (patch) | |
| tree | 035a2937f4c3e2f7b4269412041c073ac646937c /drivers | |
| parent | b2e185384f534781fd22f5ce170b2ad26f97df70 (diff) | |
vmscan: split LRU lists into anon & file sets
Split the LRU lists in two, one set for pages that are backed by real file
systems ("file") and one for pages that are backed by memory and swap
("anon"). The latter includes tmpfs.
The advantage of doing this is that the VM will not have to scan over lots
of anonymous pages (which we generally do not want to swap out), just to
find the page cache pages that it should evict.
This patch has the infrastructure and a basic policy to balance how much
we scan the anon lists and how much we scan the file lists. The big
policy changes are in separate patches.
[lee.schermerhorn@hp.com: collect lru meminfo statistics from correct offset]
[kosaki.motohiro@jp.fujitsu.com: prevent incorrect oom under split_lru]
[kosaki.motohiro@jp.fujitsu.com: fix pagevec_move_tail() doesn't treat unevictable page]
[hugh@veritas.com: memcg swapbacked pages active]
[hugh@veritas.com: splitlru: BDI_CAP_SWAP_BACKED]
[akpm@linux-foundation.org: fix /proc/vmstat units]
[nishimura@mxp.nes.nec.co.jp: memcg: fix handling of shmem migration]
[kosaki.motohiro@jp.fujitsu.com: adjust Quicklists field of /proc/meminfo]
[kosaki.motohiro@jp.fujitsu.com: fix style issue of get_scan_ratio()]
Signed-off-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/node.c | 56 |
1 files changed, 33 insertions, 23 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c index 5116b78c6325..fc7e9bf0cdbc 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c | |||
| @@ -61,34 +61,44 @@ static ssize_t node_read_meminfo(struct sys_device * dev, | |||
| 61 | si_meminfo_node(&i, nid); | 61 | si_meminfo_node(&i, nid); |
| 62 | 62 | ||
| 63 | n = sprintf(buf, "\n" | 63 | n = sprintf(buf, "\n" |
| 64 | "Node %d MemTotal: %8lu kB\n" | 64 | "Node %d MemTotal: %8lu kB\n" |
| 65 | "Node %d MemFree: %8lu kB\n" | 65 | "Node %d MemFree: %8lu kB\n" |
| 66 | "Node %d MemUsed: %8lu kB\n" | 66 | "Node %d MemUsed: %8lu kB\n" |
| 67 | "Node %d Active: %8lu kB\n" | 67 | "Node %d Active: %8lu kB\n" |
| 68 | "Node %d Inactive: %8lu kB\n" | 68 | "Node %d Inactive: %8lu kB\n" |
| 69 | "Node %d Active(anon): %8lu kB\n" | ||
| 70 | "Node %d Inactive(anon): %8lu kB\n" | ||
| 71 | "Node %d Active(file): %8lu kB\n" | ||
| 72 | "Node %d Inactive(file): %8lu kB\n" | ||
| 69 | #ifdef CONFIG_HIGHMEM | 73 | #ifdef CONFIG_HIGHMEM |
| 70 | "Node %d HighTotal: %8lu kB\n" | 74 | "Node %d HighTotal: %8lu kB\n" |
| 71 | "Node %d HighFree: %8lu kB\n" | 75 | "Node %d HighFree: %8lu kB\n" |
| 72 | "Node %d LowTotal: %8lu kB\n" | 76 | "Node %d LowTotal: %8lu kB\n" |
| 73 | "Node %d LowFree: %8lu kB\n" | 77 | "Node %d LowFree: %8lu kB\n" |
| 74 | #endif | 78 | #endif |
| 75 | "Node %d Dirty: %8lu kB\n" | 79 | "Node %d Dirty: %8lu kB\n" |
| 76 | "Node %d Writeback: %8lu kB\n" | 80 | "Node %d Writeback: %8lu kB\n" |
| 77 | "Node %d FilePages: %8lu kB\n" | 81 | "Node %d FilePages: %8lu kB\n" |
| 78 | "Node %d Mapped: %8lu kB\n" | 82 | "Node %d Mapped: %8lu kB\n" |
| 79 | "Node %d AnonPages: %8lu kB\n" | 83 | "Node %d AnonPages: %8lu kB\n" |
| 80 | "Node %d PageTables: %8lu kB\n" | 84 | "Node %d PageTables: %8lu kB\n" |
| 81 | "Node %d NFS_Unstable: %8lu kB\n" | 85 | "Node %d NFS_Unstable: %8lu kB\n" |
| 82 | "Node %d Bounce: %8lu kB\n" | 86 | "Node %d Bounce: %8lu kB\n" |
| 83 | "Node %d WritebackTmp: %8lu kB\n" | 87 | "Node %d WritebackTmp: %8lu kB\n" |
| 84 | "Node %d Slab: %8lu kB\n" | 88 | "Node %d Slab: %8lu kB\n" |
| 85 | "Node %d SReclaimable: %8lu kB\n" | 89 | "Node %d SReclaimable: %8lu kB\n" |
| 86 | "Node %d SUnreclaim: %8lu kB\n", | 90 | "Node %d SUnreclaim: %8lu kB\n", |
| 87 | nid, K(i.totalram), | 91 | nid, K(i.totalram), |
| 88 | nid, K(i.freeram), | 92 | nid, K(i.freeram), |
| 89 | nid, K(i.totalram - i.freeram), | 93 | nid, K(i.totalram - i.freeram), |
| 90 | nid, K(node_page_state(nid, NR_ACTIVE)), | 94 | nid, K(node_page_state(nid, NR_ACTIVE_ANON) + |
| 91 | nid, K(node_page_state(nid, NR_INACTIVE)), | 95 | node_page_state(nid, NR_ACTIVE_FILE)), |
| 96 | nid, K(node_page_state(nid, NR_INACTIVE_ANON) + | ||
| 97 | node_page_state(nid, NR_INACTIVE_FILE)), | ||
| 98 | nid, K(node_page_state(nid, NR_ACTIVE_ANON)), | ||
| 99 | nid, K(node_page_state(nid, NR_INACTIVE_ANON)), | ||
| 100 | nid, K(node_page_state(nid, NR_ACTIVE_FILE)), | ||
| 101 | nid, K(node_page_state(nid, NR_INACTIVE_FILE)), | ||
| 92 | #ifdef CONFIG_HIGHMEM | 102 | #ifdef CONFIG_HIGHMEM |
| 93 | nid, K(i.totalhigh), | 103 | nid, K(i.totalhigh), |
| 94 | nid, K(i.freehigh), | 104 | nid, K(i.freehigh), |