lkml.org 
[lkml]   [2018]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/10] sched/fair: Generalize the detach_task interface
    Date
    The detach_task function takes a struct lb_env argument, but only needs a
    few of its members. Pass the rq and cpu arguments explicitly so the
    function may be called from code that is not based on lb_env. No
    functional change.

    Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
    ---
    kernel/sched/fair.c | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
    index 9f31045..4acdd8d 100644
    --- a/kernel/sched/fair.c
    +++ b/kernel/sched/fair.c
    @@ -7168,15 +7168,15 @@ int can_migrate_task(struct task_struct *p, struct lb_env *env)
    }

    /*
    - * detach_task() -- detach the task for the migration specified in env
    + * detach_task() -- detach the task for the migration from @src_rq to @dst_cpu.
    */
    -static void detach_task(struct task_struct *p, struct lb_env *env)
    +static void detach_task(struct task_struct *p, struct rq *src_rq, int dst_cpu)
    {
    - lockdep_assert_held(&env->src_rq->lock);
    + lockdep_assert_held(&src_rq->lock);

    p->on_rq = TASK_ON_RQ_MIGRATING;
    - deactivate_task(env->src_rq, p, DEQUEUE_NOCLOCK);
    - set_task_cpu(p, env->dst_cpu);
    + deactivate_task(src_rq, p, DEQUEUE_NOCLOCK);
    + set_task_cpu(p, dst_cpu);
    }

    /*
    @@ -7196,7 +7196,7 @@ static struct task_struct *detach_one_task(struct lb_env *env)
    if (!can_migrate_task(p, env))
    continue;

    - detach_task(p, env);
    + detach_task(p, env->src_rq, env->dst_cpu);

    /*
    * Right now, this is only the second place where
    @@ -7263,7 +7263,7 @@ static int detach_tasks(struct lb_env *env)
    if ((load / 2) > env->imbalance)
    goto next;

    - detach_task(p, env);
    + detach_task(p, env->src_rq, env->dst_cpu);
    list_add(&p->se.group_node, &env->tasks);

    detached++;
    --
    1.8.3.1
    \
     
     \ /
      Last update: 2018-10-22 17:11    [W:4.047 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site