mirror of https://gitee.com/openkylin/linux.git
cpuset: Minor cgroup2 interface updates
* Rename the partition file from "cpuset.sched.partition" to "cpuset.cpus.partition". * When writing to the partition file, drop "0" and "1" and only accept "member" and "root". Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Waiman Long <longman@redhat.com>
This commit is contained in:
parent
5cf8114d6e
commit
b1e3aeb11c
|
@ -1708,15 +1708,15 @@ Cpuset Interface Files
|
||||||
|
|
||||||
Its value will be affected by memory nodes hotplug events.
|
Its value will be affected by memory nodes hotplug events.
|
||||||
|
|
||||||
cpuset.sched.partition
|
cpuset.cpus.partition
|
||||||
A read-write single value file which exists on non-root
|
A read-write single value file which exists on non-root
|
||||||
cpuset-enabled cgroups. This flag is owned by the parent cgroup
|
cpuset-enabled cgroups. This flag is owned by the parent cgroup
|
||||||
and is not delegatable.
|
and is not delegatable.
|
||||||
|
|
||||||
It accepts only the following input values when written to.
|
It accepts only the following input values when written to.
|
||||||
|
|
||||||
"root" or "1" - a paritition root
|
"root" - a paritition root
|
||||||
"member" or "0" - a non-root member of a partition
|
"member" - a non-root member of a partition
|
||||||
|
|
||||||
When set to be a partition root, the current cgroup is the
|
When set to be a partition root, the current cgroup is the
|
||||||
root of a new partition or scheduling domain that comprises
|
root of a new partition or scheduling domain that comprises
|
||||||
|
|
|
@ -2468,11 +2468,11 @@ static ssize_t sched_partition_write(struct kernfs_open_file *of, char *buf,
|
||||||
buf = strstrip(buf);
|
buf = strstrip(buf);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Convert "root"/"1" to 1, and convert "member"/"0" to 0.
|
* Convert "root" to ENABLED, and convert "member" to DISABLED.
|
||||||
*/
|
*/
|
||||||
if (!strcmp(buf, "root") || !strcmp(buf, "1"))
|
if (!strcmp(buf, "root"))
|
||||||
val = PRS_ENABLED;
|
val = PRS_ENABLED;
|
||||||
else if (!strcmp(buf, "member") || !strcmp(buf, "0"))
|
else if (!strcmp(buf, "member"))
|
||||||
val = PRS_DISABLED;
|
val = PRS_DISABLED;
|
||||||
else
|
else
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
@ -2631,7 +2631,7 @@ static struct cftype dfl_files[] = {
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
.name = "sched.partition",
|
.name = "cpus.partition",
|
||||||
.seq_show = sched_partition_show,
|
.seq_show = sched_partition_show,
|
||||||
.write = sched_partition_write,
|
.write = sched_partition_write,
|
||||||
.private = FILE_PARTITION_ROOT,
|
.private = FILE_PARTITION_ROOT,
|
||||||
|
|
Loading…
Reference in New Issue