Currently, cpuset.sched.partition returns the values, 0, 1 or -1 on
read. A person who is not familiar with the partition code may not
understand what they mean.
In order to make cpuset.sched.partition more user-friendly, it will
now display the following descriptive text on read:
"normal" - A normal cpuset, not a partition root
"partition" - A partition root
"partition invalid" - An invalid partition root
Suggested-by: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Waiman Long <longman@xxxxxxxxxx>
---
Documentation/admin-guide/cgroup-v2.rst | 12 ++++++------
kernel/cgroup/cpuset.c | 22 +++++++++++++++++++---
2 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst
index 178cda473a26..d9cc79ceb9aa 100644
--- a/Documentation/admin-guide/cgroup-v2.rst
+++ b/Documentation/admin-guide/cgroup-v2.rst
@@ -1729,15 +1729,15 @@ Cpuset Interface Files
root to change. On read, the "cpuset.sched.partition" file
can show the following values.
- "0" Not a partition root
- "1" Partition root
- "-1" Erroneous partition root
+ "normal" - Normal cpuset, not a partition root
+ "partition" - Partition root
+ "partition invalid" - Invalid partition root
It is a partition root if the first 2 partition root conditions
above are true and at least one CPU from "cpuset.cpus" is
granted by the parent cgroup.
- A partition root can become an erroneous partition root if none
+ A partition root can become an invalid partition root if none
of CPUs requested in "cpuset.cpus" can be granted by the parent
cgroup or the parent cgroup is no longer a partition root.
In this case, it is not a real partition even though the
@@ -1745,11 +1745,11 @@ Cpuset Interface Files
still apply. All the tasks in the cgroup will be migrated to
the nearest ancestor partition.
- An erroneous partition root can be transitioned back to a real
+ An invalid partition root can be transitioned back to a real
partition root if at least one of the requested CPUs can now be
granted by its parent. In this case, the tasks will be migrated
back to the newly created partition. Clearing the partition
- flag of an erroneous partition root is always allowed even if
+ flag of an invalid partition root is always allowed even if
child cpusets are present.
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index 34d47e43c98a..fe6d6366bfa7 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -2430,8 +2430,6 @@ static s64 cpuset_read_s64(struct cgroup_subsys_state *css, struct cftype *cft)
switch (type) {
case FILE_SCHED_RELAX_DOMAIN_LEVEL:
return cs->relax_domain_level;
- case FILE_PARTITION_ROOT:
- return cs->partition_root_state;
default:
BUG();
}
@@ -2440,6 +2438,24 @@ static s64 cpuset_read_s64(struct cgroup_subsys_state *css, struct cftype *cft)
return 0;
}
+static int sched_partition_show(struct seq_file *seq, void *v)
+{
+ struct cpuset *cs = css_cs(seq_css(seq));
+
+ switch (cs->partition_root_state) {
+ case PRS_ENABLED:
+ seq_puts(seq, "partition\n");
+ break;
+ case PRS_DISABLED:
+ seq_puts(seq, "normal\n");
+ break;
+ case PRS_ERROR:
+ seq_puts(seq, "partition invalid\n");
+ break;
+ }
+ return 0;
+}
+
/*
* for the common functions, 'private' gives the type of file
*/
@@ -2583,7 +2599,7 @@ static struct cftype dfl_files[] = {
{
.name = "sched.partition",
- .read_s64 = cpuset_read_s64,
+ .seq_show = sched_partition_show,
.write_s64 = cpuset_write_s64,
.private = FILE_PARTITION_ROOT,
.flags = CFTYPE_NOT_ON_ROOT,
--
2.18.0
