Messages in this thread | | | Date | Mon, 3 Nov 2014 11:50:40 +0100 | From | Peter Zijlstra <> | Subject | Re: [PATCH 1/3] sched/cpupri: Deal with cpupri.pri_to_cpu[CPUPRI_IDLE] for idle cases |
| |
On Mon, Nov 03, 2014 at 06:30:18PM +0800, pang.xunlei wrote:
> kernel/sched/idle_task.c | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > > diff --git a/kernel/sched/idle_task.c b/kernel/sched/idle_task.c > index 67ad4e7..3dc372e 100644 > --- a/kernel/sched/idle_task.c > +++ b/kernel/sched/idle_task.c > @@ -26,6 +26,15 @@ static void check_preempt_curr_idle(struct rq *rq, struct task_struct *p, int fl > static struct task_struct * > pick_next_task_idle(struct rq *rq, struct task_struct *prev) > { > +#ifdef CONFIG_SMP > + struct cpupri *cp = &rq->rd->cpupri; > + int currpri = cp->cpu_to_pri[rq->cpu]; > + > + BUG_ON(currpri != CPUPRI_NORMAL); > + /* Set CPUPRI_IDLE bitmap for this cpu */ > + cpupri_set(cp, rq->cpu, MAX_PRIO); > +#endif > +
This should really be idle_enter_rt() and implemented in kernel/sched/rt.c.
> put_prev_task(rq, prev); > > schedstat_inc(rq, sched_goidle); > @@ -47,6 +56,18 @@ dequeue_task_idle(struct rq *rq, struct task_struct *p, int flags) > > static void put_prev_task_idle(struct rq *rq, struct task_struct *prev) > { > +#ifdef CONFIG_SMP > + struct cpupri *cp = &rq->rd->cpupri; > + int currpri = cp->cpu_to_pri[rq->cpu]; > + > + /* > + * Set CPUPRI_NORMAL bitmap for this cpu when exiting from idle. > + * RT tasks may be queued beforehand, so the judgement is needed. > + */ > + if (currpri == CPUPRI_IDLE) > + cpupri_set(cp, rq->cpu, MAX_RT_PRIO); > +#endif
idle_exit_rt() and the same.
> idle_exit_fair(rq); > rq_last_tick_reset(rq); > }
Also, try and keep the deadline bits in sync with the rt semantics.
| |