github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-31 03:27:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

sched: Revert "sched/walt: Account for changing task affinity"

Browse Source 
This reverts commit bb44a08e52736ee05703b707348d96125d827acf.

Change-Id: I1b32cbfc167d59b650090e5fdef98101ff9cf6a2
Signed-off-by: Shaleen Agrawal <quic_shalagra@quicinc.com>
This commit is contained in:
Shaleen Agrawal 2022-04-08 16:27:46 -07:00 committed by Rishabh Bhatnagar
parent 2b39f2c898
commit b64b350ef4
1 changed files with 11 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
kernel/sched/walt/walt_lb.c
View File

@ -16,53 +16,15 @@ static inline unsigned long walt_lb_cpu_util(int cpu)
return wrq->walt_stats.cumulative_runnable_avg_scaled;
}
static int walt_detach_task(struct task_struct *p, struct rq *src_rq,
struct rq *dst_rq, bool force_affinity_appropriate_cpu)
static void walt_detach_task(struct task_struct *p, struct rq *src_rq,
struct rq *dst_rq)
{
int ret = -EINVAL;
int dest_cpu;
int retry_count = 0;
deactivate_task(src_rq, p, 0);
retry:
double_lock_balance(src_rq, dst_rq);
/*
* It's possible that src_rq lock was dropped while trying to acuire
* double rq lock.
* Task affinity could change then, recheck if moving the task to
* dst is still valid.
*/
if (!force_affinity_appropriate_cpu ||
cpumask_test_cpu(cpu_of(dst_rq), p->cpus_ptr)) {
if (!(src_rq->clock_update_flags & RQCF_UPDATED))
update_rq_clock(src_rq);
set_task_cpu(p, dst_rq->cpu);
ret = 0;
}
if (!(src_rq->clock_update_flags & RQCF_UPDATED))
update_rq_clock(src_rq);
set_task_cpu(p, dst_rq->cpu);
double_unlock_balance(src_rq, dst_rq);
if (ret) {
/*
* Couldn't move the task, reactivate it on an appropriate cpu.
*/
if (cpumask_test_cpu(cpu_of(src_rq), p->cpus_ptr) &&
cpu_active(cpu_of(src_rq)) &&
!cpu_halted(cpu_of(src_rq))) {
activate_task(src_rq, p, 0);
} else {
dest_cpu = select_fallback_rq(cpu_of(src_rq), p);
dst_rq = cpu_rq(dest_cpu);
if (retry_count < 5) {
retry_count++;
goto retry;
} else {
printk_deferred("Failed to select CPU in task's affinity list after 5 tries\n");
}
}
}
return ret;
}
static void walt_attach_task(struct task_struct *p, struct rq *rq)
@ -102,8 +64,8 @@ static int stop_walt_lb_active_migration(void *data)
task_cpu(push_task) == busiest_cpu &&
cpu_active(target_cpu) &&
cpumask_test_cpu(target_cpu, push_task->cpus_ptr)) {
if (!walt_detach_task(push_task, busiest_rq, target_rq, true))
push_task_detached = 1;
walt_detach_task(push_task, busiest_rq, target_rq);
push_task_detached = 1;
}
out_unlock: /* called with busiest_rq lock */
@ -352,8 +314,7 @@ static int walt_lb_pull_tasks(int dst_cpu, int src_cpu)
if (!_walt_can_migrate_task(p, dst_cpu, to_lower, false))
continue;
if (walt_detach_task(p, src_rq, dst_rq, true))
continue;
walt_detach_task(p, src_rq, dst_rq);
pulled_task = p;
goto unlock;
}
@ -369,8 +330,7 @@ static int walt_lb_pull_tasks(int dst_cpu, int src_cpu)
if (!_walt_can_migrate_task(p, dst_cpu, to_lower, true))
continue;
if (walt_detach_task(p, src_rq, dst_rq, true))
continue;
walt_detach_task(p, src_rq, dst_rq);
pulled_task = p;
goto unlock;
}
@ -410,8 +370,7 @@ static int walt_lb_pull_tasks(int dst_cpu, int src_cpu)
continue;
}
if (walt_detach_task(p, src_rq, dst_rq, true))
continue;
walt_detach_task(p, src_rq, dst_rq);
pulled_task = p;
goto unlock;
}
@ -1016,14 +975,7 @@ static void walt_migrate_queued_task(void *unused, struct rq *rq,
BUG_ON(!rf);
rq_unpin_lock(rq, rf);
/*
* force_affinity_appropriate_cpu set to false allows p to be put on
* a non-affinity-appropriate cpu. We shouldn't move the task to any
* other cpu than new_cpu, even if affinity doesn't allow it, because
* calls to migrate_queued_task are accompanied with a
* activate_task on the new_cpu.
*/
walt_detach_task(p, rq, cpu_rq(new_cpu), false);
walt_detach_task(p, rq, cpu_rq(new_cpu));
rq_repin_lock(rq, rf);
*detached = 1;