[RFC PATCH -v4 18/22] cpuset: use validate_local_partition in local_partition_enable

[Ridong Chen]

From: Chen Ridong <chenridong@xxxxxxxxxx>

Replace the partition error checks within local_partition_enable() by
utilizing the common validate_local_partition() function.

As validate_local_partition() already rejects a root partition under an
isolated parent, the PERR_ISOPARENT check in update_prstate() is no
longer needed and is removed.

validate_local_partition() and is_user_xcpus_exclusive() are moved
before local_partition_enable() without change.

Signed-off-by: Chen Ridong <chenridong@xxxxxxxxxx>
Signed-off-by: Ridong Chen <chenridong@xxxxxxxxxx>
---
 kernel/cgroup/cpuset.c | 131 ++++++++++++++++++-----------------------
 1 file changed, 56 insertions(+), 75 deletions(-)

diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index af42666d4530..ecb7fd378a3f 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -1978,6 +1978,61 @@ static void remote_cpus_update(struct cpuset *cs, struct cpumask *xcpus,
 	remote_partition_disable(cs, tmp);
 }
 
+static bool is_user_xcpus_exclusive(struct cpuset *cs)
+{
+	struct cpuset *parent = parent_cs(cs);
+	struct cgroup_subsys_state *css;
+	struct cpuset *child;
+	bool exclusive = true;
+
+	rcu_read_lock();
+	cpuset_for_each_child(child, css, parent) {
+		if (child == cs)
+			continue;
+		if (!cpusets_are_exclusive(cs, child)) {
+			exclusive = false;
+			break;
+		}
+	}
+	rcu_read_unlock();
+	return exclusive;
+}
+
+/**
+ * validate_local_partition - Validate for local partition
+ * @cs: Target cpuset to validate
+ * @new_prs: New partition root state to validate
+ * @excpus: New effective exclusive CPUs mask to validate
+ * @excl_check: Flag to enable exclusive CPUs ownership validation
+ * @tmp: Temporary masks
+ *
+ * Return: PERR_NONE if validation passes, appropriate error code otherwise
+ *
+ * Important: The caller must ensure that @cs's cpu mask is updated before
+ * invoking this function when exclusive CPU validation is required.
+ */
+static enum prs_errcode validate_local_partition(struct cpuset *cs, int new_prs,
+			struct cpumask *excpus, bool excl_check, struct tmpmasks *tmp)
+{
+	struct cpuset *parent = parent_cs(cs);
+
+	/* The parent must be a partition root */
+	if (!is_partition_valid(parent)) {
+		return is_partition_invalid(parent)
+			? PERR_INVPARENT : PERR_NOTPART;
+	}
+
+	/* A root partition is not allowed under an isolated parent */
+	if (new_prs == PRS_ROOT && parent->partition_root_state == PRS_ISOLATED)
+		return PERR_ISOPARENT;
+
+	if (excl_check && !is_user_xcpus_exclusive(cs))
+		return PERR_NOTEXCL;
+
+	return validate_partition(cs, parent, new_prs, excpus,
+				  tmp ? tmp->delmask : NULL);
+}
+
 /**
  * local_partition_enable - Enable local partition for a cpuset
  * @cs: Target cpuset to become a local partition root
@@ -1995,18 +2050,8 @@ static int local_partition_enable(struct cpuset *cs,
 	lockdep_assert_cpuset_lock_held();
 	WARN_ON_ONCE(is_remote_partition(cs));	/* For local partition only */
 
-	/*
-	 * The parent must be a partition root.
-	 * The new cpumask, if present, or the current cpus_allowed must
-	 * not be empty.
-	 */
-	if (!is_partition_valid(parent)) {
-		return is_partition_invalid(parent)
-		       ? PERR_INVPARENT : PERR_NOTPART;
-	}
-
 	compute_excpus(cs, tmp->new_cpus);
-	err = validate_partition(cs, parent, new_prs, tmp->new_cpus, NULL);
+	err = validate_local_partition(cs, new_prs, tmp->new_cpus, false, NULL);
 	if (err)
 		return err;
 
@@ -2054,61 +2099,6 @@ static void local_partition_disable(struct cpuset *cs, enum prs_errcode part_err
 	update_sibling_cpumasks(parent, cs, tmp);
 }
 
-static bool is_user_xcpus_exclusive(struct cpuset *cs)
-{
-	struct cpuset *parent = parent_cs(cs);
-	struct cgroup_subsys_state *css;
-	struct cpuset *child;
-	bool exclusive = true;
-
-	rcu_read_lock();
-	cpuset_for_each_child(child, css, parent) {
-		if (child == cs)
-			continue;
-		if (!cpusets_are_exclusive(cs, child)) {
-			exclusive = false;
-			break;
-		}
-	}
-	rcu_read_unlock();
-	return exclusive;
-}
-
-/**
- * validate_local_partition - Validate for local partition
- * @cs: Target cpuset to validate
- * @new_prs: New partition root state to validate
- * @excpus: New effective exclusive CPUs mask to validate
- * @excl_check: Flag to enable exclusive CPUs ownership validation
- * @tmp: Temporary masks
- *
- * Return: PERR_NONE if validation passes, appropriate error code otherwise
- *
- * Important: The caller must ensure that @cs's cpu mask is updated before
- * invoking this function when exclusive CPU validation is required.
- */
-static enum prs_errcode validate_local_partition(struct cpuset *cs, int new_prs,
-			struct cpumask *excpus, bool excl_check, struct tmpmasks *tmp)
-{
-	struct cpuset *parent = parent_cs(cs);
-
-	/* The parent must be a partition root */
-	if (!is_partition_valid(parent)) {
-		return is_partition_invalid(parent)
-			? PERR_INVPARENT : PERR_NOTPART;
-	}
-
-	/* A root partition is not allowed under an isolated parent */
-	if (new_prs == PRS_ROOT && parent->partition_root_state == PRS_ISOLATED)
-		return PERR_ISOPARENT;
-
-	if (excl_check && !is_user_xcpus_exclusive(cs))
-		return PERR_NOTEXCL;
-
-	return validate_partition(cs, parent, new_prs, excpus,
-				  tmp ? tmp->delmask : NULL);
-}
-
 /**
  * __local_partition_update - Update local partition configuration
  * @cs: Target cpuset to update
@@ -2918,7 +2908,6 @@ static int update_prstate(struct cpuset *cs, int new_prs)
 	int err = PERR_NONE, old_prs = cs->partition_root_state;
 	struct cpuset *parent = parent_cs(cs);
 	struct tmpmasks tmpmask;
-	int parent_prs = parent->partition_root_state;
 	bool isolcpus_updated = false;
 	bool disable_partition = false;
 
@@ -2961,14 +2950,6 @@ static int update_prstate(struct cpuset *cs, int new_prs)
 		 * Otherwise, enable a remote partition.
 		 */
 		if (is_partition_valid(parent)) {
-			/*
-			 * It is not allowed to create a root partition under
-			 * an isolated parent partition.
-			 */
-			if ((new_prs == PRS_ROOT) && (parent_prs == PRS_ISOLATED)) {
-				err = PERR_ISOPARENT;
-				goto out;
-			}
 			err = local_partition_enable(cs, new_prs, &tmpmask);
 		} else {
 			err = remote_partition_enable(cs, new_prs, &tmpmask);
-- 
2.34.1