tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2024-03-11 13:13:22 -07:00
parent 1a1e09890c 3ab67a9ce8
commit 045395d86a
4 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/admin-guide/cgroup-v1/cpusets.rst
+1 -1
View File
@@ -179,7 +179,7 @@ files describing that cpuset:
- cpuset.mem_hardwall flag: is memory allocation hardwalled - cpuset.mem_hardwall flag: is memory allocation hardwalled
- cpuset.memory_pressure: measure of how much paging pressure in cpuset - cpuset.memory_pressure: measure of how much paging pressure in cpuset
- cpuset.memory_spread_page flag: if set, spread page cache evenly on allowed nodes - cpuset.memory_spread_page flag: if set, spread page cache evenly on allowed nodes
- cpuset.memory_spread_slab flag: if set, spread slab cache evenly on allowed nodes - cpuset.memory_spread_slab flag: OBSOLETE. Doesn't have any function.
- cpuset.sched_load_balance flag: if set, load balance within CPUs on that cpuset - cpuset.sched_load_balance flag: if set, load balance within CPUs on that cpuset
- cpuset.sched_relax_domain_level: the searching range when migrating tasks - cpuset.sched_relax_domain_level: the searching range when migrating tasks
Documentation/admin-guide/cgroup-v1/hugetlb.rst
+12 -8
View File
@@ -65,10 +65,12 @@ files include::
1. Page fault accounting 1. Page fault accounting
hugetlb.<hugepagesize>.limit_in_bytes ::
hugetlb.<hugepagesize>.max_usage_in_bytes
hugetlb.<hugepagesize>.usage_in_bytes hugetlb.<hugepagesize>.limit_in_bytes
hugetlb.<hugepagesize>.failcnt hugetlb.<hugepagesize>.max_usage_in_bytes
hugetlb.<hugepagesize>.usage_in_bytes
hugetlb.<hugepagesize>.failcnt
The HugeTLB controller allows users to limit the HugeTLB usage (page fault) per The HugeTLB controller allows users to limit the HugeTLB usage (page fault) per
control group and enforces the limit during page fault. Since HugeTLB control group and enforces the limit during page fault. Since HugeTLB
@@ -82,10 +84,12 @@ getting SIGBUS.
2. Reservation accounting 2. Reservation accounting
hugetlb.<hugepagesize>.rsvd.limit_in_bytes ::
hugetlb.<hugepagesize>.rsvd.max_usage_in_bytes
hugetlb.<hugepagesize>.rsvd.usage_in_bytes hugetlb.<hugepagesize>.rsvd.limit_in_bytes
hugetlb.<hugepagesize>.rsvd.failcnt hugetlb.<hugepagesize>.rsvd.max_usage_in_bytes
hugetlb.<hugepagesize>.rsvd.usage_in_bytes
hugetlb.<hugepagesize>.rsvd.failcnt
The HugeTLB controller allows to limit the HugeTLB reservations per control The HugeTLB controller allows to limit the HugeTLB reservations per control
group and enforces the controller limit at reservation time and at the fault of group and enforces the controller limit at reservation time and at the fault of
include/linux/cpuset.h
-10
View File
@@ -121,11 +121,6 @@ static inline int cpuset_do_page_mem_spread(void)
return task_spread_page(current); return task_spread_page(current);
} }
static inline int cpuset_do_slab_mem_spread(void)
{
return task_spread_slab(current);
}
extern bool current_cpuset_is_being_rebound(void); extern bool current_cpuset_is_being_rebound(void);
extern void rebuild_sched_domains(void); extern void rebuild_sched_domains(void);
@@ -264,11 +259,6 @@ static inline int cpuset_do_page_mem_spread(void)
return 0; return 0;
} }
static inline int cpuset_do_slab_mem_spread(void)
{
return 0;
}
static inline bool current_cpuset_is_being_rebound(void) static inline bool current_cpuset_is_being_rebound(void)
{ {
return false; return false;
kernel/cgroup/cpuset.c
+1
View File
@@ -3897,6 +3897,7 @@ static struct cftype legacy_files[] = {
}, },
{ {
/* obsolete, may be removed in the future */
.name = "memory_spread_slab", .name = "memory_spread_slab",
.read_u64 = cpuset_read_u64, .read_u64 = cpuset_read_u64,
.write_u64 = cpuset_write_u64, .write_u64 = cpuset_write_u64,