diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-28 04:47:42 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-28 04:47:42 +0300 |
| commit | 55e6be657b8d774d9a2e67363e5bcbbaf80fdc28 (patch) | |
| tree | 30929e4dcfa6b262fcd23a91033b192a087be87d /Documentation/admin-guide/cgroup-v1 | |
| parent | eb6bbacc46720b8b36eb85b2cdd91b9e691959e4 (diff) | |
| parent | ffeee417d97f9171bce9f43c22c9f477e4c84f54 (diff) | |
| download | linux-55e6be657b8d774d9a2e67363e5bcbbaf80fdc28.tar.xz | |
Merge branch 'for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup changes from Tejun Heo:
"The only notable change is Vipin's new misc cgroup controller.
This implements generic support for resources which can be controlled
by simply counting and limiting the number of resource instances - ie
there's X number of these on the system and this cgroup subtree can
have upto Y of those.
The first user is the address space IDs used for virtual machine
memory encryption and expected future usages are similar - niche
hardware features with concrete resource limits and simple usage
models"
* 'for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup: use tsk->in_iowait instead of delayacct_is_task_waiting_on_io()
cgroup/cpuset: fix typos in comments
cgroup: misc: mark dummy misc_cg_res_total_usage() static inline
svm/sev: Register SEV and SEV-ES ASIDs to the misc controller
cgroup: Miscellaneous cgroup documentation.
cgroup: Add misc cgroup controller
Diffstat (limited to 'Documentation/admin-guide/cgroup-v1')
| -rw-r--r-- | Documentation/admin-guide/cgroup-v1/index.rst | 1 | ||||
| -rw-r--r-- | Documentation/admin-guide/cgroup-v1/misc.rst | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/admin-guide/cgroup-v1/index.rst b/Documentation/admin-guide/cgroup-v1/index.rst index 226f64473e8e..99fbc8a64ba9 100644 --- a/Documentation/admin-guide/cgroup-v1/index.rst +++ b/Documentation/admin-guide/cgroup-v1/index.rst @@ -17,6 +17,7 @@ Control Groups version 1 hugetlb memcg_test memory + misc net_cls net_prio pids diff --git a/Documentation/admin-guide/cgroup-v1/misc.rst b/Documentation/admin-guide/cgroup-v1/misc.rst new file mode 100644 index 000000000000..661614c24df3 --- /dev/null +++ b/Documentation/admin-guide/cgroup-v1/misc.rst @@ -0,0 +1,4 @@ +=============== +Misc controller +=============== +Please refer "Misc" documentation in Documentation/admin-guide/cgroup-v2.rst |