Commit 1434a312 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-5.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup 

Pull cgroup fixes from Tejun Heo:

 - "cgroup_disable=" boot param was being applied too late confusing
   some subsystems. Fix it by moving application to __setup() time.

 - Comment spelling fixes. Included here to lower the chance of trivial
   future merge conflicts.

* 'for-5.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: fix spelling mistakes
  cgroup: disable controllers at parse time
parents 5df7ae7b 08b2b6fd

include/linux/cgroup-defs.h

+3 −3
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ struct css_set { 
	struct list_head task_iters;



	/*

	 * On the default hierarhcy, ->subsys[ssid] may point to a css

	 * On the default hierarchy, ->subsys[ssid] may point to a css

	 * attached to an ancestor instead of the cgroup this css_set is

	 * associated with.  The following node is anchored at

	 * ->subsys[ssid]->cgroup->e_csets[ssid] and provides a way to
@@ -668,7 +668,7 @@ struct cgroup_subsys { 
	 */

	bool threaded:1;



	/* the following two fields are initialized automtically during boot */

	/* the following two fields are initialized automatically during boot */

	int id;

	const char *name;
@@ -757,7 +757,7 @@ static inline void cgroup_threadgroup_change_end(struct task_struct *tsk) {} 
 * sock_cgroup_data overloads (prioidx, classid) and the cgroup pointer.

 * On boot, sock_cgroup_data records the cgroup that the sock was created

 * in so that cgroup2 matches can be made; however, once either net_prio or

 * net_cls starts being used, the area is overriden to carry prioidx and/or

 * net_cls starts being used, the area is overridden to carry prioidx and/or

 * classid.  The two modes are distinguished by whether the lowest bit is

 * set.  Clear bit indicates cgroup pointer while set bit prioidx and

 * classid.

include/linux/cgroup.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ struct kernel_clone_args; 
#ifdef CONFIG_CGROUPS



/*

 * All weight knobs on the default hierarhcy should use the following min,

 * All weight knobs on the default hierarchy should use the following min,

 * default and max values.  The default value is the logarithmic center of

 * MIN and MAX and allows 100x to be expressed in both directions.

 */

kernel/cgroup/cgroup-v1.c

+1 −1
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ static int check_cgroupfs_options(struct fs_context *fc) 
	ctx->subsys_mask &= enabled;



	/*

	 * In absense of 'none', 'name=' or subsystem name options,

	 * In absence of 'none', 'name=' and subsystem name options,

	 * let's default to 'all'.

	 */

	if (!ctx->subsys_mask && !ctx->none && !ctx->name)

kernel/cgroup/cgroup.c

+9 −12
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static struct cgroup_subsys_state *cgroup_css(struct cgroup *cgrp, 
 * @cgrp: the cgroup of interest

 * @ss: the subsystem of interest

 *

 * Find and get @cgrp's css assocaited with @ss.  If the css doesn't exist

 * Find and get @cgrp's css associated with @ss.  If the css doesn't exist

 * or is offline, %NULL is returned.

 */

static struct cgroup_subsys_state *cgroup_tryget_css(struct cgroup *cgrp,
@@ -1633,7 +1633,7 @@ static void cgroup_rm_file(struct cgroup *cgrp, const struct cftype *cft) 


/**

 * css_clear_dir - remove subsys files in a cgroup directory

 * @css: taget css

 * @css: target css

 */

static void css_clear_dir(struct cgroup_subsys_state *css)

{
@@ -5350,7 +5350,7 @@ int cgroup_mkdir(struct kernfs_node *parent_kn, const char *name, umode_t mode) 
/*

 * This is called when the refcnt of a css is confirmed to be killed.

 * css_tryget_online() is now guaranteed to fail.  Tell the subsystem to

 * initate destruction and put the css ref from kill_css().

 * initiate destruction and put the css ref from kill_css().

 */

static void css_killed_work_fn(struct work_struct *work)

{
@@ -5634,8 +5634,6 @@ int __init cgroup_init_early(void) 
	return 0;

}



static u16 cgroup_disable_mask __initdata;



/**

 * cgroup_init - cgroup initialization

 *
@@ -5694,12 +5692,8 @@ int __init cgroup_init(void) 
		 * disabled flag and cftype registration needs kmalloc,

		 * both of which aren't available during early_init.

		 */

		if (cgroup_disable_mask & (1 << ssid)) {

			static_branch_disable(cgroup_subsys_enabled_key[ssid]);

			printk(KERN_INFO "Disabling %s control group subsystem\n",

			       ss->name);

		if (!cgroup_ssid_enabled(ssid))

			continue;

		}



		if (cgroup1_ssid_disabled(ssid))

			printk(KERN_INFO "Disabling %s control group subsystem in v1 mounts\n",
@@ -6058,7 +6052,7 @@ int cgroup_can_fork(struct task_struct *child, struct kernel_clone_args *kargs) 
 * @kargs: the arguments passed to create the child process

 *

 * This calls the cancel_fork() callbacks if a fork failed *after*

 * cgroup_can_fork() succeded and cleans up references we took to

 * cgroup_can_fork() succeeded and cleans up references we took to

 * prepare a new css_set for the child process in cgroup_can_fork().

 */

void cgroup_cancel_fork(struct task_struct *child,
@@ -6214,7 +6208,10 @@ static int __init cgroup_disable(char *str) 
			if (strcmp(token, ss->name) &&

			    strcmp(token, ss->legacy_name))

				continue;

			cgroup_disable_mask |= 1 << i;



			static_branch_disable(cgroup_subsys_enabled_key[i]);

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

				ss->name);

		}

	}

	return 1;

kernel/cgroup/cpuset.c

+1 −1
Original line number Diff line number Diff line
@@ -3376,7 +3376,7 @@ nodemask_t cpuset_mems_allowed(struct task_struct *tsk) 
}



/**

 * cpuset_nodemask_valid_mems_allowed - check nodemask vs. curremt mems_allowed

 * cpuset_nodemask_valid_mems_allowed - check nodemask vs. current mems_allowed

 * @nodemask: the nodemask to be checked

 *

 * Are any of the nodes in the nodemask allowed in current->mems_allowed?