Skip to contentSkip to conversation

cgroups: consolidate cgroup documents

PATCH In review Li Zefan 9 participants 13 messages Jan 9, 2009 – Jan 10, 2009 3 messages not in the archive Documentation

lore
Share & tools
lore

Li Zefan

author
#0 lore raw

PATCH 1/1 cgroups: consolidate cgroup documents

Move Documentation/cpusets.txt and Documentation/controllers/* to Documentation/cgroups/

This inlined patch is generated with git-show -M (rename detected) and is for review, and the attached one is for apply.

---
 Documentation/cgroups/cgroups.txt            |    5 +++--
 Documentation/cgroups/memcg_test.txt         |    2 +-
 Documentation/scheduler/sched-design-CFS.txt |    2 +-
 include/linux/res_counter.h                  |    2 +-
 init/Kconfig                                 |    9 ++++-----
 kernel/cpuset.c                              |    2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename Documentation/{controllers => cgroups}/cpuacct.txt (100%)
 rename Documentation/{ => cgroups}/cpusets.txt (100%)
 rename Documentation/{controllers => cgroups}/devices.txt (100%)
 rename Documentation/{controllers => cgroups}/memcg_test.txt (99%)
 rename Documentation/{controllers => cgroups}/memory.txt (100%)
 rename Documentation/{controllers => cgroups}/resource_counter.txt (100%)
Documentation/cgroups/cgroups.txt +3 -2
index e33ee74..d9e5d6f 100644
@@ -1,7 +1,8 @@
 				CGROUPS
 				-------
 
-Written by Paul Menage <[email protected]> based on Documentation/cpusets.txt
+Written by Paul Menage <[email protected]> based on
+Documentation/cgroups/cpusets.txt
 
 Original copyright statements from cpusets.txt:
 Portions Copyright (C) 2004 BULL SA.
@@ -68,7 +69,7 @@ On their own, the only use for cgroups is for simple job
 tracking. The intention is that other subsystems hook into the generic
 cgroup support to provide new attributes for cgroups, such as
 accounting/limiting the resources which processes in a cgroup can
-access. For example, cpusets (see Documentation/cpusets.txt) allows
+access. For example, cpusets (see Documentation/cgroups/cpusets.txt) allows
 you to associate a set of CPUs and a set of memory nodes with the
 tasks in each cgroup.
 
Documentation/cgroups/cpuacct.txt renamed from Documentation/controllers/cpuacct.txt +0 -0
similarity index 100%
rename from Documentation/controllers/cpuacct.txt
rename to Documentation/cgroups/cpuacct.txt
Documentation/cgroups/cpusets.txt renamed from Documentation/cpusets.txt +0 -0
similarity index 100%
rename from Documentation/cpusets.txt
rename to Documentation/cgroups/cpusets.txt
Documentation/cgroups/devices.txt renamed from Documentation/controllers/devices.txt +0 -0
similarity index 100%
rename from Documentation/controllers/devices.txt
rename to Documentation/cgroups/devices.txt
Documentation/cgroups/memcg_test.txt renamed from Documentation/controllers/memcg_test.txt +1 -1
similarity index 99%
rename from Documentation/controllers/memcg_test.txt
rename to Documentation/cgroups/memcg_test.txt
index 08d4d3e..19533f9 100644
@@ -6,7 +6,7 @@ Because VM is getting complex (one of reasons is memcg...), memcg's behavior
 is complex. This is a document for memcg's internal behavior.
 Please note that implementation details can be changed.
 
-(*) Topics on API should be in Documentation/controllers/memory.txt)
+(*) Topics on API should be in Documentation/cgroups/memory.txt)
 
 0. How to record usage ?
    2 objects are used.
Documentation/cgroups/memory.txt renamed from Documentation/controllers/memory.txt +0 -0
similarity index 100%
rename from Documentation/controllers/memory.txt
rename to Documentation/cgroups/memory.txt
Documentation/cgroups/resource_counter.txt renamed from Documentation/controllers/resource_counter.txt +0 -0
similarity index 100%
rename from Documentation/controllers/resource_counter.txt
rename to Documentation/cgroups/resource_counter.txt
Documentation/scheduler/sched-design-CFS.txt +1 -1
index 8398ca4..6f33593 100644
@@ -231,7 +231,7 @@ CPU bandwidth control purposes:
 
    This options needs CONFIG_CGROUPS to be defined, and lets the administrator
    create arbitrary groups of tasks, using the "cgroup" pseudo filesystem.  See
-   Documentation/cgroups.txt for more information about this filesystem.
+   Documentation/cgroups/cgroups.txt for more information about this filesystem.
 
 Only one of these options to group tasks can be chosen and not both.
 
include/linux/res_counter.h +1 -1
index dede0a2..4c5bcf6 100644
@@ -9,7 +9,7 @@
  *
  * Author: Pavel Emelianov <[email protected]>
  *
- * See Documentation/controllers/resource_counter.txt for more
+ * See Documentation/cgroups/resource_counter.txt for more
  * info about what this counter is.
  */
 
init/Kconfig +4 -5
index 56fd93c..2af8382 100644
@@ -323,8 +323,8 @@ config CGROUP_SCHED
 	  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.
+	  Refer to Documentation/cgroups/cgroups.txt for more
+	  information on "cgroup" pseudo filesystem.
 
 endchoice
 
@@ -335,10 +335,9 @@ menuconfig CGROUPS
 	  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)
+		- Documentation/cgroups/ (features for grouping, isolation
+					  and resource control)
 
 	  Say N if unsure.
 
kernel/cpuset.c +1 -1
index 647c77a..a856788 100644
@@ -568,7 +568,7 @@ update_domain_attr_tree(struct sched_domain_attr *dattr, struct cpuset *c)
  * load balancing domains (sched domains) as specified by that partial
  * partition.
  *
- * See "What is sched_load_balance" in Documentation/cpusets.txt
+ * See "What is sched_load_balance" in Documentation/cgroups/cpusets.txt
  * for a background explanation of this.
  *
  * Does not return errors, on the theory that the callers of this

From: Li Zefan <[email protected]>
Date: Fri, 9 Jan 2009 09:52:13 +0800
Subject: [PATCH] cgroups: consolidate cgroup documents

Move Documentation/cpusets.txt and Documentation/controllers/* to Documentation/cgroups/

---
 Documentation/cgroups/cgroups.txt              |    5 +-
 Documentation/cgroups/cpuacct.txt              |   32 +
 Documentation/cgroups/cpusets.txt              |  808 ++++++++++++++++++++++++
 Documentation/cgroups/devices.txt              |   52 ++
 Documentation/cgroups/memcg_test.txt           |  342 ++++++++++
 Documentation/cgroups/memory.txt               |  399 ++++++++++++
 Documentation/cgroups/resource_counter.txt     |  181 ++++++
 Documentation/controllers/cpuacct.txt          |   32 -
 Documentation/controllers/devices.txt          |   52 --
 Documentation/controllers/memcg_test.txt       |  342 ----------
 Documentation/controllers/memory.txt           |  399 ------------
 Documentation/controllers/resource_counter.txt |  181 ------
 Documentation/cpusets.txt                      |  808 ------------------------
 Documentation/scheduler/sched-design-CFS.txt   |    2 +-
 include/linux/res_counter.h                    |    2 +-
 init/Kconfig                                   |    9 +-
 kernel/cpuset.c                                |    2 +-
 17 files changed, 1824 insertions(+), 1824 deletions(-)
 create mode 100644 Documentation/cgroups/cpuacct.txt
 create mode 100644 Documentation/cgroups/cpusets.txt
 create mode 100644 Documentation/cgroups/devices.txt
 create mode 100644 Documentation/cgroups/memcg_test.txt
 create mode 100644 Documentation/cgroups/memory.txt
 create mode 100644 Documentation/cgroups/resource_counter.txt
 delete mode 100644 Documentation/controllers/cpuacct.txt
 delete mode 100644 Documentation/controllers/devices.txt
 delete mode 100644 Documentation/controllers/memcg_test.txt
 delete mode 100644 Documentation/controllers/memory.txt
 delete mode 100644 Documentation/controllers/resource_counter.txt
 delete mode 100644 Documentation/cpusets.txt
Documentation/cgroups/cgroups.txt +3 -2
index e33ee74..d9e5d6f 100644
@@ -1,7 +1,8 @@
 				CGROUPS
 				-------
 
-Written by Paul Menage <[email protected]> based on Documentation/cpusets.txt
+Written by Paul Menage <[email protected]> based on
+Documentation/cgroups/cpusets.txt
 
 Original copyright statements from cpusets.txt:
 Portions Copyright (C) 2004 BULL SA.
@@ -68,7 +69,7 @@ On their own, the only use for cgroups is for simple job
 tracking. The intention is that other subsystems hook into the generic
 cgroup support to provide new attributes for cgroups, such as
 accounting/limiting the resources which processes in a cgroup can
-access. For example, cpusets (see Documentation/cpusets.txt) allows
+access. For example, cpusets (see Documentation/cgroups/cpusets.txt) allows
 you to associate a set of CPUs and a set of memory nodes with the
 tasks in each cgroup.
 
Documentation/cgroups/cpuacct.txt new file +32 -0
new file mode 100644
index 0000000..bb775fb
@@ -0,0 +1,32 @@
+CPU Accounting Controller
+-------------------------
+
+The CPU accounting controller is used to group tasks using cgroups and
+account the CPU usage of these groups of tasks.
+
+The CPU accounting controller supports multi-hierarchy groups. An accounting
+group accumulates the CPU usage of all of its child groups and the tasks
+directly present in its group.
+
+Accounting groups can be created by first mounting the cgroup filesystem.
+
+# mkdir /cgroups
+# mount -t cgroup -ocpuacct none /cgroups
+
+With the above step, the initial or the parent accounting group
+becomes visible at /cgroups. At bootup, this group includes all the
+tasks in the system. /cgroups/tasks lists the tasks in this cgroup.
+/cgroups/cpuacct.usage gives the CPU time (in nanoseconds) obtained by
+this group which is essentially the CPU time obtained by all the tasks
+in the system.
+
+New accounting groups can be created under the parent group /cgroups.
+
+# cd /cgroups
+# mkdir g1
+# echo $$ > g1
+
+The above steps create a new group g1 and move the current shell
+process (bash) into it. CPU time consumed by this bash and its children
+can be obtained from g1/cpuacct.usage and the same is accumulated in
+/cgroups/cpuacct.usage also.
Documentation/cgroups/cpusets.txt new file +808 -0

808 lines not on this page · raw message

Documentation/cgroups/devices.txt new file +52 -0

52 lines not on this page · raw message

Documentation/cgroups/memcg_test.txt new file +342 -0

342 lines not on this page · raw message

Documentation/cgroups/memory.txt new file +399 -0

399 lines not on this page · raw message

Documentation/cgroups/resource_counter.txt new file +181 -0

181 lines not on this page · raw message

Documentation/controllers/cpuacct.txt deleted +0 -32
deleted file mode 100644
index bb775fb..0000000
@@ -1,32 +0,0 @@
-CPU Accounting Controller
--------------------------
-
-The CPU accounting controller is used to group tasks using cgroups and
-account the CPU usage of these groups of tasks.
-
-The CPU accounting controller supports multi-hierarchy groups. An accounting
-group accumulates the CPU usage of all of its child groups and the tasks
-directly present in its group.
-
-Accounting groups can be created by first mounting the cgroup filesystem.
-
-# mkdir /cgroups
-# mount -t cgroup -ocpuacct none /cgroups
-
-With the above step, the initial or the parent accounting group
-becomes visible at /cgroups. At bootup, this group includes all the
-tasks in the system. /cgroups/tasks lists the tasks in this cgroup.
-/cgroups/cpuacct.usage gives the CPU time (in nanoseconds) obtained by
-this group which is essentially the CPU time obtained by all the tasks
-in the system.
-
-New accounting groups can be created under the parent group /cgroups.
-
-# cd /cgroups
-# mkdir g1
-# echo $$ > g1
-
-The above steps create a new group g1 and move the current shell
-process (bash) into it. CPU time consumed by this bash and its children
-can be obtained from g1/cpuacct.usage and the same is accumulated in
-/cgroups/cpuacct.usage also.
Documentation/controllers/devices.txt deleted +0 -52

52 lines not on this page · raw message

Documentation/controllers/memcg_test.txt deleted +0 -342

342 lines not on this page · raw message

Documentation/controllers/memory.txt deleted +0 -399

399 lines not on this page · raw message

Documentation/controllers/resource_counter.txt deleted +0 -181

181 lines not on this page · raw message

Documentation/cpusets.txt deleted +0 -808

92 lines not on this page · raw message

Documentation/scheduler/sched-design-CFS.txt +1 -1
index 8398ca4..6f33593 100644

Lines of this file are not shown. View the raw message.

include/linux/res_counter.h +1 -1
index dede0a2..4c5bcf6 100644

Lines of this file are not shown. View the raw message.

init/Kconfig +4 -5
index 56fd93c..2af8382 100644

Lines of this file are not shown. View the raw message.

kernel/cpuset.c +1 -1
index 647c77a..a856788 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.5.4.rc3

Part of the diff is not shown here. View the raw message.

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw
Quoted 7 lines · On Fri, 09 Jan 2009 10:16:35 +0800 Li Zefan…

Move Documentation/cpusets.txt and Documentation/controllers/* to Documentation/cgroups/

This inlined patch is generated with git-show -M (rename detected) and is for review, and the attached one is for apply.

Oh, I love this patch. Thank you!

(about memcg part)

Quoted 143 lines
---
 Documentation/cgroups/cgroups.txt            |    5 +++--
 Documentation/cgroups/memcg_test.txt         |    2 +-
 Documentation/scheduler/sched-design-CFS.txt |    2 +-
 include/linux/res_counter.h                  |    2 +-
 init/Kconfig                                 |    9 ++++-----
 kernel/cpuset.c                              |    2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename Documentation/{controllers => cgroups}/cpuacct.txt (100%)
 rename Documentation/{ => cgroups}/cpusets.txt (100%)
 rename Documentation/{controllers => cgroups}/devices.txt (100%)
 rename Documentation/{controllers => cgroups}/memcg_test.txt (99%)
 rename Documentation/{controllers => cgroups}/memory.txt (100%)
 rename Documentation/{controllers => cgroups}/resource_counter.txt (100%)
Documentation/cgroups/cgroups.txt +3 -2
index e33ee74..d9e5d6f 100644
@@ -1,7 +1,8 @@
 				CGROUPS
 				-------
 
-Written by Paul Menage <[email protected]> based on Documentation/cpusets.txt
+Written by Paul Menage <[email protected]> based on
+Documentation/cgroups/cpusets.txt
 
 Original copyright statements from cpusets.txt:
 Portions Copyright (C) 2004 BULL SA.
@@ -68,7 +69,7 @@ On their own, the only use for cgroups is for simple job
 tracking. The intention is that other subsystems hook into the generic
 cgroup support to provide new attributes for cgroups, such as
 accounting/limiting the resources which processes in a cgroup can
-access. For example, cpusets (see Documentation/cpusets.txt) allows
+access. For example, cpusets (see Documentation/cgroups/cpusets.txt) allows
 you to associate a set of CPUs and a set of memory nodes with the
 tasks in each cgroup.
 
Documentation/cgroups/cpuacct.txt renamed from Documentation/controllers/cpuacct.txt +0 -0
similarity index 100%
rename from Documentation/controllers/cpuacct.txt
rename to Documentation/cgroups/cpuacct.txt
Documentation/cgroups/cpusets.txt renamed from Documentation/cpusets.txt +0 -0
similarity index 100%
rename from Documentation/cpusets.txt
rename to Documentation/cgroups/cpusets.txt
Documentation/cgroups/devices.txt renamed from Documentation/controllers/devices.txt +0 -0
similarity index 100%
rename from Documentation/controllers/devices.txt
rename to Documentation/cgroups/devices.txt
Documentation/cgroups/memcg_test.txt renamed from Documentation/controllers/memcg_test.txt +1 -1
similarity index 99%
rename from Documentation/controllers/memcg_test.txt
rename to Documentation/cgroups/memcg_test.txt
index 08d4d3e..19533f9 100644
@@ -6,7 +6,7 @@ Because VM is getting complex (one of reasons is memcg...), memcg's behavior
 is complex. This is a document for memcg's internal behavior.
 Please note that implementation details can be changed.
 
-(*) Topics on API should be in Documentation/controllers/memory.txt)
+(*) Topics on API should be in Documentation/cgroups/memory.txt)
 
 0. How to record usage ?
    2 objects are used.
Documentation/cgroups/memory.txt renamed from Documentation/controllers/memory.txt +0 -0
similarity index 100%
rename from Documentation/controllers/memory.txt
rename to Documentation/cgroups/memory.txt
Documentation/cgroups/resource_counter.txt renamed from Documentation/controllers/resource_counter.txt +0 -0
similarity index 100%
rename from Documentation/controllers/resource_counter.txt
rename to Documentation/cgroups/resource_counter.txt
Documentation/scheduler/sched-design-CFS.txt +1 -1
index 8398ca4..6f33593 100644
@@ -231,7 +231,7 @@ CPU bandwidth control purposes:
 
    This options needs CONFIG_CGROUPS to be defined, and lets the administrator
    create arbitrary groups of tasks, using the "cgroup" pseudo filesystem.  See
-   Documentation/cgroups.txt for more information about this filesystem.
+   Documentation/cgroups/cgroups.txt for more information about this filesystem.
 
 Only one of these options to group tasks can be chosen and not both.
 
include/linux/res_counter.h +1 -1
index dede0a2..4c5bcf6 100644
@@ -9,7 +9,7 @@
  *
  * Author: Pavel Emelianov <[email protected]>
  *
- * See Documentation/controllers/resource_counter.txt for more
+ * See Documentation/cgroups/resource_counter.txt for more
  * info about what this counter is.
  */
 
init/Kconfig +4 -5
index 56fd93c..2af8382 100644
@@ -323,8 +323,8 @@ config CGROUP_SCHED
 	  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.
+	  Refer to Documentation/cgroups/cgroups.txt for more
+	  information on "cgroup" pseudo filesystem.
 
 endchoice
 
@@ -335,10 +335,9 @@ menuconfig CGROUPS
 	  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)
+		- Documentation/cgroups/ (features for grouping, isolation
+					  and resource control)
 
 	  Say N if unsure.
 
kernel/cpuset.c +1 -1
index 647c77a..a856788 100644
@@ -568,7 +568,7 @@ update_domain_attr_tree(struct sched_domain_attr *dattr, struct cpuset *c)
  * load balancing domains (sched domains) as specified by that partial
  * partition.
  *
- * See "What is sched_load_balance" in Documentation/cpusets.txt
+ * See "What is sched_load_balance" in Documentation/cgroups/cpusets.txt
  * for a background explanation of this.
  *
  * Does not return errors, on the theory that the callers of this
Acked-by
#3 lore raw
In reply to a message not in the archive
Quoted 7 lines · Li Zefan

Move Documentation/cpusets.txt and Documentation/controllers/* to Documentation/cgroups/

This inlined patch is generated with git-show -M (rename detected) and is for review, and the attached one is for apply.

Thanks.

Quoted 143 lines
---
 Documentation/cgroups/cgroups.txt            |    5 +++--
 Documentation/cgroups/memcg_test.txt         |    2 +-
 Documentation/scheduler/sched-design-CFS.txt |    2 +-
 include/linux/res_counter.h                  |    2 +-
 init/Kconfig                                 |    9 ++++-----
 kernel/cpuset.c                              |    2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename Documentation/{controllers => cgroups}/cpuacct.txt (100%)
 rename Documentation/{ => cgroups}/cpusets.txt (100%)
 rename Documentation/{controllers => cgroups}/devices.txt (100%)
 rename Documentation/{controllers => cgroups}/memcg_test.txt (99%)
 rename Documentation/{controllers => cgroups}/memory.txt (100%)
 rename Documentation/{controllers => cgroups}/resource_counter.txt (100%)
Documentation/cgroups/cgroups.txt +3 -2
index e33ee74..d9e5d6f 100644
@@ -1,7 +1,8 @@
                               CGROUPS
                               -------
 
-Written by Paul Menage <[email protected]> based on Documentation/cpusets.txt
+Written by Paul Menage <[email protected]> based on
+Documentation/cgroups/cpusets.txt
 
 Original copyright statements from cpusets.txt:
 Portions Copyright (C) 2004 BULL SA.
@@ -68,7 +69,7 @@ On their own, the only use for cgroups is for simple job
 tracking. The intention is that other subsystems hook into the generic
 cgroup support to provide new attributes for cgroups, such as
 accounting/limiting the resources which processes in a cgroup can
-access. For example, cpusets (see Documentation/cpusets.txt) allows
+access. For example, cpusets (see Documentation/cgroups/cpusets.txt) allows
 you to associate a set of CPUs and a set of memory nodes with the
 tasks in each cgroup.
 
Documentation/cgroups/cpuacct.txt renamed from Documentation/controllers/cpuacct.txt +0 -0
similarity index 100%
rename from Documentation/controllers/cpuacct.txt
rename to Documentation/cgroups/cpuacct.txt
Documentation/cgroups/cpusets.txt renamed from Documentation/cpusets.txt +0 -0
similarity index 100%
rename from Documentation/cpusets.txt
rename to Documentation/cgroups/cpusets.txt
Documentation/cgroups/devices.txt renamed from Documentation/controllers/devices.txt +0 -0
similarity index 100%
rename from Documentation/controllers/devices.txt
rename to Documentation/cgroups/devices.txt
Documentation/cgroups/memcg_test.txt renamed from Documentation/controllers/memcg_test.txt +1 -1
similarity index 99%
rename from Documentation/controllers/memcg_test.txt
rename to Documentation/cgroups/memcg_test.txt
index 08d4d3e..19533f9 100644
@@ -6,7 +6,7 @@ Because VM is getting complex (one of reasons is memcg...), memcg's behavior
 is complex. This is a document for memcg's internal behavior.
 Please note that implementation details can be changed.
 
-(*) Topics on API should be in Documentation/controllers/memory.txt)
+(*) Topics on API should be in Documentation/cgroups/memory.txt)
 
 0. How to record usage ?
   2 objects are used.
Documentation/cgroups/memory.txt renamed from Documentation/controllers/memory.txt +0 -0
similarity index 100%
rename from Documentation/controllers/memory.txt
rename to Documentation/cgroups/memory.txt
Documentation/cgroups/resource_counter.txt renamed from Documentation/controllers/resource_counter.txt +0 -0
similarity index 100%
rename from Documentation/controllers/resource_counter.txt
rename to Documentation/cgroups/resource_counter.txt
Documentation/scheduler/sched-design-CFS.txt +1 -1
index 8398ca4..6f33593 100644
@@ -231,7 +231,7 @@ CPU bandwidth control purposes:
 
   This options needs CONFIG_CGROUPS to be defined, and lets the administrator
   create arbitrary groups of tasks, using the "cgroup" pseudo filesystem.  See
-   Documentation/cgroups.txt for more information about this filesystem.
+   Documentation/cgroups/cgroups.txt for more information about this filesystem.
 
 Only one of these options to group tasks can be chosen and not both.
 
include/linux/res_counter.h +1 -1
index dede0a2..4c5bcf6 100644
@@ -9,7 +9,7 @@
 *
 * Author: Pavel Emelianov <[email protected]>
 *
- * See Documentation/controllers/resource_counter.txt for more
+ * See Documentation/cgroups/resource_counter.txt for more
 * info about what this counter is.
 */
 
init/Kconfig +4 -5
index 56fd93c..2af8382 100644
@@ -323,8 +323,8 @@ config CGROUP_SCHED
         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.
+         Refer to Documentation/cgroups/cgroups.txt for more
+         information on "cgroup" pseudo filesystem.
 
 endchoice
 
@@ -335,10 +335,9 @@ menuconfig CGROUPS
         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)
+               - Documentation/cgroups/ (features for grouping, isolation
+                                         and resource control)
 
         Say N if unsure.
 
kernel/cpuset.c +1 -1
index 647c77a..a856788 100644
@@ -568,7 +568,7 @@ update_domain_attr_tree(struct sched_domain_attr *dattr, struct cpuset *c)
 * load balancing domains (sched domains) as specified by that partial
 * partition.
 *
- * See "What is sched_load_balance" in Documentation/cpusets.txt
+ * See "What is sched_load_balance" in Documentation/cgroups/cpusets.txt
 * for a background explanation of this.
 *
 * Does not return errors, on the theory that the callers of this
Acked-by
#4 lore raw
In reply to a message not in the archive

Documentation/cgroups/cgroups.txt

Quoted 25 lines · Li Zefan

Move Documentation/cpusets.txt and Documentation/controllers/* to Documentation/cgroups/

This inlined patch is generated with git-show -M (rename detected) and is for review, and the attached one is for apply.

---
 Documentation/cgroups/cgroups.txt            |    5 +++--
 Documentation/cgroups/memcg_test.txt         |    2 +-
 Documentation/scheduler/sched-design-CFS.txt |    2 +-
 include/linux/res_counter.h                  |    2 +-
 init/Kconfig                                 |    9 ++++-----
 kernel/cpuset.c                              |    2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename Documentation/{controllers => cgroups}/cpuacct.txt (100%)
 rename Documentation/{ => cgroups}/cpusets.txt (100%)
 rename Documentation/{controllers => cgroups}/devices.txt (100%)
 rename Documentation/{controllers => cgroups}/memcg_test.txt (99%)
 rename Documentation/{controllers => cgroups}/memory.txt (100%)
 rename Documentation/{controllers => cgroups}/resource_counter.txt (100%)
Documentation/cgroups/cgroups.txt +0 -0
index e33ee74..d9e5d6f 100644

I think it is a good idea to consolidate it all in one place.

Signature · 1 line
	Balbir
Acked-by on v1 1/1
#5 lore raw
In reply to Li Zefan
Quoted 7 lines · On Fri, 09 Jan 2009 10:16:35 +0800 Li Zefan <[email protected]> wrote:

Move Documentation/cpusets.txt and Documentation/controllers/* to Documentation/cgroups/

This inlined patch is generated with git-show -M (rename detected) and is for review, and the attached one is for apply.

Oh, I love this patch. Thank you!

(about memcg part)

Quoted 143 lines
---
 Documentation/cgroups/cgroups.txt            |    5 +++--
 Documentation/cgroups/memcg_test.txt         |    2 +-
 Documentation/scheduler/sched-design-CFS.txt |    2 +-
 include/linux/res_counter.h                  |    2 +-
 init/Kconfig                                 |    9 ++++-----
 kernel/cpuset.c                              |    2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename Documentation/{controllers => cgroups}/cpuacct.txt (100%)
 rename Documentation/{ => cgroups}/cpusets.txt (100%)
 rename Documentation/{controllers => cgroups}/devices.txt (100%)
 rename Documentation/{controllers => cgroups}/memcg_test.txt (99%)
 rename Documentation/{controllers => cgroups}/memory.txt (100%)
 rename Documentation/{controllers => cgroups}/resource_counter.txt (100%)
Documentation/cgroups/cgroups.txt +3 -2
index e33ee74..d9e5d6f 100644
@@ -1,7 +1,8 @@
 				CGROUPS
 				-------
 
-Written by Paul Menage <[email protected]> based on Documentation/cpusets.txt
+Written by Paul Menage <[email protected]> based on
+Documentation/cgroups/cpusets.txt
 
 Original copyright statements from cpusets.txt:
 Portions Copyright (C) 2004 BULL SA.
@@ -68,7 +69,7 @@ On their own, the only use for cgroups is for simple job
 tracking. The intention is that other subsystems hook into the generic
 cgroup support to provide new attributes for cgroups, such as
 accounting/limiting the resources which processes in a cgroup can
-access. For example, cpusets (see Documentation/cpusets.txt) allows
+access. For example, cpusets (see Documentation/cgroups/cpusets.txt) allows
 you to associate a set of CPUs and a set of memory nodes with the
 tasks in each cgroup.
 
Documentation/cgroups/cpuacct.txt renamed from Documentation/controllers/cpuacct.txt +0 -0
similarity index 100%
rename from Documentation/controllers/cpuacct.txt
rename to Documentation/cgroups/cpuacct.txt
Documentation/cgroups/cpusets.txt renamed from Documentation/cpusets.txt +0 -0
similarity index 100%
rename from Documentation/cpusets.txt
rename to Documentation/cgroups/cpusets.txt
Documentation/cgroups/devices.txt renamed from Documentation/controllers/devices.txt +0 -0
similarity index 100%
rename from Documentation/controllers/devices.txt
rename to Documentation/cgroups/devices.txt
Documentation/cgroups/memcg_test.txt renamed from Documentation/controllers/memcg_test.txt +1 -1
similarity index 99%
rename from Documentation/controllers/memcg_test.txt
rename to Documentation/cgroups/memcg_test.txt
index 08d4d3e..19533f9 100644
@@ -6,7 +6,7 @@ Because VM is getting complex (one of reasons is memcg...), memcg's behavior
 is complex. This is a document for memcg's internal behavior.
 Please note that implementation details can be changed.
 
-(*) Topics on API should be in Documentation/controllers/memory.txt)
+(*) Topics on API should be in Documentation/cgroups/memory.txt)
 
 0. How to record usage ?
    2 objects are used.
Documentation/cgroups/memory.txt renamed from Documentation/controllers/memory.txt +0 -0
similarity index 100%
rename from Documentation/controllers/memory.txt
rename to Documentation/cgroups/memory.txt
Documentation/cgroups/resource_counter.txt renamed from Documentation/controllers/resource_counter.txt +0 -0
similarity index 100%
rename from Documentation/controllers/resource_counter.txt
rename to Documentation/cgroups/resource_counter.txt
Documentation/scheduler/sched-design-CFS.txt +1 -1
index 8398ca4..6f33593 100644
@@ -231,7 +231,7 @@ CPU bandwidth control purposes:
 
    This options needs CONFIG_CGROUPS to be defined, and lets the administrator
    create arbitrary groups of tasks, using the "cgroup" pseudo filesystem.  See
-   Documentation/cgroups.txt for more information about this filesystem.
+   Documentation/cgroups/cgroups.txt for more information about this filesystem.
 
 Only one of these options to group tasks can be chosen and not both.
 
include/linux/res_counter.h +1 -1
index dede0a2..4c5bcf6 100644
@@ -9,7 +9,7 @@
  *
  * Author: Pavel Emelianov <[email protected]>
  *
- * See Documentation/controllers/resource_counter.txt for more
+ * See Documentation/cgroups/resource_counter.txt for more
  * info about what this counter is.
  */
 
init/Kconfig +4 -5
index 56fd93c..2af8382 100644
@@ -323,8 +323,8 @@ config CGROUP_SCHED
 	  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.
+	  Refer to Documentation/cgroups/cgroups.txt for more
+	  information on "cgroup" pseudo filesystem.
 
 endchoice
 
@@ -335,10 +335,9 @@ menuconfig CGROUPS
 	  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)
+		- Documentation/cgroups/ (features for grouping, isolation
+					  and resource control)
 
 	  Say N if unsure.
 
kernel/cpuset.c +1 -1
index 647c77a..a856788 100644
@@ -568,7 +568,7 @@ update_domain_attr_tree(struct sched_domain_attr *dattr, struct cpuset *c)
  * load balancing domains (sched domains) as specified by that partial
  * partition.
  *
- * See "What is sched_load_balance" in Documentation/cpusets.txt
+ * See "What is sched_load_balance" in Documentation/cgroups/cpusets.txt
  * for a background explanation of this.
  *
  * Does not return errors, on the theory that the callers of this

A message that is not in the archive (sent off-list or not yet received): 20090109112904.a002ff72.kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org

Acked-by
#7 lore raw
Quoted 9 lines · KAMEZAWA Hiroyuki
Quoted 6 lines · On Fri, 09 Jan 2009 10:16:35 +0800 Li Zefan…

Move Documentation/cpusets.txt and Documentation/controllers/* to Documentation/cgroups/

This inlined patch is generated with git-show -M (rename detected) and is for review, and the attached one is for apply.

Quoted 7 lines
Quoted 1 line

Oh, I love this patch. Thank you!

(about memcg part)

Me too

Acked-by
#8 lore raw
In reply to a message not in the archive
Quoted 10 lines · KAMEZAWA Hiroyuki
Quoted 6 lines · On Fri, 09 Jan 2009 10:16:35 +0800 Li Zefan…

Move Documentation/cpusets.txt and Documentation/controllers/* to Documentation/cgroups/

This inlined patch is generated with git-show -M (rename detected) and is for review, and the attached one is for apply.

Quoted 7 lines
Quoted 1 line

Oh, I love this patch. Thank you!

(about memcg part)

Me too

Acked-by
#9 lore raw
In reply to KAMEZAWA Hiroyuki
Quoted 10 lines · KAMEZAWA Hiroyuki
Quoted 6 lines · On Fri, 09 Jan 2009 10:16:35 +0800 Li Zefan <[email protected]> wrote:

Move Documentation/cpusets.txt and Documentation/controllers/* to Documentation/cgroups/

This inlined patch is generated with git-show -M (rename detected) and is for review, and the attached one is for apply.

Quoted 7 lines
Quoted 1 line

Oh, I love this patch. Thank you!

(about memcg part)

Me too

Acked-by on v1 1/1
#10 lore raw
In reply to Li Zefan
Quoted 7 lines · Li Zefan

Move Documentation/cpusets.txt and Documentation/controllers/* to Documentation/cgroups/

This inlined patch is generated with git-show -M (rename detected) and is for review, and the attached one is for apply.

Thanks.

Quoted 143 lines
---
 Documentation/cgroups/cgroups.txt            |    5 +++--
 Documentation/cgroups/memcg_test.txt         |    2 +-
 Documentation/scheduler/sched-design-CFS.txt |    2 +-
 include/linux/res_counter.h                  |    2 +-
 init/Kconfig                                 |    9 ++++-----
 kernel/cpuset.c                              |    2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename Documentation/{controllers => cgroups}/cpuacct.txt (100%)
 rename Documentation/{ => cgroups}/cpusets.txt (100%)
 rename Documentation/{controllers => cgroups}/devices.txt (100%)
 rename Documentation/{controllers => cgroups}/memcg_test.txt (99%)
 rename Documentation/{controllers => cgroups}/memory.txt (100%)
 rename Documentation/{controllers => cgroups}/resource_counter.txt (100%)
Documentation/cgroups/cgroups.txt +3 -2
index e33ee74..d9e5d6f 100644
@@ -1,7 +1,8 @@
                               CGROUPS
                               -------
 
-Written by Paul Menage <[email protected]> based on Documentation/cpusets.txt
+Written by Paul Menage <[email protected]> based on
+Documentation/cgroups/cpusets.txt
 
 Original copyright statements from cpusets.txt:
 Portions Copyright (C) 2004 BULL SA.
@@ -68,7 +69,7 @@ On their own, the only use for cgroups is for simple job
 tracking. The intention is that other subsystems hook into the generic
 cgroup support to provide new attributes for cgroups, such as
 accounting/limiting the resources which processes in a cgroup can
-access. For example, cpusets (see Documentation/cpusets.txt) allows
+access. For example, cpusets (see Documentation/cgroups/cpusets.txt) allows
 you to associate a set of CPUs and a set of memory nodes with the
 tasks in each cgroup.
 
Documentation/cgroups/cpuacct.txt renamed from Documentation/controllers/cpuacct.txt +0 -0
similarity index 100%
rename from Documentation/controllers/cpuacct.txt
rename to Documentation/cgroups/cpuacct.txt
Documentation/cgroups/cpusets.txt renamed from Documentation/cpusets.txt +0 -0
similarity index 100%
rename from Documentation/cpusets.txt
rename to Documentation/cgroups/cpusets.txt
Documentation/cgroups/devices.txt renamed from Documentation/controllers/devices.txt +0 -0
similarity index 100%
rename from Documentation/controllers/devices.txt
rename to Documentation/cgroups/devices.txt
Documentation/cgroups/memcg_test.txt renamed from Documentation/controllers/memcg_test.txt +1 -1
similarity index 99%
rename from Documentation/controllers/memcg_test.txt
rename to Documentation/cgroups/memcg_test.txt
index 08d4d3e..19533f9 100644
@@ -6,7 +6,7 @@ Because VM is getting complex (one of reasons is memcg...), memcg's behavior
 is complex. This is a document for memcg's internal behavior.
 Please note that implementation details can be changed.
 
-(*) Topics on API should be in Documentation/controllers/memory.txt)
+(*) Topics on API should be in Documentation/cgroups/memory.txt)
 
 0. How to record usage ?
   2 objects are used.
Documentation/cgroups/memory.txt renamed from Documentation/controllers/memory.txt +0 -0
similarity index 100%
rename from Documentation/controllers/memory.txt
rename to Documentation/cgroups/memory.txt
Documentation/cgroups/resource_counter.txt renamed from Documentation/controllers/resource_counter.txt +0 -0
similarity index 100%
rename from Documentation/controllers/resource_counter.txt
rename to Documentation/cgroups/resource_counter.txt
Documentation/scheduler/sched-design-CFS.txt +1 -1
index 8398ca4..6f33593 100644
@@ -231,7 +231,7 @@ CPU bandwidth control purposes:
 
   This options needs CONFIG_CGROUPS to be defined, and lets the administrator
   create arbitrary groups of tasks, using the "cgroup" pseudo filesystem.  See
-   Documentation/cgroups.txt for more information about this filesystem.
+   Documentation/cgroups/cgroups.txt for more information about this filesystem.
 
 Only one of these options to group tasks can be chosen and not both.
 
include/linux/res_counter.h +1 -1
index dede0a2..4c5bcf6 100644
@@ -9,7 +9,7 @@
 *
 * Author: Pavel Emelianov <[email protected]>
 *
- * See Documentation/controllers/resource_counter.txt for more
+ * See Documentation/cgroups/resource_counter.txt for more
 * info about what this counter is.
 */
 
init/Kconfig +4 -5
index 56fd93c..2af8382 100644
@@ -323,8 +323,8 @@ config CGROUP_SCHED
         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.
+         Refer to Documentation/cgroups/cgroups.txt for more
+         information on "cgroup" pseudo filesystem.
 
 endchoice
 
@@ -335,10 +335,9 @@ menuconfig CGROUPS
         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)
+               - Documentation/cgroups/ (features for grouping, isolation
+                                         and resource control)
 
         Say N if unsure.
 
kernel/cpuset.c +1 -1
index 647c77a..a856788 100644
@@ -568,7 +568,7 @@ update_domain_attr_tree(struct sched_domain_attr *dattr, struct cpuset *c)
 * load balancing domains (sched domains) as specified by that partial
 * partition.
 *
- * See "What is sched_load_balance" in Documentation/cpusets.txt
+ * See "What is sched_load_balance" in Documentation/cgroups/cpusets.txt
 * for a background explanation of this.
 *
 * Does not return errors, on the theory that the callers of this
Acked-by on v1 1/1
#11 lore raw
In reply to Li Zefan

Documentation/cgroups/cgroups.txt

Quoted 25 lines · Li Zefan

Move Documentation/cpusets.txt and Documentation/controllers/* to Documentation/cgroups/

This inlined patch is generated with git-show -M (rename detected) and is for review, and the attached one is for apply.

---
 Documentation/cgroups/cgroups.txt            |    5 +++--
 Documentation/cgroups/memcg_test.txt         |    2 +-
 Documentation/scheduler/sched-design-CFS.txt |    2 +-
 include/linux/res_counter.h                  |    2 +-
 init/Kconfig                                 |    9 ++++-----
 kernel/cpuset.c                              |    2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename Documentation/{controllers => cgroups}/cpuacct.txt (100%)
 rename Documentation/{ => cgroups}/cpusets.txt (100%)
 rename Documentation/{controllers => cgroups}/devices.txt (100%)
 rename Documentation/{controllers => cgroups}/memcg_test.txt (99%)
 rename Documentation/{controllers => cgroups}/memory.txt (100%)
 rename Documentation/{controllers => cgroups}/resource_counter.txt (100%)
Documentation/cgroups/cgroups.txt +0 -0
index e33ee74..d9e5d6f 100644

I think it is a good idea to consolidate it all in one place.

Signature · 1 line
	Balbir

A message that is not in the archive (sent off-list or not yet received): 20090109223442.GO9737-SINUvgVNF2CyUtPGxGje5AC/[email protected]

#13 lore raw
Quoted 25 lines · On Sat, 10 Jan 2009 04:04:42 +0530 Balbir Singh wrote:
Quoted 23 lines · Li Zefan

Move Documentation/cpusets.txt and Documentation/controllers/* to Documentation/cgroups/

This inlined patch is generated with git-show -M (rename detected) and is for review, and the attached one is for apply.

---
 Documentation/cgroups/cgroups.txt            |    5 +++--
 Documentation/cgroups/memcg_test.txt         |    2 +-
 Documentation/scheduler/sched-design-CFS.txt |    2 +-
 include/linux/res_counter.h                  |    2 +-
 init/Kconfig                                 |    9 ++++-----
 kernel/cpuset.c                              |    2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename Documentation/{controllers => cgroups}/cpuacct.txt (100%)
 rename Documentation/{ => cgroups}/cpusets.txt (100%)
 rename Documentation/{controllers => cgroups}/devices.txt (100%)
 rename Documentation/{controllers => cgroups}/memcg_test.txt (99%)
 rename Documentation/{controllers => cgroups}/memory.txt (100%)
 rename Documentation/{controllers => cgroups}/resource_counter.txt (100%)
Quoted 4 lines

Documentation/cgroups/cgroups.txt

Quoted 2 lines
Documentation/cgroups/cgroups.txt +0 -0
index e33ee74..d9e5d6f 100644

I think it is a good idea to consolidate it all in one place.

I'm for that also, but I thought that cpusets existed regardless of cgroups/controllers. Maybe I'm wrong?

Quoted 1 line

---
~Randy

#14 lore raw
In reply to Balbir Singh
Quoted 25 lines · On Sat, 10 Jan 2009 04:04:42 +0530 Balbir Singh wrote:
Quoted 23 lines · Li Zefan

Move Documentation/cpusets.txt and Documentation/controllers/* to Documentation/cgroups/

This inlined patch is generated with git-show -M (rename detected) and is for review, and the attached one is for apply.

---
 Documentation/cgroups/cgroups.txt            |    5 +++--
 Documentation/cgroups/memcg_test.txt         |    2 +-
 Documentation/scheduler/sched-design-CFS.txt |    2 +-
 include/linux/res_counter.h                  |    2 +-
 init/Kconfig                                 |    9 ++++-----
 kernel/cpuset.c                              |    2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename Documentation/{controllers => cgroups}/cpuacct.txt (100%)
 rename Documentation/{ => cgroups}/cpusets.txt (100%)
 rename Documentation/{controllers => cgroups}/devices.txt (100%)
 rename Documentation/{controllers => cgroups}/memcg_test.txt (99%)
 rename Documentation/{controllers => cgroups}/memory.txt (100%)
 rename Documentation/{controllers => cgroups}/resource_counter.txt (100%)
Quoted 4 lines

Documentation/cgroups/cgroups.txt

Quoted 2 lines
Documentation/cgroups/cgroups.txt +0 -0
index e33ee74..d9e5d6f 100644

I think it is a good idea to consolidate it all in one place.

I'm for that also, but I thought that cpusets existed regardless of cgroups/controllers. Maybe I'm wrong?

Quoted 1 line

---
~Randy

#15 lore raw
Quoted 4 lines · Randy Dunlap

I'm for that also, but I thought that cpusets existed regardless of cgroups/controllers. Maybe I'm wrong?

Cpusets is just a client subsystem of cgroups.

Paul