Commit 045395d8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1a1e0989 3ab67a9c

Documentation/admin-guide/cgroup-v1/cpusets.rst

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ files describing that cpuset: 
 - cpuset.mem_hardwall flag:  is memory allocation hardwalled

 - 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_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_relax_domain_level: the searching range when migrating tasks

Documentation/admin-guide/cgroup-v1/hugetlb.rst

+12 −8
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ files include:: 


1. Page fault accounting



::



  hugetlb.<hugepagesize>.limit_in_bytes

  hugetlb.<hugepagesize>.max_usage_in_bytes

  hugetlb.<hugepagesize>.usage_in_bytes
@@ -82,6 +84,8 @@ getting SIGBUS. 


2. Reservation accounting



::



  hugetlb.<hugepagesize>.rsvd.limit_in_bytes

  hugetlb.<hugepagesize>.rsvd.max_usage_in_bytes

  hugetlb.<hugepagesize>.rsvd.usage_in_bytes

include/linux/cpuset.h

+0 −10
Original line number Diff line number Diff line
@@ -121,11 +121,6 @@ static inline int cpuset_do_page_mem_spread(void) 
	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 void rebuild_sched_domains(void);
@@ -264,11 +259,6 @@ static inline int cpuset_do_page_mem_spread(void) 
	return 0;

}



static inline int cpuset_do_slab_mem_spread(void)

{

	return 0;

}



static inline bool current_cpuset_is_being_rebound(void)

{

	return false;

kernel/cgroup/cpuset.c

+1 −0
Original line number Diff line number Diff line
@@ -3897,6 +3897,7 @@ static struct cftype legacy_files[] = { 
	},



	{

		/* obsolete, may be removed in the future */

		.name = "memory_spread_slab",

		.read_u64 = cpuset_read_u64,

		.write_u64 = cpuset_write_u64,