Commit 5a6a09e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull cgroup updates from Tejun Heo:

 - cpuset now supports remote partitions where CPUs can be reserved for
   exclusive use down the tree without requiring all the intermediate
   nodes to be partitions. This makes it easier to use partitions
   without modifying existing cgroup hierarchy.

 - cpuset partition configuration behavior improvement

 - cgroup_favordynmods= boot param added to allow setting the flag on
   boot on cgroup1

 - Misc code and doc updates

* tag 'cgroup-for-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  docs/cgroup: Add the list of threaded controllers to cgroup-v2.rst
  cgroup: use legacy_name for cgroup v1 disable info
  cgroup/cpuset: Cleanup signedness issue in cpu_exclusive_check()
  cgroup/cpuset: Enable invalid to valid local partition transition
  cgroup: add cgroup_favordynmods= command-line option
  cgroup/cpuset: Extend test_cpuset_prs.sh to test remote partition
  cgroup/cpuset: Documentation update for partition
  cgroup/cpuset: Check partition conflict with housekeeping setup
  cgroup/cpuset: Introduce remote partition
  cgroup/cpuset: Add cpuset.cpus.exclusive for v2
  cgroup/cpuset: Add cpuset.cpus.exclusive.effective for v2
  cgroup/cpuset: Fix load balance state in update_partition_sd_lb()
  cgroup: Avoid extra dereference in css_populate_dir()
  cgroup: Check for ret during cgroup1_base_files cft addition
parents 866b8870 a41796b5

Documentation/admin-guide/cgroup-v2.rst

+98 −32
Original line number Diff line number Diff line
@@ -364,6 +364,13 @@ constraint, a threaded controller must be able to handle competition 
between threads in a non-leaf cgroup and its child cgroups.  Each

threaded controller defines how such competitions are handled.



Currently, the following controllers are threaded and can be enabled

in a threaded cgroup::



- cpu

- cpuset

- perf_event

- pids



[Un]populated Notification

--------------------------
@@ -2226,6 +2233,49 @@ Cpuset Interface Files 


	Its value will be affected by memory nodes hotplug events.



  cpuset.cpus.exclusive

	A read-write multiple values file which exists on non-root

	cpuset-enabled cgroups.



	It lists all the exclusive CPUs that are allowed to be used

	to create a new cpuset partition.  Its value is not used

	unless the cgroup becomes a valid partition root.  See the

	"cpuset.cpus.partition" section below for a description of what

	a cpuset partition is.



	When the cgroup becomes a partition root, the actual exclusive

	CPUs that are allocated to that partition are listed in

	"cpuset.cpus.exclusive.effective" which may be different

	from "cpuset.cpus.exclusive".  If "cpuset.cpus.exclusive"

	has previously been set, "cpuset.cpus.exclusive.effective"

	is always a subset of it.



	Users can manually set it to a value that is different from

	"cpuset.cpus".	The only constraint in setting it is that the

	list of CPUs must be exclusive with respect to its sibling.



	For a parent cgroup, any one of its exclusive CPUs can only

	be distributed to at most one of its child cgroups.  Having an

	exclusive CPU appearing in two or more of its child cgroups is

	not allowed (the exclusivity rule).  A value that violates the

	exclusivity rule will be rejected with a write error.



	The root cgroup is a partition root and all its available CPUs

	are in its exclusive CPU set.



  cpuset.cpus.exclusive.effective

	A read-only multiple values file which exists on all non-root

	cpuset-enabled cgroups.



	This file shows the effective set of exclusive CPUs that

	can be used to create a partition root.  The content of this

	file will always be a subset of "cpuset.cpus" and its parent's

	"cpuset.cpus.exclusive.effective" if its parent is not the root

	cgroup.  It will also be a subset of "cpuset.cpus.exclusive"

	if it is set.  If "cpuset.cpus.exclusive" is not set, it is

	treated to have an implicit value of "cpuset.cpus" in the

	formation of local partition.



  cpuset.cpus.partition

	A read-write single value file which exists on non-root

	cpuset-enabled cgroups.  This flag is owned by the parent cgroup
@@ -2239,26 +2289,41 @@ Cpuset Interface Files 
	  "isolated"	Partition root without load balancing

	  ==========	=====================================



	The root cgroup is always a partition root and its state

	cannot be changed.  All other non-root cgroups start out as

	"member".

	A cpuset partition is a collection of cpuset-enabled cgroups with

	a partition root at the top of the hierarchy and its descendants

	except those that are separate partition roots themselves and

	their descendants.  A partition has exclusive access to the

	set of exclusive CPUs allocated to it.	Other cgroups outside

	of that partition cannot use any CPUs in that set.



	There are two types of partitions - local and remote.  A local

	partition is one whose parent cgroup is also a valid partition

	root.  A remote partition is one whose parent cgroup is not a

	valid partition root itself.  Writing to "cpuset.cpus.exclusive"

	is optional for the creation of a local partition as its

	"cpuset.cpus.exclusive" file will assume an implicit value that

	is the same as "cpuset.cpus" if it is not set.	Writing the

	proper "cpuset.cpus.exclusive" values down the cgroup hierarchy

	before the target partition root is mandatory for the creation

	of a remote partition.



	Currently, a remote partition cannot be created under a local

	partition.  All the ancestors of a remote partition root except

	the root cgroup cannot be a partition root.



	The root cgroup is always a partition root and its state cannot

	be changed.  All other non-root cgroups start out as "member".



	When set to "root", the current cgroup is the root of a new

	partition or scheduling domain that comprises itself and all

	its descendants except those that are separate partition roots

	themselves and their descendants.

	partition or scheduling domain.  The set of exclusive CPUs is

	determined by the value of its "cpuset.cpus.exclusive.effective".



	When set to "isolated", the CPUs in that partition root will

	When set to "isolated", the CPUs in that partition will

	be in an isolated state without any load balancing from the

	scheduler.  Tasks placed in such a partition with multiple

	CPUs should be carefully distributed and bound to each of the

	individual CPUs for optimal performance.



	The value shown in "cpuset.cpus.effective" of a partition root

	is the CPUs that the partition root can dedicate to a potential

	new child partition root. The new child subtracts available

	CPUs from its parent "cpuset.cpus.effective".



	A partition root ("root" or "isolated") can be in one of the

	two possible states - valid or invalid.  An invalid partition

	root is in a degraded state where some state information may
@@ -2281,37 +2346,33 @@ Cpuset Interface Files 
	In the case of an invalid partition root, a descriptive string on

	why the partition is invalid is included within parentheses.



	For a partition root to become valid, the following conditions

	For a local partition root to be valid, the following conditions

	must be met.



	1) The "cpuset.cpus" is exclusive with its siblings , i.e. they

	   are not shared by any of its siblings (exclusivity rule).

	2) The parent cgroup is a valid partition root.

	3) The "cpuset.cpus" is not empty and must contain at least

	   one of the CPUs from parent's "cpuset.cpus", i.e. they overlap.

	4) The "cpuset.cpus.effective" cannot be empty unless there is

	1) The parent cgroup is a valid partition root.

	2) The "cpuset.cpus.exclusive.effective" file cannot be empty,

	   though it may contain offline CPUs.

	3) The "cpuset.cpus.effective" cannot be empty unless there is

	   no task associated with this partition.



	External events like hotplug or changes to "cpuset.cpus" can

	cause a valid partition root to become invalid and vice versa.

	Note that a task cannot be moved to a cgroup with empty

	"cpuset.cpus.effective".

	For a remote partition root to be valid, all the above conditions

	except the first one must be met.



	For a valid partition root with the sibling cpu exclusivity

	rule enabled, changes made to "cpuset.cpus" that violate the

	exclusivity rule will invalidate the partition as well as its

	sibling partitions with conflicting cpuset.cpus values. So

	care must be taking in changing "cpuset.cpus".

	External events like hotplug or changes to "cpuset.cpus" or

	"cpuset.cpus.exclusive" can cause a valid partition root to

	become invalid and vice versa.	Note that a task cannot be

	moved to a cgroup with empty "cpuset.cpus.effective".



	A valid non-root parent partition may distribute out all its CPUs

	to its child partitions when there is no task associated with it.

	to its child local partitions when there is no task associated

	with it.



	Care must be taken to change a valid partition root to

	"member" as all its child partitions, if present, will become

	Care must be taken to change a valid partition root to "member"

	as all its child local partitions, if present, will become

	invalid causing disruption to tasks running in those child

	partitions. These inactivated partitions could be recovered if

	their parent is switched back to a partition root with a proper

	set of "cpuset.cpus".

	value in "cpuset.cpus" or "cpuset.cpus.exclusive".



	Poll and inotify events are triggered whenever the state of

	"cpuset.cpus.partition" changes.  That includes changes caused
@@ -2321,6 +2382,11 @@ Cpuset Interface Files 
	to "cpuset.cpus.partition" without the need to do continuous

	polling.



	A user can pre-configure certain CPUs to an isolated state

	with load balancing disabled at boot time with the "isolcpus"

	kernel boot command line option.  If those CPUs are to be put

	into a partition, they have to be used in an isolated partition.





Device controller

-----------------

Documentation/admin-guide/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -580,6 +580,10 @@ 
			named mounts. Specifying both "all" and "named" disables

			all v1 hierarchies.



	cgroup_favordynmods= [KNL] Enable or Disable favordynmods.

			Format: { "true" | "false" }

			Defaults to the value of CONFIG_CGROUP_FAVOR_DYNMODS.



	cgroup.memory=	[KNL] Pass options to the cgroup memory controller.

			Format: <string>

			nosocket -- Disable socket memory accounting.

kernel/cgroup/cgroup.c

+21 −9
Original line number Diff line number Diff line
@@ -207,6 +207,8 @@ static u16 have_exit_callback __read_mostly; 
static u16 have_release_callback __read_mostly;

static u16 have_canfork_callback __read_mostly;



static bool have_favordynmods __ro_after_init = IS_ENABLED(CONFIG_CGROUP_FAVOR_DYNMODS);



/* cgroup namespace for init task */

struct cgroup_namespace init_cgroup_ns = {

	.ns.count	= REFCOUNT_INIT(2),
@@ -1350,7 +1352,9 @@ static void cgroup_destroy_root(struct cgroup_root *root) 
		cgroup_root_count--;

	}



	if (!have_favordynmods)

		cgroup_favor_dynmods(root, false);



	cgroup_exit_root_id(root);



	cgroup_unlock();
@@ -1719,20 +1723,22 @@ static int css_populate_dir(struct cgroup_subsys_state *css) 


	if (!css->ss) {

		if (cgroup_on_dfl(cgrp)) {

			ret = cgroup_addrm_files(&cgrp->self, cgrp,

			ret = cgroup_addrm_files(css, cgrp,

						 cgroup_base_files, true);

			if (ret < 0)

				return ret;



			if (cgroup_psi_enabled()) {

				ret = cgroup_addrm_files(&cgrp->self, cgrp,

				ret = cgroup_addrm_files(css, cgrp,

							 cgroup_psi_files, true);

				if (ret < 0)

					return ret;

			}

		} else {

			cgroup_addrm_files(css, cgrp,

			ret = cgroup_addrm_files(css, cgrp,

						 cgroup1_base_files, true);

			if (ret < 0)

				return ret;

		}

	} else {

		list_for_each_entry(cfts, &css->ss->cfts, node) {
@@ -2243,9 +2249,9 @@ static int cgroup_init_fs_context(struct fs_context *fc) 
	fc->user_ns = get_user_ns(ctx->ns->user_ns);

	fc->global = true;



#ifdef CONFIG_CGROUP_FAVOR_DYNMODS

	if (have_favordynmods)

		ctx->flags |= CGRP_ROOT_FAVOR_DYNMODS;

#endif



	return 0;

}
@@ -6121,7 +6127,7 @@ int __init cgroup_init(void) 


		if (cgroup1_ssid_disabled(ssid))

			pr_info("Disabling %s control group subsystem in v1 mounts\n",

				ss->name);

				ss->legacy_name);



		cgrp_dfl_root.subsys_mask |= 1 << ss->id;
@@ -6764,6 +6770,12 @@ static int __init enable_cgroup_debug(char *str) 
}

__setup("cgroup_debug", enable_cgroup_debug);



static int __init cgroup_favordynmods_setup(char *str)

{

	return (kstrtobool(str, &have_favordynmods) == 0);

}

__setup("cgroup_favordynmods=", cgroup_favordynmods_setup);



/**

 * css_tryget_online_from_dir - get corresponding css from a cgroup dentry

 * @dentry: directory dentry of interest

kernel/cgroup/cpuset.c

+980 −326

File changed.

Preview size limit exceeded, changes collapsed.

tools/testing/selftests/cgroup/test_cpuset_prs.sh

+325 −142

File changed.

Preview size limit exceeded, changes collapsed.