Merge "sched/walt: Improve the scheduler"
This commit is contained in:
commit
45768ac99f
@ -102,12 +102,21 @@ static void walt_lb_rotate_work_func(struct work_struct *work)
|
||||
{
|
||||
struct walt_lb_rotate_work *wr = container_of(work,
|
||||
struct walt_lb_rotate_work, w);
|
||||
struct rq *src_rq = cpu_rq(wr->src_cpu), *dst_rq = cpu_rq(wr->dst_cpu);
|
||||
unsigned long flags;
|
||||
|
||||
migrate_swap(wr->src_task, wr->dst_task, wr->dst_cpu, wr->src_cpu);
|
||||
|
||||
put_task_struct(wr->src_task);
|
||||
put_task_struct(wr->dst_task);
|
||||
|
||||
local_irq_save(flags);
|
||||
double_rq_lock(src_rq, dst_rq);
|
||||
dst_rq->active_balance = 0;
|
||||
src_rq->active_balance = 0;
|
||||
double_rq_unlock(src_rq, dst_rq);
|
||||
local_irq_restore(flags);
|
||||
|
||||
clear_reserved(wr->src_cpu);
|
||||
clear_reserved(wr->dst_cpu);
|
||||
}
|
||||
@ -194,7 +203,10 @@ static void walt_lb_check_for_rotation(struct rq *src_rq)
|
||||
dst_rq = cpu_rq(dst_cpu);
|
||||
|
||||
double_rq_lock(src_rq, dst_rq);
|
||||
if (walt_fair_task(dst_rq->curr)) {
|
||||
if (walt_fair_task(dst_rq->curr) &&
|
||||
!src_rq->active_balance && !dst_rq->active_balance &&
|
||||
cpumask_test_cpu(dst_cpu, src_rq->curr->cpus_ptr) &&
|
||||
cpumask_test_cpu(src_cpu, dst_rq->curr->cpus_ptr)) {
|
||||
get_task_struct(src_rq->curr);
|
||||
get_task_struct(dst_rq->curr);
|
||||
|
||||
@ -207,6 +219,9 @@ static void walt_lb_check_for_rotation(struct rq *src_rq)
|
||||
|
||||
wr->src_cpu = src_cpu;
|
||||
wr->dst_cpu = dst_cpu;
|
||||
|
||||
dst_rq->active_balance = 1;
|
||||
src_rq->active_balance = 1;
|
||||
}
|
||||
double_rq_unlock(src_rq, dst_rq);
|
||||
|
||||
@ -504,8 +519,10 @@ void walt_lb_tick(struct rq *rq)
|
||||
struct walt_rq *wrq = (struct walt_rq *) rq->android_vendor_data1;
|
||||
struct walt_task_struct *wts = (struct walt_task_struct *) p->android_vendor_data1;
|
||||
|
||||
if (available_idle_cpu(prev_cpu) && is_reserved(prev_cpu))
|
||||
raw_spin_lock(&rq->lock);
|
||||
if (available_idle_cpu(prev_cpu) && is_reserved(prev_cpu) && !rq->active_balance)
|
||||
clear_reserved(prev_cpu);
|
||||
raw_spin_unlock(&rq->lock);
|
||||
|
||||
if (!walt_fair_task(p))
|
||||
return;
|
||||
|
Loading…
Reference in New Issue
Block a user