* Hitoshi Mitake <mitake@xxxxxxxxxxxxxxxxxxxxx> wrote:
> From: Ingo Molnar <mingo@xxxxxxx>
> Subject: Re: [tip:sched/urgent] sched: Hide runqueues from direct refer at source code level
> Date: Wed, 17 Jun 2009 18:31:11 +0200
>
> > ition: inline
> > Subject: Re: [tip:sched/urgent] sched: Hide runqueues from direct refer at source code level
> > From: Ingo Molnar <mingo@xxxxxxx>
> > To: mingo@xxxxxxxxxx, hpa@xxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx,
> > mitake@xxxxxxxxxxxxxxxxxxxxx, tglx@xxxxxxxxxxxxx
> > Cc: linux-tip-commits@xxxxxxxxxxxxxxx
> > Date: Wed, 17 Jun 2009 18:31:11 +0200
> > User-Agent: Mutt/1.5.18 (2008-05-17)
> > Received-SPF: neutral (mx2.mail.elte.hu: 157.181.1.14 is neither permitted nor denied by domain of elte.hu) client-ip=157.181.1.14; envelope-from=mingo@xxxxxxx; helo=elvis.elte.hu;
> > X-Mew: tab/spc characters on Subject: are simplified.
> >
> >
> > * tip-bot for Hitoshi Mitake <mitake@xxxxxxxxxxxxxxxxxxxxx> wrote:
> >
> > > --- a/kernel/sched.c
> > > +++ b/kernel/sched.c
> > > @@ -6630,7 +6630,7 @@ EXPORT_SYMBOL(yield);
> > > */
> > > void __sched io_schedule(void)
> > > {
> > > - struct rq *rq = &__raw_get_cpu_var(runqueues);
> > > + struct rq *rq = this_rq();
> > >
> > > delayacct_blkio_start();
> > > atomic_inc(&rq->nr_iowait);
> > > @@ -6642,7 +6642,7 @@ EXPORT_SYMBOL(io_schedule);
> > >
> > > long __sched io_schedule_timeout(long timeout)
> > > {
> > > - struct rq *rq = &__raw_get_cpu_var(runqueues);
> > > + struct rq *rq = this_rq();
> > > long ret;
> >
> > I removed these two changes. Did you notice the __raw prefix?
> >
> > Ingo
> >
>
> Thanks for your fix, I didn't notice...
> I wrote a patch to fix these two points.
>
> After applying this patch,
> all direct reference to runqueues is in macros. How is this?
>
> Signed-off-by: Hitoshi Mitake <mitake@xxxxxxxxxxxxxxxxxxxxx>
>
> diff --git a/kernel/sched.c b/kernel/sched.c
> index 8ec9d13..e2ca8c1 100644
> --- a/kernel/sched.c
> +++ b/kernel/sched.c
> @@ -692,6 +692,7 @@ static inline int cpu_of(struct rq *rq)
> #define this_rq() (&__get_cpu_var(runqueues))
> #define task_rq(p) cpu_rq(task_cpu(p))
> #define cpu_curr(cpu) (cpu_rq(cpu)->curr)
> +#define raw_rq() (&__raw_get_cpu_var(runqueues))
>
> inline void update_rq_clock(struct rq *rq)
> {
> @@ -6625,7 +6626,7 @@ EXPORT_SYMBOL(yield);
> */
> void __sched io_schedule(void)
> {
> - struct rq *rq = &__raw_get_cpu_var(runqueues);
> + struct rq *rq = raw_rq();
>
> delayacct_blkio_start();
> atomic_inc(&rq->nr_iowait);
> @@ -6637,7 +6638,7 @@ EXPORT_SYMBOL(io_schedule);
>
> long __sched io_schedule_timeout(long timeout)
> {
> - struct rq *rq = &__raw_get_cpu_var(runqueues);
> + struct rq *rq = raw_rq();
> long ret;
>
> delayacct_blkio_start();
Looks good - mind submitting a separate patch with a changelog, etc?
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|