ANDROID: cpu-hotplug: Always use real time scheduling when hotplugging a CPU
CPU hotplug operations take place in preemptible context. This leaves the hotplugging thread at the mercy of overall system load and CPU availability. If the hotplugging thread does not get an opportunity to execute after it has already begun a hotplug operation, CPUs can end up being stuck in a quasi online state. In the worst case a CPU can be stuck in a state where the migration thread is parked while another task is executing and changing affinity in a loop. This combination can result in unbounded execution time for the running task until the hotplugging thread gets the chance to run to complete the hotplug operation. Fix the said problem by ensuring that hotplug can only occur from threads belonging to the RT sched class. This allows the hotplugging thread priority on the CPU no matter what the system load or the number of available CPUs are. If a SCHED_NORMAL task attempts to hotplug a CPU, we temporarily elevate it's scheduling policy to RT. Furthermore, we disallow hotplugging operations to begin if the calling task belongs to the idle and deadline classes or those that use the SCHED_BATCH policy. Bug: 169238689 Change-Id: Idbb1384626e6ddff46c0d2ce752eee68396c78af Signed-off-by: Syed Rameez Mustafa <rameezmustafa@codeaurora.org> [psodagud@codeaurora.org: Fixed compilation issues] Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>
This commit is contained in:

committed by
Prasad Sodagudi

parent
9810d13cf9
commit
c6e5f9d7cf
47
kernel/cpu.c
47
kernel/cpu.c
@@ -32,6 +32,7 @@
|
||||
#include <linux/relay.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/percpu-rwsem.h>
|
||||
#include <uapi/linux/sched/types.h>
|
||||
|
||||
#include <trace/events/power.h>
|
||||
#define CREATE_TRACE_POINTS
|
||||
@@ -1186,6 +1187,27 @@ void cpuhp_online_idle(enum cpuhp_state state)
|
||||
complete_ap_thread(st, true);
|
||||
}
|
||||
|
||||
static int switch_to_rt_policy(void)
|
||||
{
|
||||
struct sched_param param = { .sched_priority = MAX_RT_PRIO - 1 };
|
||||
unsigned int policy = current->policy;
|
||||
|
||||
if (policy == SCHED_NORMAL)
|
||||
/* Switch to SCHED_FIFO from SCHED_NORMAL. */
|
||||
return sched_setscheduler_nocheck(current, SCHED_FIFO, ¶m);
|
||||
else if (policy == SCHED_FIFO || policy == SCHED_RR)
|
||||
return 1;
|
||||
else
|
||||
return -EPERM;
|
||||
}
|
||||
|
||||
static int switch_to_fair_policy(void)
|
||||
{
|
||||
struct sched_param param = { .sched_priority = 0 };
|
||||
|
||||
return sched_setscheduler_nocheck(current, SCHED_NORMAL, ¶m);
|
||||
}
|
||||
|
||||
/* Requires cpu_add_remove_lock to be held */
|
||||
static int _cpu_up(unsigned int cpu, int tasks_frozen, enum cpuhp_state target)
|
||||
{
|
||||
@@ -1249,6 +1271,7 @@ out:
|
||||
static int cpu_up(unsigned int cpu, enum cpuhp_state target)
|
||||
{
|
||||
int err = 0;
|
||||
int switch_err;
|
||||
|
||||
if (!cpu_possible(cpu)) {
|
||||
pr_err("can't online cpu %d because it is not configured as may-hotadd at boot time\n",
|
||||
@@ -1259,9 +1282,23 @@ static int cpu_up(unsigned int cpu, enum cpuhp_state target)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/*
|
||||
* CPU hotplug operations consists of many steps and each step
|
||||
* calls a callback of core kernel subsystem. CPU hotplug-in
|
||||
* operation may get preempted by other CFS tasks and whole
|
||||
* operation of cpu hotplug in CPU gets delayed. Switch the
|
||||
* current task to SCHED_FIFO from SCHED_NORMAL, so that
|
||||
* hotplug in operation may complete quickly in heavy loaded
|
||||
* conditions and new CPU will start handle the workload.
|
||||
*/
|
||||
|
||||
switch_err = switch_to_rt_policy();
|
||||
if (switch_err < 0)
|
||||
return switch_err;
|
||||
|
||||
err = try_online_node(cpu_to_node(cpu));
|
||||
if (err)
|
||||
return err;
|
||||
goto switch_out;
|
||||
|
||||
cpu_maps_update_begin();
|
||||
|
||||
@@ -1277,6 +1314,14 @@ static int cpu_up(unsigned int cpu, enum cpuhp_state target)
|
||||
err = _cpu_up(cpu, 0, target);
|
||||
out:
|
||||
cpu_maps_update_done();
|
||||
switch_out:
|
||||
if (!switch_err) {
|
||||
switch_err = switch_to_fair_policy();
|
||||
if (switch_err)
|
||||
pr_err("Hotplug policy switch err=%d Task %s pid=%d\n",
|
||||
switch_err, current->comm, current->pid);
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user