From mboxrd@z Thu Jan 1 00:00:00 1970 From: George Dunlap Subject: Re: [PATCH 1 of 5 v3] xen: sched_credit: define and use curr_on_cpu(cpu) Date: Tue, 18 Dec 2012 12:10:04 +0000 Message-ID: <50D05D1C.8070103@eu.citrix.com> References: <290dfdd1cbe5f3e1c2e0.1355783338@Solace> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <290dfdd1cbe5f3e1c2e0.1355783338@Solace> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Dario Faggioli Cc: "xen-devel@lists.xensource.com" , "Keir (Xen.org)" , Ian Campbell List-Id: xen-devel@lists.xenproject.org On 17/12/12 22:28, Dario Faggioli wrote: > To fetch `per_cpu(schedule_data,cpu).curr' in a more readable > way. It's in sched-if.h as that is where `struct schedule_data' > is declared. > > Signed-off-by: Dario Faggioli Acked-by: George Dunlap > --- > Changes from v2: > * This patch now contains both macro definition and usage, (and > has been moved to the top of the series), as suggested during > review. > * The macro has been moved moved to sched-if.h, as requested > during review. > * The macro has been renamed curr_on_cpu(), to match with the > `*curr' field in `struct schedule_data' to which it points. > > diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c > --- a/xen/common/sched_credit.c > +++ b/xen/common/sched_credit.c > @@ -228,7 +228,7 @@ static void burn_credits(struct csched_v > unsigned int credits; > > /* Assert svc is current */ > - ASSERT(svc==CSCHED_VCPU(per_cpu(schedule_data, svc->vcpu->processor).curr)); > + ASSERT( svc == CSCHED_VCPU(curr_on_cpu(svc->vcpu->processor)) ); > > if ( (delta = now - svc->start_time) <= 0 ) > return; > @@ -246,8 +246,7 @@ DEFINE_PER_CPU(unsigned int, last_tickle > static inline void > __runq_tickle(unsigned int cpu, struct csched_vcpu *new) > { > - struct csched_vcpu * const cur = > - CSCHED_VCPU(per_cpu(schedule_data, cpu).curr); > + struct csched_vcpu * const cur = CSCHED_VCPU(curr_on_cpu(cpu)); > struct csched_private *prv = CSCHED_PRIV(per_cpu(scheduler, cpu)); > cpumask_t mask; > > @@ -371,7 +370,7 @@ csched_alloc_pdata(const struct schedule > per_cpu(schedule_data, cpu).sched_priv = spc; > > /* Start off idling... */ > - BUG_ON(!is_idle_vcpu(per_cpu(schedule_data, cpu).curr)); > + BUG_ON(!is_idle_vcpu(curr_on_cpu(cpu))); > cpumask_set_cpu(cpu, prv->idlers); > > spin_unlock_irqrestore(&prv->lock, flags); > @@ -709,7 +708,7 @@ csched_vcpu_sleep(const struct scheduler > > BUG_ON( is_idle_vcpu(vc) ); > > - if ( per_cpu(schedule_data, vc->processor).curr == vc ) > + if ( curr_on_cpu(vc->processor) == vc ) > cpu_raise_softirq(vc->processor, SCHEDULE_SOFTIRQ); > else if ( __vcpu_on_runq(svc) ) > __runq_remove(svc); > @@ -723,7 +722,7 @@ csched_vcpu_wake(const struct scheduler > > BUG_ON( is_idle_vcpu(vc) ); > > - if ( unlikely(per_cpu(schedule_data, cpu).curr == vc) ) > + if ( unlikely(curr_on_cpu(cpu) == vc) ) > { > SCHED_STAT_CRANK(vcpu_wake_running); > return; > @@ -1192,7 +1191,7 @@ static struct csched_vcpu * > csched_runq_steal(int peer_cpu, int cpu, int pri) > { > const struct csched_pcpu * const peer_pcpu = CSCHED_PCPU(peer_cpu); > - const struct vcpu * const peer_vcpu = per_cpu(schedule_data, peer_cpu).curr; > + const struct vcpu * const peer_vcpu = curr_on_cpu(peer_cpu); > struct csched_vcpu *speer; > struct list_head *iter; > struct vcpu *vc; > @@ -1480,7 +1479,7 @@ csched_dump_pcpu(const struct scheduler > printk("core=%s\n", cpustr); > > /* current VCPU */ > - svc = CSCHED_VCPU(per_cpu(schedule_data, cpu).curr); > + svc = CSCHED_VCPU(curr_on_cpu(cpu)); > if ( svc ) > { > printk("\trun: "); > diff --git a/xen/include/xen/sched-if.h b/xen/include/xen/sched-if.h > --- a/xen/include/xen/sched-if.h > +++ b/xen/include/xen/sched-if.h > @@ -41,6 +41,8 @@ struct schedule_data { > atomic_t urgent_count; /* how many urgent vcpus */ > }; > > +#define curr_on_cpu(c) (per_cpu(schedule_data, c).curr) > + > DECLARE_PER_CPU(struct schedule_data, schedule_data); > DECLARE_PER_CPU(struct scheduler *, scheduler); > DECLARE_PER_CPU(struct cpupool *, cpupool); >