lkml.org 
[lkml]   [2008]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/2] sched: add new set_cpus_allowed_ptr function v2
    Add a new function that accepts a pointer to the "newly allowed cpus"
    cpumask argument.

    int set_cpus_allowed_ptr(struct task_struct *p, const cpumask_t *new_mask)

    The current set_cpus_allowed() function is modified to use the above
    but this does not result in an ABI change. And with some compiler
    optimization help, it may not introduce any additional overhead.

    Additionally, to enforce the read only nature of the new_mask arg, the
    "const" property is migrated to sub-functions called by set_cpus_allowed.
    This silences compiler warnings.

    Based on:
    git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
    git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git

    Signed-off-by: Mike Travis <travis@sgi.com>
    ---
    v2: fixed EXPORT_SYMBOL for set_cpus_allowed_ptr()
    ---
    include/linux/sched.h | 15 +++++++++++----
    kernel/sched.c | 16 ++++++++--------
    kernel/sched_rt.c | 3 ++-
    3 files changed, 21 insertions(+), 13 deletions(-)

    --- linux-2.6.orig/include/linux/sched.h
    +++ linux-2.6/include/linux/sched.h
    @@ -891,7 +891,8 @@ struct sched_class {
    void (*set_curr_task) (struct rq *rq);
    void (*task_tick) (struct rq *rq, struct task_struct *p, int queued);
    void (*task_new) (struct rq *rq, struct task_struct *p);
    - void (*set_cpus_allowed)(struct task_struct *p, cpumask_t *newmask);
    + void (*set_cpus_allowed)(struct task_struct *p,
    + const cpumask_t *newmask);

    void (*join_domain)(struct rq *rq);
    void (*leave_domain)(struct rq *rq);
    @@ -1503,15 +1504,21 @@ static inline void put_task_struct(struc
    #define used_math() tsk_used_math(current)

    #ifdef CONFIG_SMP
    -extern int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask);
    +extern int set_cpus_allowed_ptr(struct task_struct *p,
    + const cpumask_t *new_mask);
    #else
    -static inline int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask)
    +static inline int set_cpus_allowed_ptr(struct task_struct *p,
    + const cpumask_t *new_mask)
    {
    - if (!cpu_isset(0, new_mask))
    + if (!cpu_isset(0, *new_mask))
    return -EINVAL;
    return 0;
    }
    #endif
    +static inline int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask)
    +{
    + return set_cpus_allowed_ptr(p, &new_mask);
    +}

    extern unsigned long long sched_clock(void);

    --- linux-2.6.orig/kernel/sched.c
    +++ linux-2.6/kernel/sched.c
    @@ -5601,7 +5601,7 @@ static inline void sched_init_granularit
    * task must not exit() & deallocate itself prematurely. The
    * call is not atomic; no spinlocks may be held.
    */
    -int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask)
    +int set_cpus_allowed_ptr(struct task_struct *p, const cpumask_t *new_mask)
    {
    struct migration_req req;
    unsigned long flags;
    @@ -5609,23 +5609,23 @@ int set_cpus_allowed(struct task_struct
    int ret = 0;

    rq = task_rq_lock(p, &flags);
    - if (!cpus_intersects(new_mask, cpu_online_map)) {
    + if (!cpus_intersects(*new_mask, cpu_online_map)) {
    ret = -EINVAL;
    goto out;
    }

    if (p->sched_class->set_cpus_allowed)
    - p->sched_class->set_cpus_allowed(p, &new_mask);
    + p->sched_class->set_cpus_allowed(p, new_mask);
    else {
    - p->cpus_allowed = new_mask;
    - p->rt.nr_cpus_allowed = cpus_weight(new_mask);
    + p->cpus_allowed = *new_mask;
    + p->rt.nr_cpus_allowed = cpus_weight(*new_mask);
    }

    /* Can the task run on the task's current CPU? If so, we're done */
    - if (cpu_isset(task_cpu(p), new_mask))
    + if (cpu_isset(task_cpu(p), *new_mask))
    goto out;

    - if (migrate_task(p, any_online_cpu(new_mask), &req)) {
    + if (migrate_task(p, any_online_cpu(*new_mask), &req)) {
    /* Need help from migration thread: drop lock and wait. */
    task_rq_unlock(rq, &flags);
    wake_up_process(rq->migration_thread);
    @@ -5638,7 +5638,7 @@ out:

    return ret;
    }
    -EXPORT_SYMBOL_GPL(set_cpus_allowed);
    +EXPORT_SYMBOL_GPL(set_cpus_allowed_ptr);

    /*
    * Move (not current) task off this cpu, onto dest cpu. We're doing
    --- linux-2.6.orig/kernel/sched_rt.c
    +++ linux-2.6/kernel/sched_rt.c
    @@ -1123,7 +1123,8 @@ move_one_task_rt(struct rq *this_rq, int
    return 0;
    }

    -static void set_cpus_allowed_rt(struct task_struct *p, cpumask_t *new_mask)
    +static void set_cpus_allowed_rt(struct task_struct *p,
    + const cpumask_t *new_mask)
    {
    int weight = cpus_weight(*new_mask);

    --


    \
     
     \ /
      Last update: 2008-03-28 03:39    [W:0.035 / U:89.116 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site