On Fri, 2010-12-10 at 17:56 +0000, Russell King - ARM Linux wrote:
quoted text
> On Fri, Dec 10, 2010 at 02:47:46PM +0100, Peter Zijlstra wrote:
> >  inline void update_rq_clock(struct rq *rq)
> >  {
> > -	int cpu = cpu_of(rq);
> > -	u64 irq_time;
> > +	s64 delta;
> >  
> >  	if (rq->skip_clock_update)
> >  		return;
> >  
> > -	rq->clock = sched_clock_cpu(cpu);
> > -	irq_time = irq_time_cpu(cpu);
> > -	if (rq->clock - irq_time > rq->clock_task)
> > -		rq->clock_task = rq->clock - irq_time;
> > +	delta = sched_clock_cpu(cpu_of(rq)) - rq->clock;
> > +	rq->clock += delta;
> 
> Hmm.  Can you tell me how this is different to:
> 
> 	new_clock = sched_clock_cpu(cpu_of(rq));
> 	delta = new_clock - rq->clock;
> 	rq->clock = new_clock;
> 
> which I think may be simpler in terms of 64-bit math for 32-bit compilers
> to deal with?

Its not, I could write it like that, the only reason I didn't is because
it uses an extra variable. If gcc on 32bit targets really generates
hideous code for it I'll happily change it.

quoted text
> In terms of the wrap-around, I don't see this as any different from the
> above, as:
> 
> 	rq->clock += sched_clock_cpu(cpu_of(rq)) - rq_clock;
> 	rq->clock = rq->clock + sched_clock_cpu(cpu_of(rq)) - rq_clock;
> 	rq->clock = sched_clock_cpu(cpu_of(rq));

Correct, its not different. Nor was it meant to be. The only problem it
solves is the u64 wrap failure in:

  if (rq->clock - irq_time > rq->clock_task)

There are lots of places in the scheduler that rely on u64 wrap, for now
the easiest thing for ARM would be to select HAVE_UNSTABLE_SCHED_CLOCK
for those platforms that implement a short sched_clock().

While that isn't ideal it is something that makes it work, we can work
on something more suitable for future kernels.
--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/