Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'cgroup-for-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

Pull cgroup updates from Tejun Heo:
"A quiet cycle. One trivial doc update patch. Two patches to drop the
now defunct memory_spread_slab feature from cgroup1 cpuset"

* tag 'cgroup-for-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup/cpuset: Mark memory_spread_slab as obsolete
cgroup/cpuset: Remove cpuset_do_slab_mem_spread()
docs: cgroup-v1: add missing code-block tags

+14 -19
+1 -1
Documentation/admin-guide/cgroup-v1/cpusets.rst
··· 179 179 - cpuset.mem_hardwall flag: is memory allocation hardwalled 180 180 - cpuset.memory_pressure: measure of how much paging pressure in cpuset 181 181 - cpuset.memory_spread_page flag: if set, spread page cache evenly on allowed nodes 182 - - cpuset.memory_spread_slab flag: if set, spread slab cache evenly on allowed nodes 182 + - cpuset.memory_spread_slab flag: OBSOLETE. Doesn't have any function. 183 183 - cpuset.sched_load_balance flag: if set, load balance within CPUs on that cpuset 184 184 - cpuset.sched_relax_domain_level: the searching range when migrating tasks 185 185
+12 -8
Documentation/admin-guide/cgroup-v1/hugetlb.rst
··· 65 65 66 66 1. Page fault accounting 67 67 68 - hugetlb.<hugepagesize>.limit_in_bytes 69 - hugetlb.<hugepagesize>.max_usage_in_bytes 70 - hugetlb.<hugepagesize>.usage_in_bytes 71 - hugetlb.<hugepagesize>.failcnt 68 + :: 69 + 70 + hugetlb.<hugepagesize>.limit_in_bytes 71 + hugetlb.<hugepagesize>.max_usage_in_bytes 72 + hugetlb.<hugepagesize>.usage_in_bytes 73 + hugetlb.<hugepagesize>.failcnt 72 74 73 75 The HugeTLB controller allows users to limit the HugeTLB usage (page fault) per 74 76 control group and enforces the limit during page fault. Since HugeTLB ··· 84 82 85 83 2. Reservation accounting 86 84 87 - hugetlb.<hugepagesize>.rsvd.limit_in_bytes 88 - hugetlb.<hugepagesize>.rsvd.max_usage_in_bytes 89 - hugetlb.<hugepagesize>.rsvd.usage_in_bytes 90 - hugetlb.<hugepagesize>.rsvd.failcnt 85 + :: 86 + 87 + hugetlb.<hugepagesize>.rsvd.limit_in_bytes 88 + hugetlb.<hugepagesize>.rsvd.max_usage_in_bytes 89 + hugetlb.<hugepagesize>.rsvd.usage_in_bytes 90 + hugetlb.<hugepagesize>.rsvd.failcnt 91 91 92 92 The HugeTLB controller allows to limit the HugeTLB reservations per control 93 93 group and enforces the controller limit at reservation time and at the fault of
-10
include/linux/cpuset.h
··· 121 121 return task_spread_page(current); 122 122 } 123 123 124 - static inline int cpuset_do_slab_mem_spread(void) 125 - { 126 - return task_spread_slab(current); 127 - } 128 - 129 124 extern bool current_cpuset_is_being_rebound(void); 130 125 131 126 extern void rebuild_sched_domains(void); ··· 255 260 } 256 261 257 262 static inline int cpuset_do_page_mem_spread(void) 258 - { 259 - return 0; 260 - } 261 - 262 - static inline int cpuset_do_slab_mem_spread(void) 263 263 { 264 264 return 0; 265 265 }
+1
kernel/cgroup/cpuset.c
··· 3897 3897 }, 3898 3898 3899 3899 { 3900 + /* obsolete, may be removed in the future */ 3900 3901 .name = "memory_spread_slab", 3901 3902 .read_u64 = cpuset_read_u64, 3902 3903 .write_u64 = cpuset_write_u64,