KOSAKI Motohiro 2e2e425989 vmscan,memcg: reintroduce sc->may_swap ...

Commit a6dc60f8975ad96d162915e07703a4439c80dcf0 ("vmscan: rename
sc.may_swap to may_unmap") removed the may_swap flag, but memcg had used
it as a flag for "we need to use swap?", as the name indicate.

And in the current implementation, memcg cannot reclaim mapped file
caches when mem+swap hits the limit.

re-introduce may_swap flag and handle it at get_scan_ratio().  This
patch doesn't influence any scan_control users other than memcg.

Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2009-04-21 13:41:51 -07:00

..

allocpercpu.c

percpu: __percpu_depopulate_mask can take a const mask

2009-04-06 13:44:15 -07:00

backing-dev.c

block: change the request allocation/congestion logic to be sync/async based

2009-04-06 08:04:53 -07:00

bootmem.c

…

bounce.c

…

debug-pagealloc.c

generic debug pagealloc

2009-04-01 08:59:13 -07:00

dmapool.c

…

fadvise.c

…

failslab.c

kmemtrace, mm: fix slab.h dependency problem in mm/failslab.c

2009-04-03 12:23:01 +02:00

filemap_xip.c

mm: do_xip_mapping_read: fix length calculation

2009-04-02 19:04:49 -07:00

filemap.c

Export filemap_write_and_wait_range

2009-04-16 07:47:49 -07:00

fremap.c

…

highmem.c

mm: introduce debug_kmap_atomic

2009-04-01 08:59:14 -07:00

hugetlb.c

hugetlb: chg cannot become less than 0

2009-04-01 08:59:13 -07:00

internal.h

nommu: there is no mlock() for NOMMU, so don't provide the bits

2009-04-01 08:59:14 -07:00

Kconfig

mm: point the UNEVICTABLE_LRU config option at the documentation

2009-04-13 15:04:31 -07:00

Kconfig.debug

generic debug pagealloc: build fix

2009-04-02 19:04:48 -07:00

maccess.c

…

madvise.c

…

Makefile

generic debug pagealloc

2009-04-01 08:59:13 -07:00

memcontrol.c

memcg: remove warning when CONFIG_DEBUG_VM=n

2009-04-13 15:04:32 -07:00

memory_hotplug.c

…

memory.c

mm: page_mkwrite change prototype to match fault

2009-04-01 08:59:14 -07:00

mempolicy.c

…

mempool.c

…

migrate.c

FS-Cache: Recruit a page flags for cache management

2009-04-03 16:42:36 +01:00

mincore.c

…

mlock.c

…

mm_init.c

…

mmap.c

mm: pass correct mm when growing stack

2009-04-16 14:41:25 -07:00

mmu_notifier.c

…

mmzone.c

…

mprotect.c

…

mremap.c

…

msync.c

…

nommu.c

nommu: fix a number of issues with the per-MM VMA patch

2009-04-02 19:04:48 -07:00

oom_kill.c

memcg: show memcg information during OOM

2009-04-02 19:04:55 -07:00

page_alloc.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask

2009-04-05 10:33:07 -07:00

page_cgroup.c

memcg: remove redundant message at swapon

2009-04-02 19:04:56 -07:00

page_io.c

…

page_isolation.c

…

page-writeback.c

mm: fix proc_dointvec_userhz_jiffies "breakage"

2009-04-01 08:59:13 -07:00

pagewalk.c

…

pdflush.c

mm: add /proc controls for pdflush threads

2009-04-07 08:31:03 -07:00

percpu.c

percpu: generalize embedding first chunk setup helper

2009-03-10 16:27:48 +09:00

prio_tree.c

…

quicklist.c

cpumask: replace node_to_cpumask with cpumask_of_node.

2009-03-13 14:49:46 +10:30

readahead.c

FS-Cache: Recruit a page flags for cache management

2009-04-03 16:42:36 +01:00

rmap.c

…

shmem_acl.c

…

shmem.c

shmem: respect MAX_LFS_FILESIZE

2009-04-13 15:04:33 -07:00

slab.c

Merge branch 'kmemtrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-04-06 13:30:00 -07:00

slob.c

kmemtrace: trace kfree() calls with NULL or zero-length objects

2009-04-03 12:23:10 +02:00

slub.c

kmemtrace: trace kfree() calls with NULL or zero-length objects

2009-04-03 12:23:10 +02:00

sparse-vmemmap.c

…

sparse.c

mm: mminit_validate_memmodel_limits(): remove redundant test

2009-04-01 08:59:11 -07:00

swap_state.c

…

swap.c

FS-Cache: Recruit a page flags for cache management

2009-04-03 16:42:36 +01:00

swapfile.c

…

thrash.c

…

truncate.c

FS-Cache: Recruit a page flags for cache management

2009-04-03 16:42:36 +01:00

util.c

mm: document get_user_pages_fast()

2009-04-13 15:04:32 -07:00

vmalloc.c

vmap: remove needless lock and list in vmap

2009-04-01 08:59:11 -07:00

vmscan.c

vmscan,memcg: reintroduce sc->may_swap

2009-04-21 13:41:51 -07:00

vmstat.c

mm: align vmstat_work's timer

2009-04-02 19:04:48 -07:00