evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core_ctl: kill maintenance of online state

Browse source 
The online state is cached in CPU hotplug callbacks. This is
used in determining the potential candidates for isolation or
unisolation. The current code has checks in hotplug notifier
callback to correct the online state if it is out of sync
with the actualy CPU state. All this maintenance can be
avoided by directly using cpu_online().

This patch fixes an incorrect warning message emitted from
CPU_UP_CANCELED event callback.

Change-Id: I9681ce6c5bc701507427d60db397ca4966fbdb58
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
This commit is contained in:
Pavankumar Kondeti 2017-03-17 15:29:13 +05:30
parent 6f55033ecf
commit 27e15c3ae3
1 changed files with 5 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
kernel/sched/core_ctl.c
View file

@ -50,7 +50,6 @@ struct cluster_data {
};
struct cpu_data {
bool online;
bool is_busy;
unsigned int busy;
unsigned int cpu;
@ -252,7 +251,7 @@ static ssize_t show_cpus(const struct cluster_data *state, char *buf)
list_for_each_entry(c, &state->lru, sib) {
count += snprintf(buf + count, PAGE_SIZE - count,
"CPU%u (%s)\n", c->cpu,
c->online ? "Online" : "Offline");
cpu_online(c->cpu) ? "Online" : "Offline");
}
spin_unlock_irqrestore(&state_lock, flags);
return count;
@ -286,7 +285,8 @@ static ssize_t show_global_state(const struct cluster_data *state, char *buf)
count += snprintf(buf + count, PAGE_SIZE - count,
"\tCPU: %u\n", c->cpu);
count += snprintf(buf + count, PAGE_SIZE - count,
"\tOnline: %u\n", c->online);
"\tOnline: %u\n",
cpu_online(c->cpu));
count += snprintf(buf + count, PAGE_SIZE - count,
"\tActive: %u\n",
!cpu_isolated(c->cpu));
@ -534,7 +534,7 @@ static unsigned int get_active_cpu_count(const struct cluster_data *cluster)
static bool is_active(const struct cpu_data *state)
{
return state->online && !cpu_isolated(state->cpu);
return cpu_online(state->cpu) && !cpu_isolated(state->cpu);
}
static bool adjustment_possible(const struct cluster_data *cluster,
@ -815,7 +815,7 @@ static void __try_to_unisolate(struct cluster_data *cluster,
if (!c->isolated_by_us)
continue;
if ((c->online && !cpu_isolated(c->cpu)) ||
if ((cpu_online(c->cpu) && !cpu_isolated(c->cpu)) ||
(!force && c->not_preferred))
continue;
if (cluster->active_cpus == need)
@ -904,19 +904,7 @@ static int __ref cpu_callback(struct notifier_block *nfb,
return NOTIFY_OK;
switch (action & ~CPU_TASKS_FROZEN) {
case CPU_UP_PREPARE:
/* If online state of CPU somehow got out of sync, fix it. */
if (state->online) {
state->online = false;
cluster->active_cpus = get_active_cpu_count(cluster);
pr_warn("CPU%d offline when state is online\n", cpu);
}
break;
case CPU_ONLINE:
state->online = true;
cluster->active_cpus = get_active_cpu_count(cluster);
/*
@ -941,15 +929,6 @@ static int __ref cpu_callback(struct notifier_block *nfb,
/* Move a CPU to the end of the LRU when it goes offline. */
move_cpu_lru(state);
/* Fall through */
case CPU_UP_CANCELED:
/* If online state of CPU somehow got out of sync, fix it. */
if (!state->online)
pr_warn("CPU%d online when state is offline\n", cpu);
state->online = false;
state->busy = 0;
cluster->active_cpus = get_active_cpu_count(cluster);
break;
@ -1028,8 +1007,6 @@ static int cluster_init(const struct cpumask *mask)
state = &per_cpu(cpu_state, cpu);
state->cluster = cluster;
state->cpu = cpu;
if (cpu_online(cpu))
state->online = true;
list_add_tail(&state->sib, &cluster->lru);
}
cluster->active_cpus = get_active_cpu_count(cluster);