It is a known issue that when a task is in a non-root v1 cpuset, a cpu
offline event will cause that cpu to be lost from the task's cpumask
permanently as the cpus_allowed mask won't get back that cpu when it
becomes online again. A partial workaround for this type of single
cpu offline/online sequence is to leave the offline cpu in the task's
cpumask and do the update only if new cpus are added. It also has the
benefit of reducing the overhead of a cpu offline event.
Note that the scheduler is able to ignore the offline cpus and so
leaving offline cpus in the cpumask won't do any harm.
Some cpus will still be lost if more than one cpu become offline
initially and then become online again. Or when set_cpus_allowed_ptr()
is somehow called. There can also be a discrepancy between cpus_allowed
and the task's cpumask.
Signed-off-by: Waiman Long <longman@xxxxxxxxxx>
---
kernel/cgroup/cpuset.c | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index cbf749fc05d9..207bafdb05e8 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -3332,7 +3332,7 @@ static void remove_tasks_in_empty_cpuset(struct cpuset *cs)
static void
hotplug_update_tasks_legacy(struct cpuset *cs,
struct cpumask *new_cpus, nodemask_t *new_mems,
- bool cpus_updated, bool mems_updated)
+ bool update_task_cpus, bool mems_updated)
{
bool is_empty;
@@ -3347,7 +3347,7 @@ hotplug_update_tasks_legacy(struct cpuset *cs,
* Don't call update_tasks_cpumask() if the cpuset becomes empty,
* as the tasks will be migrated to an ancestor.
*/
- if (cpus_updated && !cpumask_empty(cs->cpus_allowed))
+ if (update_task_cpus && !cpumask_empty(cs->cpus_allowed))
update_tasks_cpumask(cs);
if (mems_updated && !nodes_empty(cs->mems_allowed))
update_tasks_nodemask(cs);
@@ -3371,11 +3371,14 @@ hotplug_update_tasks_legacy(struct cpuset *cs,
static void
hotplug_update_tasks(struct cpuset *cs,
struct cpumask *new_cpus, nodemask_t *new_mems,
- bool cpus_updated, bool mems_updated)
+ bool update_task_cpus, bool mems_updated)
{
/* A partition root is allowed to have empty effective cpus */
- if (cpumask_empty(new_cpus) && !is_partition_valid(cs))
+ if (cpumask_empty(new_cpus) && !is_partition_valid(cs)) {
cpumask_copy(new_cpus, parent_cs(cs)->effective_cpus);
+ update_task_cpus = true;
+ }
+
if (nodes_empty(*new_mems))
*new_mems = parent_cs(cs)->effective_mems;
@@ -3384,7 +3387,7 @@ hotplug_update_tasks(struct cpuset *cs,
cs->effective_mems = *new_mems;
spin_unlock_irq(&callback_lock);
- if (cpus_updated)
+ if (update_task_cpus)
update_tasks_cpumask(cs);
if (mems_updated)
update_tasks_nodemask(cs);
@@ -3410,7 +3413,7 @@ static void cpuset_hotplug_update_tasks(struct cpuset *cs, struct tmpmasks *tmp)
{
static cpumask_t new_cpus;
static nodemask_t new_mems;
- bool cpus_updated;
+ bool cpus_updated, update_task_cpus;
bool mems_updated;
struct cpuset *parent;
retry:
@@ -3512,12 +3515,21 @@ static void cpuset_hotplug_update_tasks(struct cpuset *cs, struct tmpmasks *tmp)
if (mems_updated)
check_insane_mems_config(&new_mems);
+ /*
+ * Update tasks' cpumasks only if new cpus are added. Some offline
+ * cpus may be left, but the scheduler has no problem ignoring those.
+ * The case of empty new_cpus will be handled inside
+ * hotplug_update_tasks().
+ */
+ update_task_cpus = cpus_updated &&
+ !cpumask_subset(&new_cpus, cs->effective_cpus);
+
if (is_in_v2_mode())
hotplug_update_tasks(cs, &new_cpus, &new_mems,
- cpus_updated, mems_updated);
+ update_task_cpus, mems_updated);
else
hotplug_update_tasks_legacy(cs, &new_cpus, &new_mems,
- cpus_updated, mems_updated);
+ update_task_cpus, mems_updated);
unlock:
percpu_up_write(&cpuset_rwsem);
--
2.31.1
