Commit 05ebb6e6 authored by Tejun Heo's avatar Tejun Heo
Browse files

cgroup: make CFTYPE_ONLY_ON_DFL and CFTYPE_NO_ internal to cgroup core 



cgroup now distinguishes cftypes for the default and legacy
hierarchies more explicitly by using separate arrays and
CFTYPE_ONLY_ON_DFL and CFTYPE_INSANE should be and are used only
inside cgroup core proper.  Let's make it clear that the flags are
internal by prefixing them with double underscores.

CFTYPE_INSANE is renamed to __CFTYPE_NOT_ON_DFL for consistency.  The
two flags are also collected and assigned bits >= 16 so that they
aren't mixed with the published flags.

v2: Convert the extra ones in cgroup_exit_cftypes() which are added by
    revision to the previous patch.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarLi Zefan <lizefan@huawei.com>
parent a8ddc821

include/linux/cgroup.h

+4 −2
Original line number Diff line number Diff line
@@ -384,9 +384,11 @@ struct css_set { 
enum {

	CFTYPE_ONLY_ON_ROOT	= (1 << 0),	/* only create on root cgrp */

	CFTYPE_NOT_ON_ROOT	= (1 << 1),	/* don't create on root cgrp */

	CFTYPE_INSANE		= (1 << 2),	/* don't create if sane_behavior */

	CFTYPE_NO_PREFIX	= (1 << 3),	/* (DON'T USE FOR NEW FILES) no subsys prefix */

	CFTYPE_ONLY_ON_DFL	= (1 << 4),	/* only on default hierarchy */



	/* internal flags, do not use outside cgroup core proper */

	__CFTYPE_ONLY_ON_DFL	= (1 << 16),	/* only on default hierarchy */

	__CFTYPE_NOT_ON_DFL	= (1 << 17),	/* not on default hierarchy */

};



#define MAX_CFTYPE_NAME		64

kernel/cgroup.c

+5 −5
Original line number Diff line number Diff line
@@ -3031,9 +3031,9 @@ static int cgroup_addrm_files(struct cgroup *cgrp, struct cftype cfts[], 


	for (cft = cfts; cft->name[0] != '\0'; cft++) {

		/* does cft->flags tell us to skip this file on @cgrp? */

		if ((cft->flags & CFTYPE_ONLY_ON_DFL) && !cgroup_on_dfl(cgrp))

		if ((cft->flags & __CFTYPE_ONLY_ON_DFL) && !cgroup_on_dfl(cgrp))

			continue;

		if ((cft->flags & CFTYPE_INSANE) && cgroup_on_dfl(cgrp))

		if ((cft->flags & __CFTYPE_NOT_ON_DFL) && cgroup_on_dfl(cgrp))

			continue;

		if ((cft->flags & CFTYPE_NOT_ON_ROOT) && !cgroup_parent(cgrp))

			continue;
@@ -3093,7 +3093,7 @@ static void cgroup_exit_cftypes(struct cftype *cfts) 
		cft->ss = NULL;



		/* revert flags set by cgroup core while adding @cfts */

		cft->flags &= ~(CFTYPE_ONLY_ON_DFL | CFTYPE_INSANE);

		cft->flags &= ~(__CFTYPE_ONLY_ON_DFL | __CFTYPE_NOT_ON_DFL);

	}

}
@@ -3217,7 +3217,7 @@ int cgroup_add_dfl_cftypes(struct cgroup_subsys *ss, struct cftype *cfts) 
	struct cftype *cft;



	for (cft = cfts; cft && cft->name[0] != '\0'; cft++)

		cft->flags |= CFTYPE_ONLY_ON_DFL;

		cft->flags |= __CFTYPE_ONLY_ON_DFL;

	return cgroup_add_cftypes(ss, cfts);

}
@@ -3234,7 +3234,7 @@ int cgroup_add_legacy_cftypes(struct cgroup_subsys *ss, struct cftype *cfts) 
	struct cftype *cft;



	for (cft = cfts; cft && cft->name[0] != '\0'; cft++)

		cft->flags |= CFTYPE_INSANE;

		cft->flags |= __CFTYPE_NOT_ON_DFL;

	return cgroup_add_cftypes(ss, cfts);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE