linux-stable.git/include/linux/memcontrol.h, branch linux-2.6.29.y

memcg: fix shmem's swap accounting

2009-01-08T16:31:10+00:00

Now, you can see following even when swap accounting is enabled.

 1. Create Group 01, and 02.
 2. allocate a "file" on tmpfs by a task under 01.
 3. swap out the "file" (by memory pressure)
 4. Read "file" from a task in group 02.
 5. the charge of "file" is moved to group 02.

This is not ideal behavior. This is because SwapCache which was loaded
by read-ahead is not taken into account..

This is a patch to fix shmem's swapcache behavior.
  - remove mem_cgroup_cache_charge_swapin().
  - Add SwapCache handler routine to mem_cgroup_cache_charge().
    By this, shmem's file cache is charged at add_to_page_cache()
    with GFP_NOWAIT.
  - pass the page of swapcache to shrink_mem_cgroup.

Signed-off-by: KAMEZAWA Hiroyuki 
Cc: Daisuke Nishimura 
Cc: Balbir Singh 
Cc: Paul Menage 
Cc: Li Zefan 
Cc: Hugh Dickins 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

memcg: remove mem_cgroup_try_charge

2009-01-08T16:31:09+00:00

After previous patch, mem_cgroup_try_charge is not used by anyone, so we
can remove it.

Signed-off-by: Daisuke Nishimura 
Acked-by: KAMEZAWA Hiroyuki 
Cc: Balbir Singh 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

memcg: fix calculation of active_ratio

2009-01-08T16:31:09+00:00

Currently, inactive_ratio of memcg is calculated at setting limit.
because page_alloc.c does so and current implementation is straightforward
porting.

However, memcg introduced hierarchy feature recently.  In hierarchy
restriction, memory limit is not only decided memory.limit_in_bytes of
current cgroup, but also parent limit and sibling memory usage.

Then, The optimal inactive_ratio is changed frequently.  So, everytime
calculation is better.

Tested-by: KAMEZAWA Hiroyuki 
Acked-by: KAMEZAWA Hiroyuki 
Signed-off-by: KOSAKI Motohiro 
Cc: Balbir Singh 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

memcg: remove mem_cgroup_cal_reclaim()

2009-01-08T16:31:08+00:00

Now, get_scan_ratio() return correct value although memcg reclaim.  Then,
mem_cgroup_calc_reclaim() can be removed.

So, memcg reclaim get the same capability of anon/file reclaim balancing
as global reclaim now.

Acked-by: KAMEZAWA Hiroyuki 
Acked-by: Rik van Riel 
Signed-off-by: KOSAKI Motohiro 
Cc: Balbir Singh 
Cc: Daisuke Nishimura 
Cc: Hugh Dickins 
Cc: KOSAKI Motohiro 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

memcg: add zone_reclaim_stat

2009-01-08T16:31:08+00:00

Introduce mem_cgroup_per_zone::reclaim_stat member and its statics
collecting function.

Now, get_scan_ratio() can calculate correct value on memcg reclaim.

[hugh@veritas.com: avoid reclaim_stat oops when disabled]
Acked-by: KAMEZAWA Hiroyuki 
Acked-by: Rik van Riel 
Signed-off-by: KOSAKI Motohiro 
Cc: Balbir Singh 
Cc: Daisuke Nishimura 
Cc: Hugh Dickins 
Cc: KOSAKI Motohiro 
Signed-off-by: Hugh Dickins 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

memcg: add mem_cgroup_zone_nr_pages()

2009-01-08T16:31:08+00:00

Introduce mem_cgroup_zone_nr_pages().  It is called by zone_nr_pages()
helper function.

This patch doesn't have any behavior change.

Acked-by: KAMEZAWA Hiroyuki 
Acked-by: Rik van Riel 
Signed-off-by: KOSAKI Motohiro 
Acked-by: Balbir Singh 
Cc: Daisuke Nishimura 
Cc: Hugh Dickins 
Cc: KOSAKI Motohiro 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

memcg: add inactive_anon_is_low()

2009-01-08T16:31:08+00:00

The inactive_anon_is_low() is key component of active/inactive anon
balancing on reclaim.  However current inactive_anon_is_low() function
only consider global reclaim.

Therefore, we need following ugly scan_global_lru() condition.

	if (lru == LRU_ACTIVE_ANON &&
	    (!scan_global_lru(sc) || inactive_anon_is_low(zone))) {
		shrink_active_list(nr_to_scan, zone, sc, priority, file);
		return 0;

it cause that memcg reclaim always deactivate pages when shrink_list() is
called.  To make mem_cgroup_inactive_anon_is_low() improve active/inactive
anon balancing of memcgroup.

Acked-by: KAMEZAWA Hiroyuki 
Acked-by: Rik van Riel 
Signed-off-by: KOSAKI Motohiro 
Cc: Cyrill Gorcunov 
Cc: "Pekka Enberg" 
Cc: Balbir Singh 
Cc: Daisuke Nishimura 
Cc: Hugh Dickins 
Cc: KOSAKI Motohiro 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

memcg: revert gfp mask fix

2009-01-08T16:31:06+00:00

My patch, memcg-fix-gfp_mask-of-callers-of-charge.patch changed gfp_mask
of callers of charge to be GFP_HIGHUSER_MOVABLE for showing what will
happen at memory reclaim.

But in recent discussion, it's NACKed because it sounds ugly.

This patch is for reverting it and add some clean up to gfp_mask of
callers of charge.  No behavior change but need review before generating
HUNK in deep queue.

This patch also adds explanation to meaning of gfp_mask passed to charge
functions in memcontrol.h.

Signed-off-by: KAMEZAWA Hiroyuki 
Cc: Balbir Singh 
Cc: Daisuke Nishimura 
Cc: Hugh Dickins 
Cc: KOSAKI Motohiro 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

memcg: avoid unnecessary system-wide-oom-killer

2009-01-08T16:31:06+00:00

Current mmtom has new oom function as pagefault_out_of_memory().  It's
added for select bad process rathar than killing current.

When memcg hit limit and calls OOM at page_fault, this handler called and
system-wide-oom handling happens.  (means kernel panics if panic_on_oom is
true....)

To avoid overkill, check memcg's recent behavior before starting
system-wide-oom.

And this patch also fixes to guarantee "don't accnout against process with
TIF_MEMDIE".  This is necessary for smooth OOM.

[akpm@linux-foundation.org: build fix]
Signed-off-by: KAMEZAWA Hiroyuki 
Cc: Li Zefan 
Cc: Balbir Singh 
Cc: Daisuke Nishimura 
Cc: Badari Pulavarty 
Cc: Jan Blunck 
Cc: Hirokazu Takahashi 
Cc: Nick Piggin 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

memcontrol: rcu_read_lock() to protect mm_match_cgroup()

2009-01-08T16:31:06+00:00

mm_match_cgroup() calls cgroup_subsys_state().

We must use rcu_read_lock() to protect cgroup_subsys_state().

Signed-off-by: Lai Jiangshan 
Cc: Paul Menage 
Reviewed-by: KAMEZAWA Hiroyuki 
Cc: Pavel Emelyanov 
Cc: Balbir Singh 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds