linux-toradex.git/include/linux/memcontrol.h, branch v3.3-rc4

memcg: clear pc->mem_cgroup if necessary.

2012-01-13T04:13:07+00:00

This is a preparation before removing a flag PCG_ACCT_LRU in page_cgroup
and reducing atomic ops/complexity in memcg LRU handling.

In some cases, pages are added to lru before charge to memcg and pages
are not classfied to memory cgroup at lru addtion.  Now, the lru where
the page should be added is determined a bit in page_cgroup->flags and
pc->mem_cgroup.  I'd like to remove the check of flag.

To handle the case pc->mem_cgroup may contain stale pointers if pages
are added to LRU before classification.  This patch resets
pc->mem_cgroup to root_mem_cgroup before lru additions.

[akpm@linux-foundation.org: fix CONFIG_CGROUP_MEM_CONT=n build]
[hughd@google.com: fix CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEM_RES_CTLR_SWAP=n build]
[akpm@linux-foundation.org: ksm.c needs memcontrol.h, per Michal]
[hughd@google.com: stop oops in mem_cgroup_reset_owner()]
[hughd@google.com: fix page migration to reset_owner]
Signed-off-by: KAMEZAWA Hiroyuki 
Cc: Miklos Szeredi 
Acked-by: Michal Hocko 
Cc: Johannes Weiner 
Cc: Ying Han 
Signed-off-by: Hugh Dickins 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mm: unify remaining mem_cont, mem, etc. variable names to memcg

2012-01-13T04:13:06+00:00

Signed-off-by: Johannes Weiner 
Acked-by: David Rientjes 
Acked-by: KAMEZAWA Hiroyuki 
Acked-by: Michal Hocko 
Cc: Balbir Singh 
Cc: Hugh Dickins 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

memcg: make mem_cgroup_split_huge_fixup() more efficient

2012-01-13T04:13:05+00:00

In split_huge_page(), mem_cgroup_split_huge_fixup() is called to handle
page_cgroup modifcations.  It takes move_lock_page_cgroup() and modifies
page_cgroup and LRU accounting jobs and called HPAGE_PMD_SIZE - 1 times.

But thinking again,
  - compound_lock() is held at move_accout...then, it's not necessary
    to take move_lock_page_cgroup().
  - LRU is locked and all tail pages will go into the same LRU as
    head is now on.
  - page_cgroup is contiguous in huge page range.

This patch fixes mem_cgroup_split_huge_fixup() as to be called once per
hugepage and reduce costs for spliting.

[akpm@linux-foundation.org: fix typo, per Michal]
Signed-off-by: KAMEZAWA Hiroyuki 
Cc: Johannes Weiner 
Cc: Andrea Arcangeli 
Reviewed-by: Michal Hocko 
Cc: Balbir Singh 
Cc: David Rientjes 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mm: make per-memcg LRU lists exclusive

2012-01-13T04:13:05+00:00

Now that all code that operated on global per-zone LRU lists is
converted to operate on per-memory cgroup LRU lists instead, there is no
reason to keep the double-LRU scheme around any longer.

The pc->lru member is removed and page->lru is linked directly to the
per-memory cgroup LRU lists, which removes two pointers from a
descriptor that exists for every page frame in the system.

Signed-off-by: Johannes Weiner 
Signed-off-by: Hugh Dickins 
Signed-off-by: Ying Han 
Reviewed-by: KAMEZAWA Hiroyuki 
Reviewed-by: Michal Hocko 
Reviewed-by: Kirill A. Shutemov 
Cc: Daisuke Nishimura 
Cc: Balbir Singh 
Cc: Greg Thelen 
Cc: Michel Lespinasse 
Cc: Rik van Riel 
Cc: Minchan Kim 
Cc: Christoph Hellwig 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mm: move memcg hierarchy reclaim to generic reclaim code

2012-01-13T04:13:05+00:00

Memory cgroup limit reclaim and traditional global pressure reclaim will
soon share the same code to reclaim from a hierarchical tree of memory
cgroups.

In preparation of this, move the two right next to each other in
shrink_zone().

The mem_cgroup_hierarchical_reclaim() polymath is split into a soft
limit reclaim function, which still does hierarchy walking on its own,
and a limit (shrinking) reclaim function, which relies on generic
reclaim code to walk the hierarchy.

Signed-off-by: Johannes Weiner 
Reviewed-by: KAMEZAWA Hiroyuki 
Reviewed-by: Michal Hocko 
Reviewed-by: Kirill A. Shutemov 
Cc: Daisuke Nishimura 
Cc: Balbir Singh 
Cc: Ying Han 
Cc: Greg Thelen 
Cc: Michel Lespinasse 
Cc: Rik van Riel 
Cc: Minchan Kim 
Cc: Christoph Hellwig 
Cc: Hugh Dickins 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

memcg: add mem_cgroup_replace_page_cache() to fix LRU issue

2012-01-13T04:13:04+00:00

Commit ef6a3c6311 ("mm: add replace_page_cache_page() function") added a
function replace_page_cache_page().  This function replaces a page in the
radix-tree with a new page.  WHen doing this, memory cgroup needs to fix
up the accounting information.  memcg need to check PCG_USED bit etc.

In some(many?) cases, 'newpage' is on LRU before calling
replace_page_cache().  So, memcg's LRU accounting information should be
fixed, too.

This patch adds mem_cgroup_replace_page_cache() and removes the old hooks.
 In that function, old pages will be unaccounted without touching
res_counter and new page will be accounted to the memcg (of old page).
WHen overwriting pc->mem_cgroup of newpage, take zone->lru_lock and avoid
races with LRU handling.

Background:
  replace_page_cache_page() is called by FUSE code in its splice() handling.
  Here, 'newpage' is replacing oldpage but this newpage is not a newly allocated
  page and may be on LRU. LRU mis-accounting will be critical for memory cgroup
  because rmdir() checks the whole LRU is empty and there is no account leak.
  If a page is on the other LRU than it should be, rmdir() will fail.

This bug was added in March 2011, but no bug report yet.  I guess there
are not many people who use memcg and FUSE at the same time with upstream
kernels.

The result of this bug is that admin cannot destroy a memcg because of
account leak.  So, no panic, no deadlock.  And, even if an active cgroup
exist, umount can succseed.  So no problem at shutdown.

Signed-off-by: KAMEZAWA Hiroyuki 
Acked-by: Johannes Weiner 
Acked-by: Michal Hocko 
Cc: Miklos Szeredi 
Cc: Hugh Dickins 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

net: Fix build with INET disabled.

2012-01-09T21:44:23+00:00

> net/core/sock.c: In function 'sk_update_clone':
> net/core/sock.c:1278:3: error: implicit declaration of function 'sock_update_memcg'

Reported-by: Randy Dunlap 
Signed-off-by: David S. Miller

Move limit definitions outside CONFIG_INET

2011-12-15T16:59:44+00:00

They need to be available for other protocols as well, since
they are used in sock.c openly

Signed-off-by: Glauber Costa 
CC: Hiroyouki Kamezawa 
CC: David S. Miller 
CC: Eric Dumazet 
CC: Stephen Rothwell 
Signed-off-by: David S. Miller

tcp memory pressure controls

2011-12-13T00:04:10+00:00

This patch introduces memory pressure controls for the tcp
protocol. It uses the generic socket memory pressure code
introduced in earlier patches, and fills in the
necessary data in cg_proto struct.

Signed-off-by: Glauber Costa 
Reviewed-by: KAMEZAWA Hiroyuki 
CC: Eric W. Biederman 
Signed-off-by: David S. Miller

socket: initial cgroup code.

2011-12-13T00:04:10+00:00

The goal of this work is to move the memory pressure tcp
controls to a cgroup, instead of just relying on global
conditions.

To avoid excessive overhead in the network fast paths,
the code that accounts allocated memory to a cgroup is
hidden inside a static_branch(). This branch is patched out
until the first non-root cgroup is created. So when nobody
is using cgroups, even if it is mounted, no significant performance
penalty should be seen.

This patch handles the generic part of the code, and has nothing
tcp-specific.

Signed-off-by: Glauber Costa 
Reviewed-by: KAMEZAWA Hiroyuki 
CC: Kirill A. Shutemov 
CC: David S. Miller 
CC: Eric W. Biederman 
CC: Eric Dumazet 
Signed-off-by: David S. Miller