Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c255a458 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

memcg: rename config variables 



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: default avatarMichal 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 80934513

Documentation/cgroups/memory.txt

+5 −5
Original line number Diff line number Diff line
@@ -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

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

be backed into memory in force, charges for pages are accounted against the

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

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

  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

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

b. Enable CONFIG_RESOURCE_COUNTERS

c. Enable CONFIG_CGROUP_MEM_RES_CTLR

d. Enable CONFIG_CGROUP_MEM_RES_CTLR_SWAP (to use swap extension)

c. Enable CONFIG_MEMCG

d. Enable CONFIG_MEMCG_SWAP (to use swap extension)



1. Prepare the cgroups (see cgroups.txt, Why are cgroups needed?)

# mount -t tmpfs none /sys/fs/cgroup

arch/powerpc/configs/chroma_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ CONFIG_CGROUP_DEVICE=y 
CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_RESOURCE_COUNTERS=y

CONFIG_CGROUP_MEM_RES_CTLR=y

CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y

CONFIG_CGROUP_MEMCG=y

CONFIG_CGROUP_MEMCG_SWAP=y

CONFIG_NAMESPACES=y

CONFIG_RELAY=y

CONFIG_BLK_DEV_INITRD=y

arch/s390/defconfig

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ CONFIG_CGROUPS=y 
CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_RESOURCE_COUNTERS=y

CONFIG_CGROUP_MEM_RES_CTLR=y

CONFIG_CGROUP_MEMCG=y

CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y

CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

arch/sh/configs/apsh4ad0a_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ CONFIG_CGROUP_FREEZER=y 
CONFIG_CGROUP_DEVICE=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_RESOURCE_COUNTERS=y

CONFIG_CGROUP_MEM_RES_CTLR=y

CONFIG_CGROUP_MEMCG=y

CONFIG_BLK_CGROUP=y

CONFIG_NAMESPACES=y

CONFIG_BLK_DEV_INITRD=y

arch/sh/configs/sdk7786_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ CONFIG_CPUSETS=y 
# CONFIG_PROC_PID_CPUSET is not set

CONFIG_CGROUP_CPUACCT=y

CONFIG_RESOURCE_COUNTERS=y

CONFIG_CGROUP_MEM_RES_CTLR=y

CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y

CONFIG_CGROUP_MEMCG=y

CONFIG_CGROUP_MEMCG_SWAP=y

CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_BLK_CGROUP=y