cgroups: make cgroup config a submenu
Making CGROUP related configs be a sub-menu. This patch make CGROUP related configs be a sub-menu and makes 1st level configs of "General Setup" shorter. including following additional changes - add help comment about CGROUPS and GROUP_SCHED. - moved MM_OWNER config to the bottom. (for good indent in menuconfig) Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Reviewed-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Cc: Balbir Singh <balbir@in.ibm.com> Cc: Paul Menage <menage@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
e04a88a920
commit
5cdc38f985
131
init/Kconfig
131
init/Kconfig
|
@ -271,11 +271,75 @@ config LOG_BUF_SHIFT
|
||||||
13 => 8 KB
|
13 => 8 KB
|
||||||
12 => 4 KB
|
12 => 4 KB
|
||||||
|
|
||||||
|
#
|
||||||
|
# Architectures with an unreliable sched_clock() should select this:
|
||||||
|
#
|
||||||
|
config HAVE_UNSTABLE_SCHED_CLOCK
|
||||||
|
bool
|
||||||
|
|
||||||
|
config GROUP_SCHED
|
||||||
|
bool "Group CPU scheduler"
|
||||||
|
depends on EXPERIMENTAL
|
||||||
|
default n
|
||||||
|
help
|
||||||
|
This feature lets CPU scheduler recognize task groups and control CPU
|
||||||
|
bandwidth allocation to such task groups.
|
||||||
|
In order to create a group from arbitrary set of processes, use
|
||||||
|
CONFIG_CGROUPS. (See Control Group support.)
|
||||||
|
|
||||||
|
config FAIR_GROUP_SCHED
|
||||||
|
bool "Group scheduling for SCHED_OTHER"
|
||||||
|
depends on GROUP_SCHED
|
||||||
|
default GROUP_SCHED
|
||||||
|
|
||||||
|
config RT_GROUP_SCHED
|
||||||
|
bool "Group scheduling for SCHED_RR/FIFO"
|
||||||
|
depends on EXPERIMENTAL
|
||||||
|
depends on GROUP_SCHED
|
||||||
|
default n
|
||||||
|
help
|
||||||
|
This feature lets you explicitly allocate real CPU bandwidth
|
||||||
|
to users or control groups (depending on the "Basis for grouping tasks"
|
||||||
|
setting below. If enabled, it will also make it impossible to
|
||||||
|
schedule realtime tasks for non-root users until you allocate
|
||||||
|
realtime bandwidth for them.
|
||||||
|
See Documentation/scheduler/sched-rt-group.txt for more information.
|
||||||
|
|
||||||
|
choice
|
||||||
|
depends on GROUP_SCHED
|
||||||
|
prompt "Basis for grouping tasks"
|
||||||
|
default USER_SCHED
|
||||||
|
|
||||||
|
config USER_SCHED
|
||||||
|
bool "user id"
|
||||||
|
help
|
||||||
|
This option will choose userid as the basis for grouping
|
||||||
|
tasks, thus providing equal CPU bandwidth to each user.
|
||||||
|
|
||||||
|
config CGROUP_SCHED
|
||||||
|
bool "Control groups"
|
||||||
|
depends on CGROUPS
|
||||||
|
help
|
||||||
|
This option allows you to create arbitrary task groups
|
||||||
|
using the "cgroup" pseudo filesystem and control
|
||||||
|
the cpu bandwidth allocated to each such task group.
|
||||||
|
Refer to Documentation/cgroups.txt for more information
|
||||||
|
on "cgroup" pseudo filesystem.
|
||||||
|
|
||||||
|
endchoice
|
||||||
|
|
||||||
|
menu "Control Group support"
|
||||||
config CGROUPS
|
config CGROUPS
|
||||||
bool "Control Group support"
|
bool "Control Group support"
|
||||||
help
|
help
|
||||||
This option will let you use process cgroup subsystems
|
This option add support for grouping sets of processes together, for
|
||||||
such as Cpusets
|
use with process control subsystems such as Cpusets, CFS, memory
|
||||||
|
controls or device isolation.
|
||||||
|
See
|
||||||
|
- Documentation/cpusets.txt (Cpusets)
|
||||||
|
- Documentation/scheduler/sched-design-CFS.txt (CFS)
|
||||||
|
- Documentation/cgroups/ (features for grouping, isolation)
|
||||||
|
- Documentation/controllers/ (features for resource control)
|
||||||
|
|
||||||
Say N if unsure.
|
Say N if unsure.
|
||||||
|
|
||||||
|
@ -324,61 +388,6 @@ config CPUSETS
|
||||||
|
|
||||||
Say N if unsure.
|
Say N if unsure.
|
||||||
|
|
||||||
#
|
|
||||||
# Architectures with an unreliable sched_clock() should select this:
|
|
||||||
#
|
|
||||||
config HAVE_UNSTABLE_SCHED_CLOCK
|
|
||||||
bool
|
|
||||||
|
|
||||||
config GROUP_SCHED
|
|
||||||
bool "Group CPU scheduler"
|
|
||||||
depends on EXPERIMENTAL
|
|
||||||
default n
|
|
||||||
help
|
|
||||||
This feature lets CPU scheduler recognize task groups and control CPU
|
|
||||||
bandwidth allocation to such task groups.
|
|
||||||
|
|
||||||
config FAIR_GROUP_SCHED
|
|
||||||
bool "Group scheduling for SCHED_OTHER"
|
|
||||||
depends on GROUP_SCHED
|
|
||||||
default GROUP_SCHED
|
|
||||||
|
|
||||||
config RT_GROUP_SCHED
|
|
||||||
bool "Group scheduling for SCHED_RR/FIFO"
|
|
||||||
depends on EXPERIMENTAL
|
|
||||||
depends on GROUP_SCHED
|
|
||||||
default n
|
|
||||||
help
|
|
||||||
This feature lets you explicitly allocate real CPU bandwidth
|
|
||||||
to users or control groups (depending on the "Basis for grouping tasks"
|
|
||||||
setting below. If enabled, it will also make it impossible to
|
|
||||||
schedule realtime tasks for non-root users until you allocate
|
|
||||||
realtime bandwidth for them.
|
|
||||||
See Documentation/scheduler/sched-rt-group.txt for more information.
|
|
||||||
|
|
||||||
choice
|
|
||||||
depends on GROUP_SCHED
|
|
||||||
prompt "Basis for grouping tasks"
|
|
||||||
default USER_SCHED
|
|
||||||
|
|
||||||
config USER_SCHED
|
|
||||||
bool "user id"
|
|
||||||
help
|
|
||||||
This option will choose userid as the basis for grouping
|
|
||||||
tasks, thus providing equal CPU bandwidth to each user.
|
|
||||||
|
|
||||||
config CGROUP_SCHED
|
|
||||||
bool "Control groups"
|
|
||||||
depends on CGROUPS
|
|
||||||
help
|
|
||||||
This option allows you to create arbitrary task groups
|
|
||||||
using the "cgroup" pseudo filesystem and control
|
|
||||||
the cpu bandwidth allocated to each such task group.
|
|
||||||
Refer to Documentation/cgroups.txt for more information
|
|
||||||
on "cgroup" pseudo filesystem.
|
|
||||||
|
|
||||||
endchoice
|
|
||||||
|
|
||||||
config CGROUP_CPUACCT
|
config CGROUP_CPUACCT
|
||||||
bool "Simple CPU accounting cgroup subsystem"
|
bool "Simple CPU accounting cgroup subsystem"
|
||||||
depends on CGROUPS
|
depends on CGROUPS
|
||||||
|
@ -393,9 +402,6 @@ config RESOURCE_COUNTERS
|
||||||
infrastructure that works with cgroups
|
infrastructure that works with cgroups
|
||||||
depends on CGROUPS
|
depends on CGROUPS
|
||||||
|
|
||||||
config MM_OWNER
|
|
||||||
bool
|
|
||||||
|
|
||||||
config CGROUP_MEM_RES_CTLR
|
config CGROUP_MEM_RES_CTLR
|
||||||
bool "Memory Resource Controller for Control Groups"
|
bool "Memory Resource Controller for Control Groups"
|
||||||
depends on CGROUPS && RESOURCE_COUNTERS
|
depends on CGROUPS && RESOURCE_COUNTERS
|
||||||
|
@ -419,6 +425,11 @@ 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 MM_OWNER
|
||||||
|
bool
|
||||||
|
|
||||||
|
endmenu
|
||||||
|
|
||||||
config SYSFS_DEPRECATED
|
config SYSFS_DEPRECATED
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue