From: Chen Ridong <chenridong@huawei.com>
Now that the partition_disable() helper is available, replace the
existing implementation for remote partition disablement with this
centralized function to unify the disablement logic.
Signed-off-by: Chen Ridong <chenridong@huawei.com>
---
kernel/cgroup/cpuset.c | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index 0c62157c1d04..9bcc13b7ea08 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -1662,6 +1662,8 @@ static int remote_partition_enable(struct cpuset *cs, int new_prs,
*/
static void remote_partition_disable(struct cpuset *cs, struct tmpmasks *tmp)
{
+ int new_prs;
+
WARN_ON_ONCE(!is_remote_partition(cs));
/*
* When a CPU is offlined, top_cpuset may end up with no available CPUs,
@@ -1672,20 +1674,8 @@ static void remote_partition_disable(struct cpuset *cs, struct tmpmasks *tmp)
WARN_ON_ONCE(!cpumask_subset(cs->effective_xcpus, subpartitions_cpus) &&
!cpumask_empty(subpartitions_cpus));
- spin_lock_irq(&callback_lock);
- cs->remote_partition = false;
- partition_xcpus_del(cs->partition_root_state, NULL, cs->effective_xcpus);
- if (cs->prs_err)
- cs->partition_root_state = -cs->partition_root_state;
- else
- cs->partition_root_state = PRS_MEMBER;
-
- /* effective_xcpus may need to be changed */
- compute_excpus(cs, cs->effective_xcpus);
- reset_partition_data(cs);
- spin_unlock_irq(&callback_lock);
- update_isolation_cpumasks();
- cpuset_force_rebuild();
+ new_prs = cs->prs_err ? -cs->partition_root_state : PRS_MEMBER;
+ partition_disable(cs, NULL, new_prs, cs->prs_err);
/*
* Propagate changes in top_cpuset's effective_cpus down the hierarchy.
--
2.34.1