mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 00:48:50 +00:00
Code Issues Releases Wiki Activity

memcg: rename config variables

Browse source 
Sanity:

CONFIG_CGROUP_MEM_RES_CTLR -> CONFIG_MEMCG
CONFIG_CGROUP_MEM_RES_CTLR_SWAP -> CONFIG_MEMCG_SWAP
CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED -> CONFIG_MEMCG_SWAP_ENABLED
CONFIG_CGROUP_MEM_RES_CTLR_KMEM -> CONFIG_MEMCG_KMEM

[mhocko@suse.cz: fix missed bits]
Cc: Glauber Costa <glommer@parallels.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: David Rientjes <rientjes@google.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andrew Morton 2012-07-31 16:43:02 -07:00 committed by Linus Torvalds
parent 80934513b2
commit c255a45805
33 changed files with 78 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Documentation/cgroups/memory.txt
View file

@ -187,12 +187,12 @@ the cgroup that brought it in -- this will happen on memory pressure).
But see section 8.2: when moving a task to another cgroup, its pages may But see section 8.2: when moving a task to another cgroup, its pages may
be recharged to the new cgroup, if move_charge_at_immigrate has been chosen. be recharged to the new cgroup, if move_charge_at_immigrate has been chosen.
Exception: If CONFIG_CGROUP_CGROUP_MEM_RES_CTLR_SWAP is not used. Exception: If CONFIG_CGROUP_CGROUP_MEMCG_SWAP is not used.
When you do swapoff and make swapped-out pages of shmem(tmpfs) to When you do swapoff and make swapped-out pages of shmem(tmpfs) to
be backed into memory in force, charges for pages are accounted against the be backed into memory in force, charges for pages are accounted against the
caller of swapoff rather than the users of shmem. caller of swapoff rather than the users of shmem.
2.4 Swap Extension (CONFIG_CGROUP_MEM_RES_CTLR_SWAP) 2.4 Swap Extension (CONFIG_MEMCG_SWAP)
Swap Extension allows you to record charge for swap. A swapped-in page is Swap Extension allows you to record charge for swap. A swapped-in page is
charged back to original page allocator if possible. charged back to original page allocator if possible.
@ -259,7 +259,7 @@ When oom event notifier is registered, event will be delivered.
per-zone-per-cgroup LRU (cgroup's private LRU) is just guarded by per-zone-per-cgroup LRU (cgroup's private LRU) is just guarded by
zone->lru_lock, it has no lock of its own. zone->lru_lock, it has no lock of its own.
2.7 Kernel Memory Extension (CONFIG_CGROUP_MEM_RES_CTLR_KMEM) 2.7 Kernel Memory Extension (CONFIG_MEMCG_KMEM)
With the Kernel memory extension, the Memory Controller is able to limit With the Kernel memory extension, the Memory Controller is able to limit
the amount of kernel memory used by the system. Kernel memory is fundamentally the amount of kernel memory used by the system. Kernel memory is fundamentally
@ -286,8 +286,8 @@ per cgroup, instead of globally.
a. Enable CONFIG_CGROUPS a. Enable CONFIG_CGROUPS
b. Enable CONFIG_RESOURCE_COUNTERS b. Enable CONFIG_RESOURCE_COUNTERS
c. Enable CONFIG_CGROUP_MEM_RES_CTLR c. Enable CONFIG_MEMCG
d. Enable CONFIG_CGROUP_MEM_RES_CTLR_SWAP (to use swap extension) d. Enable CONFIG_MEMCG_SWAP (to use swap extension)
1. Prepare the cgroups (see cgroups.txt, Why are cgroups needed?) 1. Prepare the cgroups (see cgroups.txt, Why are cgroups needed?)
# mount -t tmpfs none /sys/fs/cgroup # mount -t tmpfs none /sys/fs/cgroup

4
arch/powerpc/configs/chroma_defconfig
View file

@ -21,8 +21,8 @@ CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEMCG=y
CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_CGROUP_MEMCG_SWAP=y
CONFIG_NAMESPACES=y CONFIG_NAMESPACES=y
CONFIG_RELAY=y CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y

2
arch/s390/defconfig
View file

@ -13,7 +13,7 @@ CONFIG_CGROUPS=y
CONFIG_CPUSETS=y CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEMCG=y
CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
CONFIG_CGROUP_SCHED=y CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y

2
arch/sh/configs/apsh4ad0a_defconfig
View file

@ -11,7 +11,7 @@ CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEMCG=y
CONFIG_BLK_CGROUP=y CONFIG_BLK_CGROUP=y
CONFIG_NAMESPACES=y CONFIG_NAMESPACES=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y

4
arch/sh/configs/sdk7786_defconfig
View file

@ -18,8 +18,8 @@ CONFIG_CPUSETS=y
# CONFIG_PROC_PID_CPUSET is not set # CONFIG_PROC_PID_CPUSET is not set
CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEMCG=y
CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_CGROUP_MEMCG_SWAP=y
CONFIG_CGROUP_SCHED=y CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y
CONFIG_BLK_CGROUP=y CONFIG_BLK_CGROUP=y

2
arch/sh/configs/se7206_defconfig
View file

@ -11,7 +11,7 @@ CONFIG_CGROUP_DEBUG=y
CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEMCG=y
CONFIG_RELAY=y CONFIG_RELAY=y
CONFIG_NAMESPACES=y CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y CONFIG_UTS_NS=y

2
arch/sh/configs/shx3_defconfig
View file

@ -13,7 +13,7 @@ CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEMCG=y
CONFIG_RELAY=y CONFIG_RELAY=y
CONFIG_NAMESPACES=y CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y CONFIG_UTS_NS=y

4
arch/sh/configs/urquell_defconfig
View file

@ -15,8 +15,8 @@ CONFIG_CPUSETS=y
# CONFIG_PROC_PID_CPUSET is not set # CONFIG_PROC_PID_CPUSET is not set
CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEMCG=y
CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_CGROUP_MEMCG_SWAP=y
CONFIG_CGROUP_SCHED=y CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y

4
arch/tile/configs/tilegx_defconfig
View file

@ -18,8 +18,8 @@ CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEMCG=y
CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_CGROUP_MEMCG_SWAP=y
CONFIG_CGROUP_SCHED=y CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y
CONFIG_BLK_CGROUP=y CONFIG_BLK_CGROUP=y

4
arch/tile/configs/tilepro_defconfig
View file

@ -17,8 +17,8 @@ CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEMCG=y
CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_CGROUP_MEMCG_SWAP=y
CONFIG_CGROUP_SCHED=y CONFIG_CGROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y
CONFIG_BLK_CGROUP=y CONFIG_BLK_CGROUP=y

8
arch/um/defconfig
View file

@ -155,10 +155,10 @@ CONFIG_CPUSETS=y
CONFIG_PROC_PID_CPUSET=y CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y CONFIG_RESOURCE_COUNTERS=y
CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEMCG=y
CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y CONFIG_CGROUP_MEMCG_SWAP=y
# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set # CONFIG_CGROUP_MEMCG_SWAP_ENABLED is not set
# CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set # CONFIG_CGROUP_MEMCG_KMEM is not set
CONFIG_CGROUP_SCHED=y CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y
# CONFIG_CFS_BANDWIDTH is not set # CONFIG_CFS_BANDWIDTH is not set

2
include/linux/cgroup_subsys.h
View file

@ -31,7 +31,7 @@ SUBSYS(cpuacct)
/* */ /* */
#ifdef CONFIG_CGROUP_MEM_RES_CTLR #ifdef CONFIG_MEMCG
SUBSYS(mem_cgroup) SUBSYS(mem_cgroup)
#endif #endif

14
include/linux/memcontrol.h
View file

@ -38,7 +38,7 @@ struct mem_cgroup_reclaim_cookie {
unsigned int generation; unsigned int generation;
}; };
#ifdef CONFIG_CGROUP_MEM_RES_CTLR #ifdef CONFIG_MEMCG
/* /*
* All "charge" functions with gfp_mask should use GFP_KERNEL or * All "charge" functions with gfp_mask should use GFP_KERNEL or
* (gfp_mask & GFP_RECLAIM_MASK). In current implementatin, memcg doesn't * (gfp_mask & GFP_RECLAIM_MASK). In current implementatin, memcg doesn't
@ -124,7 +124,7 @@ extern void mem_cgroup_print_oom_info(struct mem_cgroup *memcg,
extern void mem_cgroup_replace_page_cache(struct page *oldpage, extern void mem_cgroup_replace_page_cache(struct page *oldpage,
struct page *newpage); struct page *newpage);
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP #ifdef CONFIG_MEMCG_SWAP
extern int do_swap_account; extern int do_swap_account;
#endif #endif
@ -193,7 +193,7 @@ void mem_cgroup_split_huge_fixup(struct page *head);
bool mem_cgroup_bad_page_check(struct page *page); bool mem_cgroup_bad_page_check(struct page *page);
void mem_cgroup_print_bad_page(struct page *page); void mem_cgroup_print_bad_page(struct page *page);
#endif #endif
#else /* CONFIG_CGROUP_MEM_RES_CTLR */ #else /* CONFIG_MEMCG */
struct mem_cgroup; struct mem_cgroup;
static inline int mem_cgroup_newpage_charge(struct page *page, static inline int mem_cgroup_newpage_charge(struct page *page,
@ -384,9 +384,9 @@ static inline void mem_cgroup_replace_page_cache(struct page *oldpage,
struct page *newpage) struct page *newpage)
{ {
} }
#endif /* CONFIG_CGROUP_MEM_RES_CTLR */ #endif /* CONFIG_MEMCG */
#if !defined(CONFIG_CGROUP_MEM_RES_CTLR) || !defined(CONFIG_DEBUG_VM) #if !defined(CONFIG_MEMCG) || !defined(CONFIG_DEBUG_VM)
static inline bool static inline bool
mem_cgroup_bad_page_check(struct page *page) mem_cgroup_bad_page_check(struct page *page)
{ {
@ -406,7 +406,7 @@ enum {
}; };
struct sock; struct sock;
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM #ifdef CONFIG_MEMCG_KMEM
void sock_update_memcg(struct sock *sk); void sock_update_memcg(struct sock *sk);
void sock_release_memcg(struct sock *sk); void sock_release_memcg(struct sock *sk);
#else #else
@ -416,6 +416,6 @@ static inline void sock_update_memcg(struct sock *sk)
static inline void sock_release_memcg(struct sock *sk) static inline void sock_release_memcg(struct sock *sk)
{ {
} }
#endif /* CONFIG_CGROUP_MEM_RES_CTLR_KMEM */ #endif /* CONFIG_MEMCG_KMEM */
#endif /* _LINUX_MEMCONTROL_H */ #endif /* _LINUX_MEMCONTROL_H */

8
include/linux/mmzone.h
View file

@ -201,7 +201,7 @@ struct zone_reclaim_stat {
struct lruvec { struct lruvec {
struct list_head lists[NR_LRU_LISTS]; struct list_head lists[NR_LRU_LISTS];
struct zone_reclaim_stat reclaim_stat; struct zone_reclaim_stat reclaim_stat;
#ifdef CONFIG_CGROUP_MEM_RES_CTLR #ifdef CONFIG_MEMCG
struct zone *zone; struct zone *zone;
#endif #endif
}; };
@ -671,7 +671,7 @@ typedef struct pglist_data {
int nr_zones; int nr_zones;
#ifdef CONFIG_FLAT_NODE_MEM_MAP /* means !SPARSEMEM */ #ifdef CONFIG_FLAT_NODE_MEM_MAP /* means !SPARSEMEM */
struct page *node_mem_map; struct page *node_mem_map;
#ifdef CONFIG_CGROUP_MEM_RES_CTLR #ifdef CONFIG_MEMCG
struct page_cgroup *node_page_cgroup; struct page_cgroup *node_page_cgroup;
#endif #endif
#endif #endif
@ -736,7 +736,7 @@ extern void lruvec_init(struct lruvec *lruvec, struct zone *zone);
static inline struct zone *lruvec_zone(struct lruvec *lruvec) static inline struct zone *lruvec_zone(struct lruvec *lruvec)
{ {
#ifdef CONFIG_CGROUP_MEM_RES_CTLR #ifdef CONFIG_MEMCG
return lruvec->zone; return lruvec->zone;
#else #else
return container_of(lruvec, struct zone, lruvec); return container_of(lruvec, struct zone, lruvec);
@ -1052,7 +1052,7 @@ struct mem_section {
/* See declaration of similar field in struct zone */ /* See declaration of similar field in struct zone */
unsigned long *pageblock_flags; unsigned long *pageblock_flags;
#ifdef CONFIG_CGROUP_MEM_RES_CTLR #ifdef CONFIG_MEMCG
/* /*
* If !SPARSEMEM, pgdat doesn't have page_cgroup pointer. We use * If !SPARSEMEM, pgdat doesn't have page_cgroup pointer. We use
* section. (see memcontrol.h/page_cgroup.h about this.) * section. (see memcontrol.h/page_cgroup.h about this.)

10
include/linux/page_cgroup.h
View file

@ -12,7 +12,7 @@ enum {
#ifndef __GENERATING_BOUNDS_H #ifndef __GENERATING_BOUNDS_H
#include <generated/bounds.h> #include <generated/bounds.h>
#ifdef CONFIG_CGROUP_MEM_RES_CTLR #ifdef CONFIG_MEMCG
#include <linux/bit_spinlock.h> #include <linux/bit_spinlock.h>
/* /*
@ -82,7 +82,7 @@ static inline void unlock_page_cgroup(struct page_cgroup *pc)
bit_spin_unlock(PCG_LOCK, &pc->flags); bit_spin_unlock(PCG_LOCK, &pc->flags);
} }
#else /* CONFIG_CGROUP_MEM_RES_CTLR */ #else /* CONFIG_MEMCG */
struct page_cgroup; struct page_cgroup;
static inline void __meminit pgdat_page_cgroup_init(struct pglist_data *pgdat) static inline void __meminit pgdat_page_cgroup_init(struct pglist_data *pgdat)
@ -102,11 +102,11 @@ static inline void __init page_cgroup_init_flatmem(void)
{ {
} }
#endif /* CONFIG_CGROUP_MEM_RES_CTLR */ #endif /* CONFIG_MEMCG */
#include <linux/swap.h> #include <linux/swap.h>
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP #ifdef CONFIG_MEMCG_SWAP
extern unsigned short swap_cgroup_cmpxchg(swp_entry_t ent, extern unsigned short swap_cgroup_cmpxchg(swp_entry_t ent,
unsigned short old, unsigned short new); unsigned short old, unsigned short new);
extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id); extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id);
@ -138,7 +138,7 @@ static inline void swap_cgroup_swapoff(int type)
return; return;
} }
#endif /* CONFIG_CGROUP_MEM_RES_CTLR_SWAP */ #endif /* CONFIG_MEMCG_SWAP */
#endif /* !__GENERATING_BOUNDS_H */ #endif /* !__GENERATING_BOUNDS_H */

2
include/linux/sched.h
View file

@ -1584,7 +1584,7 @@ struct task_struct {
/* bitmask and counter of trace recursion */ /* bitmask and counter of trace recursion */
unsigned long trace_recursion; unsigned long trace_recursion;
#endif /* CONFIG_TRACING */ #endif /* CONFIG_TRACING */
#ifdef CONFIG_CGROUP_MEM_RES_CTLR /* memcg uses this to do batch job */ #ifdef CONFIG_MEMCG /* memcg uses this to do batch job */
struct memcg_batch_info { struct memcg_batch_info {
int do_batch; /* incremented when batch uncharge started */ int do_batch; /* incremented when batch uncharge started */
struct mem_cgroup *memcg; /* target memcg of uncharge */ struct mem_cgroup *memcg; /* target memcg of uncharge */

6
include/linux/swap.h
View file

@ -301,7 +301,7 @@ static inline void scan_unevictable_unregister_node(struct node *node)
extern int kswapd_run(int nid); extern int kswapd_run(int nid);
extern void kswapd_stop(int nid); extern void kswapd_stop(int nid);
#ifdef CONFIG_CGROUP_MEM_RES_CTLR #ifdef CONFIG_MEMCG
extern int mem_cgroup_swappiness(struct mem_cgroup *mem); extern int mem_cgroup_swappiness(struct mem_cgroup *mem);
#else #else
static inline int mem_cgroup_swappiness(struct mem_cgroup *mem) static inline int mem_cgroup_swappiness(struct mem_cgroup *mem)
@ -309,7 +309,7 @@ static inline int mem_cgroup_swappiness(struct mem_cgroup *mem)
return vm_swappiness; return vm_swappiness;
} }
#endif #endif
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP #ifdef CONFIG_MEMCG_SWAP
extern void mem_cgroup_uncharge_swap(swp_entry_t ent); extern void mem_cgroup_uncharge_swap(swp_entry_t ent);
#else #else
static inline void mem_cgroup_uncharge_swap(swp_entry_t ent) static inline void mem_cgroup_uncharge_swap(swp_entry_t ent)
@ -360,7 +360,7 @@ extern int reuse_swap_page(struct page *);
extern int try_to_free_swap(struct page *); extern int try_to_free_swap(struct page *);
struct backing_dev_info; struct backing_dev_info;
#ifdef CONFIG_CGROUP_MEM_RES_CTLR #ifdef CONFIG_MEMCG
extern void extern void
mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout); mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout);
#else #else

4
include/net/sock.h
View file

@ -913,7 +913,7 @@ struct proto {
#ifdef SOCK_REFCNT_DEBUG #ifdef SOCK_REFCNT_DEBUG
atomic_t socks; atomic_t socks;
#endif #endif
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM #ifdef CONFIG_MEMCG_KMEM
/* /*
* cgroup specific init/deinit functions. Called once for all * cgroup specific init/deinit functions. Called once for all
* protocols that implement it, from cgroups populate function. * protocols that implement it, from cgroups populate function.
@ -994,7 +994,7 @@ inline void sk_refcnt_debug_release(const struct sock *sk)
#define sk_refcnt_debug_release(sk) do { } while (0) #define sk_refcnt_debug_release(sk) do { } while (0)
#endif /* SOCK_REFCNT_DEBUG */ #endif /* SOCK_REFCNT_DEBUG */
#if defined(CONFIG_CGROUP_MEM_RES_CTLR_KMEM) && defined(CONFIG_NET) #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_NET)
extern struct static_key memcg_socket_limit_enabled; extern struct static_key memcg_socket_limit_enabled;
static inline struct cg_proto *parent_cg_proto(struct proto *proto, static inline struct cg_proto *parent_cg_proto(struct proto *proto,
struct cg_proto *cg_proto) struct cg_proto *cg_proto)

14
init/Kconfig
View file

@ -686,7 +686,7 @@ config RESOURCE_COUNTERS
This option enables controller independent resource accounting This option enables controller independent resource accounting
infrastructure that works with cgroups. infrastructure that works with cgroups.
config CGROUP_MEM_RES_CTLR config MEMCG
bool "Memory Resource Controller for Control Groups" bool "Memory Resource Controller for Control Groups"
depends on RESOURCE_COUNTERS depends on RESOURCE_COUNTERS
select MM_OWNER select MM_OWNER
@ -709,9 +709,9 @@ config CGROUP_MEM_RES_CTLR
This config option also selects MM_OWNER config option, which This config option also selects MM_OWNER config option, which
could in turn add some fork/exit overhead. could in turn add some fork/exit overhead.
config CGROUP_MEM_RES_CTLR_SWAP config MEMCG_SWAP
bool "Memory Resource Controller Swap Extension" bool "Memory Resource Controller Swap Extension"
depends on CGROUP_MEM_RES_CTLR && SWAP depends on MEMCG && SWAP
help help
Add swap management feature to memory resource controller. When you Add swap management feature to memory resource controller. When you
enable this, you can limit mem+swap usage per cgroup. In other words, enable this, you can limit mem+swap usage per cgroup. In other words,
@ -726,9 +726,9 @@ config CGROUP_MEM_RES_CTLR_SWAP
if boot option "swapaccount=0" is set, swap will not be accounted. if boot option "swapaccount=0" is set, swap will not be accounted.
Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page
size is 4096bytes, 512k per 1Gbytes of swap. size is 4096bytes, 512k per 1Gbytes of swap.
config CGROUP_MEM_RES_CTLR_SWAP_ENABLED config MEMCG_SWAP_ENABLED
bool "Memory Resource Controller Swap Extension enabled by default" bool "Memory Resource Controller Swap Extension enabled by default"
depends on CGROUP_MEM_RES_CTLR_SWAP depends on MEMCG_SWAP
default y default y
help help
Memory Resource Controller Swap Extension comes with its price in Memory Resource Controller Swap Extension comes with its price in
@ -739,9 +739,9 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
For those who want to have the feature enabled by default should For those who want to have the feature enabled by default should
select this option (if, for some reason, they need to disable it select this option (if, for some reason, they need to disable it
then swapaccount=0 does the trick). then swapaccount=0 does the trick).
config CGROUP_MEM_RES_CTLR_KMEM config MEMCG_KMEM
bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)" bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)"
depends on CGROUP_MEM_RES_CTLR && EXPERIMENTAL depends on MEMCG && EXPERIMENTAL
default n default n
help help
The Kernel Memory extension for Memory Resource Controller can limit The Kernel Memory extension for Memory Resource Controller can limit

2
kernel/fork.c
View file

@ -1306,7 +1306,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
#ifdef CONFIG_DEBUG_MUTEXES #ifdef CONFIG_DEBUG_MUTEXES
p->blocked_on = NULL; /* not blocked yet */ p->blocked_on = NULL; /* not blocked yet */
#endif #endif
#ifdef CONFIG_CGROUP_MEM_RES_CTLR #ifdef CONFIG_MEMCG
p->memcg_batch.do_batch = 0; p->memcg_batch.do_batch = 0;
p->memcg_batch.memcg = NULL; p->memcg_batch.memcg = NULL;
#endif #endif

2
mm/Makefile
View file

@ -49,7 +49,7 @@ obj-$(CONFIG_FS_XIP) += filemap_xip.o
obj-$(CONFIG_MIGRATION) += migrate.o obj-$(CONFIG_MIGRATION) += migrate.o
obj-$(CONFIG_QUICKLIST) += quicklist.o obj-$(CONFIG_QUICKLIST) += quicklist.o
obj-$(CONFIG_TRANSPARENT_HUGEPAGE) += huge_memory.o obj-$(CONFIG_TRANSPARENT_HUGEPAGE) += huge_memory.o
obj-$(CONFIG_CGROUP_MEM_RES_CTLR) += memcontrol.o page_cgroup.o obj-$(CONFIG_MEMCG) += memcontrol.o page_cgroup.o
obj-$(CONFIG_CGROUP_HUGETLB) += hugetlb_cgroup.o obj-$(CONFIG_CGROUP_HUGETLB) += hugetlb_cgroup.o
obj-$(CONFIG_MEMORY_FAILURE) += memory-failure.o obj-$(CONFIG_MEMORY_FAILURE) += memory-failure.o
obj-$(CONFIG_HWPOISON_INJECT) += hwpoison-inject.o obj-$(CONFIG_HWPOISON_INJECT) += hwpoison-inject.o

2
mm/hwpoison-inject.c
View file

@ -123,7 +123,7 @@ static int pfn_inject_init(void)
if (!dentry) if (!dentry)
goto fail; goto fail;
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP #ifdef CONFIG_MEMCG_SWAP
dentry = debugfs_create_u64("corrupt-filter-memcg", 0600, dentry = debugfs_create_u64("corrupt-filter-memcg", 0600,
hwpoison_dir, &hwpoison_filter_memcg); hwpoison_dir, &hwpoison_filter_memcg);
if (!dentry) if (!dentry)

20
mm/memcontrol.c
View file

@ -61,12 +61,12 @@ struct cgroup_subsys mem_cgroup_subsys __read_mostly;
#define MEM_CGROUP_RECLAIM_RETRIES 5 #define MEM_CGROUP_RECLAIM_RETRIES 5
static struct mem_cgroup *root_mem_cgroup __read_mostly; static struct mem_cgroup *root_mem_cgroup __read_mostly;
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP #ifdef CONFIG_MEMCG_SWAP
/* Turned on only when memory cgroup is enabled && really_do_swap_account = 1 */ /* Turned on only when memory cgroup is enabled && really_do_swap_account = 1 */
int do_swap_account __read_mostly; int do_swap_account __read_mostly;
/* for remember boot option*/ /* for remember boot option*/
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED #ifdef CONFIG_MEMCG_SWAP_ENABLED
static int really_do_swap_account __initdata = 1; static int really_do_swap_account __initdata = 1;
#else #else
static int really_do_swap_account __initdata = 0; static int really_do_swap_account __initdata = 0;
@ -407,7 +407,7 @@ static void mem_cgroup_get(struct mem_cgroup *memcg);
static void mem_cgroup_put(struct mem_cgroup *memcg); static void mem_cgroup_put(struct mem_cgroup *memcg);
/* Writing them here to avoid exposing memcg's inner layout */ /* Writing them here to avoid exposing memcg's inner layout */
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM #ifdef CONFIG_MEMCG_KMEM
#include <net/sock.h> #include <net/sock.h>
#include <net/ip.h> #include <net/ip.h>
@ -466,9 +466,9 @@ struct cg_proto *tcp_proto_cgroup(struct mem_cgroup *memcg)
} }
EXPORT_SYMBOL(tcp_proto_cgroup); EXPORT_SYMBOL(tcp_proto_cgroup);
#endif /* CONFIG_INET */ #endif /* CONFIG_INET */
#endif /* CONFIG_CGROUP_MEM_RES_CTLR_KMEM */ #endif /* CONFIG_MEMCG_KMEM */
#if defined(CONFIG_INET) && defined(CONFIG_CGROUP_MEM_RES_CTLR_KMEM) #if defined(CONFIG_INET) && defined(CONFIG_MEMCG_KMEM)
static void disarm_sock_keys(struct mem_cgroup *memcg) static void disarm_sock_keys(struct mem_cgroup *memcg)
{ {
if (!memcg_proto_activated(&memcg->tcp_mem.cg_proto)) if (!memcg_proto_activated(&memcg->tcp_mem.cg_proto))
@ -3085,7 +3085,7 @@ mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout)
} }
#endif #endif
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP #ifdef CONFIG_MEMCG_SWAP
/* /*
* called from swap_entry_free(). remove record in swap_cgroup and * called from swap_entry_free(). remove record in swap_cgroup and
* uncharge "memsw" account. * uncharge "memsw" account.
@ -4518,7 +4518,7 @@ static int mem_cgroup_oom_control_write(struct cgroup *cgrp,
return 0; return 0;
} }
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM #ifdef CONFIG_MEMCG_KMEM
static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss) static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss)
{ {
return mem_cgroup_sockets_init(memcg, ss); return mem_cgroup_sockets_init(memcg, ss);
@ -4608,7 +4608,7 @@ static struct cftype mem_cgroup_files[] = {
.read_seq_string = mem_control_numa_stat_show, .read_seq_string = mem_control_numa_stat_show,
}, },
#endif #endif
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP #ifdef CONFIG_MEMCG_SWAP
{ {
.name = "memsw.usage_in_bytes", .name = "memsw.usage_in_bytes",
.private = MEMFILE_PRIVATE(_MEMSWAP, RES_USAGE), .private = MEMFILE_PRIVATE(_MEMSWAP, RES_USAGE),
@ -4795,7 +4795,7 @@ struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg)
} }
EXPORT_SYMBOL(parent_mem_cgroup); EXPORT_SYMBOL(parent_mem_cgroup);
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP #ifdef CONFIG_MEMCG_SWAP
static void __init enable_swap_cgroup(void) static void __init enable_swap_cgroup(void)
{ {
if (!mem_cgroup_disabled() && really_do_swap_account) if (!mem_cgroup_disabled() && really_do_swap_account)
@ -5526,7 +5526,7 @@ struct cgroup_subsys mem_cgroup_subsys = {
.__DEPRECATED_clear_css_refs = true, .__DEPRECATED_clear_css_refs = true,
}; };
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP #ifdef CONFIG_MEMCG_SWAP
static int __init enable_swap_account(char *s) static int __init enable_swap_account(char *s)
{ {
/* consider enabled if no parameter or 1 is given */ /* consider enabled if no parameter or 1 is given */

2
mm/memory-failure.c
View file

@ -128,7 +128,7 @@ static int hwpoison_filter_flags(struct page *p)
* can only guarantee that the page either belongs to the memcg tasks, or is * can only guarantee that the page either belongs to the memcg tasks, or is
* a freed page. * a freed page.
*/ */
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP #ifdef CONFIG_MEMCG_SWAP
u64 hwpoison_filter_memcg; u64 hwpoison_filter_memcg;
EXPORT_SYMBOL_GPL(hwpoison_filter_memcg); EXPORT_SYMBOL_GPL(hwpoison_filter_memcg);
static int hwpoison_filter_task(struct page *p) static int hwpoison_filter_task(struct page *p)

2
mm/mmzone.c
View file

@ -96,7 +96,7 @@ void lruvec_init(struct lruvec *lruvec, struct zone *zone)
for_each_lru(lru) for_each_lru(lru)
INIT_LIST_HEAD(&lruvec->lists[lru]); INIT_LIST_HEAD(&lruvec->lists[lru]);
#ifdef CONFIG_CGROUP_MEM_RES_CTLR #ifdef CONFIG_MEMCG
lruvec->zone = zone; lruvec->zone = zone;
#endif #endif
} }

2
mm/oom_kill.c
View file

@ -541,7 +541,7 @@ static void check_panic_on_oom(enum oom_constraint constraint, gfp_t gfp_mask,
sysctl_panic_on_oom == 2 ? "compulsory" : "system-wide"); sysctl_panic_on_oom == 2 ? "compulsory" : "system-wide");
} }
#ifdef CONFIG_CGROUP_MEM_RES_CTLR #ifdef CONFIG_MEMCG
void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask, void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,
int order) int order)
{ {

2
mm/page_cgroup.c
View file

@ -317,7 +317,7 @@ void __meminit pgdat_page_cgroup_init(struct pglist_data *pgdat)
#endif #endif
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP #ifdef CONFIG_MEMCG_SWAP
static DEFINE_MUTEX(swap_cgroup_mutex); static DEFINE_MUTEX(swap_cgroup_mutex);
struct swap_cgroup_ctrl { struct swap_cgroup_ctrl {

4
mm/vmscan.c
View file

@ -133,7 +133,7 @@ long vm_total_pages; /* The total number of pages which the VM controls */
static LIST_HEAD(shrinker_list); static LIST_HEAD(shrinker_list);
static DECLARE_RWSEM(shrinker_rwsem); static DECLARE_RWSEM(shrinker_rwsem);
#ifdef CONFIG_CGROUP_MEM_RES_CTLR #ifdef CONFIG_MEMCG
static bool global_reclaim(struct scan_control *sc) static bool global_reclaim(struct scan_control *sc)
{ {
return !sc->target_mem_cgroup; return !sc->target_mem_cgroup;
@ -2142,7 +2142,7 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
return nr_reclaimed; return nr_reclaimed;
} }
#ifdef CONFIG_CGROUP_MEM_RES_CTLR #ifdef CONFIG_MEMCG
unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *memcg, unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *memcg,
gfp_t gfp_mask, bool noswap, gfp_t gfp_mask, bool noswap,

2
net/core/sock.c
View file

@ -142,7 +142,7 @@
static DEFINE_MUTEX(proto_list_mutex); static DEFINE_MUTEX(proto_list_mutex);
static LIST_HEAD(proto_list); static LIST_HEAD(proto_list);
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM #ifdef CONFIG_MEMCG_KMEM
int mem_cgroup_sockets_init(struct mem_cgroup *memcg, struct cgroup_subsys *ss) int mem_cgroup_sockets_init(struct mem_cgroup *memcg, struct cgroup_subsys *ss)
{ {
struct proto *proto; struct proto *proto;

2
net/ipv4/Makefile
View file

@ -49,7 +49,7 @@ obj-$(CONFIG_TCP_CONG_SCALABLE) += tcp_scalable.o
obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o
obj-$(CONFIG_TCP_CONG_YEAH) += tcp_yeah.o obj-$(CONFIG_TCP_CONG_YEAH) += tcp_yeah.o
obj-$(CONFIG_TCP_CONG_ILLINOIS) += tcp_illinois.o obj-$(CONFIG_TCP_CONG_ILLINOIS) += tcp_illinois.o
obj-$(CONFIG_CGROUP_MEM_RES_CTLR_KMEM) += tcp_memcontrol.o obj-$(CONFIG_MEMCG_KMEM) += tcp_memcontrol.o
obj-$(CONFIG_NETLABEL) += cipso_ipv4.o obj-$(CONFIG_NETLABEL) += cipso_ipv4.o
obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \ obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \

4
net/ipv4/sysctl_net_ipv4.c
View file

@ -184,7 +184,7 @@ static int ipv4_tcp_mem(ctl_table *ctl, int write,
int ret; int ret;
unsigned long vec[3]; unsigned long vec[3];
struct net *net = current->nsproxy->net_ns; struct net *net = current->nsproxy->net_ns;
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM #ifdef CONFIG_MEMCG_KMEM
struct mem_cgroup *memcg; struct mem_cgroup *memcg;
#endif #endif
@ -203,7 +203,7 @@ static int ipv4_tcp_mem(ctl_table *ctl, int write,
if (ret) if (ret)
return ret; return ret;
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM #ifdef CONFIG_MEMCG_KMEM
rcu_read_lock(); rcu_read_lock();
memcg = mem_cgroup_from_task(current); memcg = mem_cgroup_from_task(current);

2
net/ipv4/tcp_ipv4.c
View file

@ -2633,7 +2633,7 @@ struct proto tcp_prot = {
.compat_setsockopt = compat_tcp_setsockopt, .compat_setsockopt = compat_tcp_setsockopt,
.compat_getsockopt = compat_tcp_getsockopt, .compat_getsockopt = compat_tcp_getsockopt,
#endif #endif
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM #ifdef CONFIG_MEMCG_KMEM
.init_cgroup = tcp_init_cgroup, .init_cgroup = tcp_init_cgroup,
.destroy_cgroup = tcp_destroy_cgroup, .destroy_cgroup = tcp_destroy_cgroup,
.proto_cgroup = tcp_proto_cgroup, .proto_cgroup = tcp_proto_cgroup,

2
net/ipv6/tcp_ipv6.c
View file

@ -2015,7 +2015,7 @@ struct proto tcpv6_prot = {
.compat_setsockopt = compat_tcp_setsockopt, .compat_setsockopt = compat_tcp_setsockopt,
.compat_getsockopt = compat_tcp_getsockopt, .compat_getsockopt = compat_tcp_getsockopt,
#endif #endif
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM #ifdef CONFIG_MEMCG_KMEM
.proto_cgroup = tcp_proto_cgroup, .proto_cgroup = tcp_proto_cgroup,
#endif #endif
}; };