From 7760ff0d359019a8e1706562f2e759de7e3e9824 Mon Sep 17 00:00:00 2001 From: Dario Faggioli Date: Fri, 8 Apr 2016 00:03:21 +0200 Subject: [PATCH] sched: move pCPU initialization in a helper That will turn out useful in following patches, where such code will need to be called more than just once. Create an helper now, and move the code there, to avoid mixing code motion and functional changes later. In Credit2, some style cleanup is also done. No functional change intended. Signed-off-by: Dario Faggioli Reviewed-by: George Dunlap --- xen/common/sched_credit.c | 20 ++++++++++++-------- xen/common/sched_credit2.c | 26 ++++++++++++++++---------- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index f503e73845..96a245d2cf 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -543,17 +543,12 @@ csched_alloc_pdata(const struct scheduler *ops, int cpu) } static void -csched_init_pdata(const struct scheduler *ops, void *pdata, int cpu) +init_pdata(struct csched_private *prv, struct csched_pcpu *spc, int cpu) { - struct csched_private *prv = CSCHED_PRIV(ops); - struct csched_pcpu * const spc = pdata; - unsigned long flags; - - /* cpu data needs to be allocated, but STILL uninitialized */ + ASSERT(spin_is_locked(&prv->lock)); + /* cpu data needs to be allocated, but STILL uninitialized. */ ASSERT(spc && spc->runq.next == NULL && spc->runq.prev == NULL); - spin_lock_irqsave(&prv->lock, flags); - /* Initialize/update system-wide config */ prv->credit += prv->credits_per_tslice; prv->ncpus++; @@ -576,7 +571,16 @@ csched_init_pdata(const struct scheduler *ops, void *pdata, int cpu) /* Start off idling... */ BUG_ON(!is_idle_vcpu(curr_on_cpu(cpu))); cpumask_set_cpu(cpu, prv->idlers); +} +static void +csched_init_pdata(const struct scheduler *ops, void *pdata, int cpu) +{ + unsigned long flags; + struct csched_private *prv = CSCHED_PRIV(ops); + + spin_lock_irqsave(&prv->lock, flags); + init_pdata(prv, pdata, cpu); spin_unlock_irqrestore(&prv->lock, flags); } diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 8a56953863..8989eea11d 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -1972,16 +1972,13 @@ static void deactivate_runqueue(struct csched2_private *prv, int rqi) } static void -csched2_init_pdata(const struct scheduler *ops, void *pdata, int cpu) +init_pdata(struct csched2_private *prv, unsigned int cpu) { unsigned rqi; - unsigned long flags; - struct csched2_private *prv = CSCHED2_PRIV(ops); struct csched2_runqueue_data *rqd; spinlock_t *old_lock; - spin_lock_irqsave(&prv->lock, flags); - + ASSERT(spin_is_locked(&prv->lock)); ASSERT(!cpumask_test_cpu(cpu, &prv->initialized)); /* Figure out which runqueue to put it in */ @@ -2001,7 +1998,7 @@ csched2_init_pdata(const struct scheduler *ops, void *pdata, int cpu) BUG(); } - rqd=prv->rqd + rqi; + rqd = prv->rqd + rqi; printk("Adding cpu %d to runqueue %d\n", cpu, rqi); if ( ! cpumask_test_cpu(rqi, &prv->active_queues) ) @@ -2011,13 +2008,13 @@ csched2_init_pdata(const struct scheduler *ops, void *pdata, int cpu) } /* IRQs already disabled */ - old_lock=pcpu_schedule_lock(cpu); + old_lock = pcpu_schedule_lock(cpu); /* Move spinlock to new runq lock. */ per_cpu(schedule_data, cpu).schedule_lock = &rqd->lock; /* Set the runqueue map */ - prv->runq_map[cpu]=rqi; + prv->runq_map[cpu] = rqi; cpumask_set_cpu(cpu, &rqd->idle); cpumask_set_cpu(cpu, &rqd->active); @@ -2027,11 +2024,20 @@ csched2_init_pdata(const struct scheduler *ops, void *pdata, int cpu) cpumask_set_cpu(cpu, &prv->initialized); - spin_unlock_irqrestore(&prv->lock, flags); - return; } +static void +csched2_init_pdata(const struct scheduler *ops, void *pdata, int cpu) +{ + struct csched2_private *prv = CSCHED2_PRIV(ops); + unsigned long flags; + + spin_lock_irqsave(&prv->lock, flags); + init_pdata(prv, cpu); + spin_unlock_irqrestore(&prv->lock, flags); +} + static void csched2_free_pdata(const struct scheduler *ops, void *pcpu, int cpu) { -- 2.30.2