From nobody Tue Nov 11 08:45:25 2025 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1569567740; cv=none; d=zoho.com; s=zohoarc; b=LFKo26Q3OrTsk9604DllKjp/67bHNqRWEHA+eto/mgGT3dt2VOGEx/Bfr5RA8xrrNYxFcRaxDCJQ2FMM19Le/vgOkPRjX2s9rs8B54eFdU7NXgnhp/YfjePniU7vJzmbp5nzEag6mcYCRLoJyG6kWcuql5hxN52zMpwkg4C+OT8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569567740; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=QGuBBrE9ZfnTZSu/JFMeWv4WLxLve1SyxkwDD0BgQSI=; b=hruqz0ZZZ7IOPJxypyKwJOpryRGo/Dm2eN7a/VrsoD2wHRdKcjs8jRUb+dCOpSz/ELjfB/xhmcvtUg2tLIhxDBRANvyFq/tpvoH9YdSrs9k4RxgSq/R7bw49JiN3Lxpbg8qil0qnRo+ERAFsdrhpPkkHPwKnjDzIFpkDhmYFulI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1569567740080394.65797645522946; Fri, 27 Sep 2019 00:02:20 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iDkFU-00037r-9a; Fri, 27 Sep 2019 07:01:04 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iDkFS-000368-P3 for xen-devel@lists.xenproject.org; Fri, 27 Sep 2019 07:01:02 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by localhost (Halon) with ESMTPS id 8d51577c-e0f4-11e9-bf31-bc764e2007e4; Fri, 27 Sep 2019 07:00:56 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 49A1AAECB; Fri, 27 Sep 2019 07:00:55 +0000 (UTC) X-Inumbo-ID: 8d51577c-e0f4-11e9-bf31-bc764e2007e4 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Fri, 27 Sep 2019 09:00:06 +0200 Message-Id: <20190927070050.12405-3-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190927070050.12405-1-jgross@suse.com> References: <20190927070050.12405-1-jgross@suse.com> Subject: [Xen-devel] [PATCH v4 02/46] xen/sched: move per-vcpu scheduler private data pointer to sched_unit X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Tim Deegan , Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Robert VanVossen , Dario Faggioli , Julien Grall , Josh Whitehead , Meng Xu , Jan Beulich MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This prepares making the different schedulers vcpu agnostic. Note that some scheduler specific accessor function are misnamed after this patch. This will be corrected in later patches. Signed-off-by: Juergen Gross Reviewed-by: Dario Faggioli --- xen/common/sched_arinc653.c | 4 ++-- xen/common/sched_credit.c | 6 +++--- xen/common/sched_credit2.c | 10 +++++----- xen/common/sched_null.c | 4 ++-- xen/common/sched_rt.c | 4 ++-- xen/common/schedule.c | 14 +++++++------- xen/include/xen/sched.h | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/xen/common/sched_arinc653.c b/xen/common/sched_arinc653.c index 7f9ef36b42..67009f235d 100644 --- a/xen/common/sched_arinc653.c +++ b/xen/common/sched_arinc653.c @@ -53,7 +53,7 @@ * Return a pointer to the ARINC 653-specific scheduler data information * associated with the given VCPU (vc) */ -#define AVCPU(vc) ((arinc653_vcpu_t *)(vc)->sched_priv) +#define AVCPU(vc) ((arinc653_vcpu_t *)(vc)->sched_unit->priv) =20 /** * Return the global scheduler private data given the scheduler ops pointer @@ -653,7 +653,7 @@ a653_switch_sched(struct scheduler *new_ops, unsigned i= nt cpu, =20 ASSERT(!pdata && svc && is_idle_vcpu(svc->vc)); =20 - idle_vcpu[cpu]->sched_priv =3D vdata; + idle_vcpu[cpu]->sched_unit->priv =3D vdata; =20 return &sd->_lock; } diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index f7c751c2e9..3f77cabc73 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -83,7 +83,7 @@ ((struct csched_private *)((_ops)->sched_data)) #define CSCHED_PCPU(_c) \ ((struct csched_pcpu *)per_cpu(schedule_data, _c).sched_priv) -#define CSCHED_VCPU(_vcpu) ((struct csched_vcpu *) (_vcpu)->sched_priv) +#define CSCHED_VCPU(_vcpu) ((struct csched_vcpu *) (_vcpu)->sched_unit->p= riv) #define CSCHED_DOM(_dom) ((struct csched_dom *) (_dom)->sched_priv) #define RUNQ(_cpu) (&(CSCHED_PCPU(_cpu)->runq)) =20 @@ -634,7 +634,7 @@ csched_switch_sched(struct scheduler *new_ops, unsigned= int cpu, =20 ASSERT(svc && is_idle_vcpu(svc->vcpu)); =20 - idle_vcpu[cpu]->sched_priv =3D vdata; + idle_vcpu[cpu]->sched_unit->priv =3D vdata; =20 /* * We are holding the runqueue lock already (it's been taken in @@ -1017,7 +1017,7 @@ static void csched_unit_insert(const struct scheduler *ops, struct sched_unit *unit) { struct vcpu *vc =3D unit->vcpu_list; - struct csched_vcpu *svc =3D vc->sched_priv; + struct csched_vcpu *svc =3D unit->priv; spinlock_t *lock; =20 BUG_ON( is_idle_vcpu(vc) ); diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 929f2a2450..7eb8330a31 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -573,7 +573,7 @@ static inline struct csched2_pcpu *csched2_pcpu(unsigne= d int cpu) =20 static inline struct csched2_vcpu *csched2_vcpu(const struct vcpu *v) { - return v->sched_priv; + return v->sched_unit->priv; } =20 static inline struct csched2_dom *csched2_dom(const struct domain *d) @@ -971,7 +971,7 @@ _runq_assign(struct csched2_vcpu *svc, struct csched2_r= unqueue_data *rqd) static void runq_assign(const struct scheduler *ops, struct vcpu *vc) { - struct csched2_vcpu *svc =3D vc->sched_priv; + struct csched2_vcpu *svc =3D vc->sched_unit->priv; =20 ASSERT(svc->rqd =3D=3D NULL); =20 @@ -998,7 +998,7 @@ _runq_deassign(struct csched2_vcpu *svc) static void runq_deassign(const struct scheduler *ops, struct vcpu *vc) { - struct csched2_vcpu *svc =3D vc->sched_priv; + struct csched2_vcpu *svc =3D vc->sched_unit->priv; =20 ASSERT(svc->rqd =3D=3D c2rqd(ops, vc->processor)); =20 @@ -3109,7 +3109,7 @@ static void csched2_unit_insert(const struct scheduler *ops, struct sched_unit *unit) { struct vcpu *vc =3D unit->vcpu_list; - struct csched2_vcpu *svc =3D vc->sched_priv; + struct csched2_vcpu *svc =3D unit->priv; struct csched2_dom * const sdom =3D svc->sdom; spinlock_t *lock; =20 @@ -3891,7 +3891,7 @@ csched2_switch_sched(struct scheduler *new_ops, unsig= ned int cpu, ASSERT(!local_irq_is_enabled()); write_lock(&prv->lock); =20 - idle_vcpu[cpu]->sched_priv =3D vdata; + idle_vcpu[cpu]->sched_unit->priv =3D vdata; =20 rqi =3D init_pdata(prv, pdata, cpu); =20 diff --git a/xen/common/sched_null.c b/xen/common/sched_null.c index 870bb67a18..48ee5ad0b8 100644 --- a/xen/common/sched_null.c +++ b/xen/common/sched_null.c @@ -116,7 +116,7 @@ static inline struct null_private *null_priv(const stru= ct scheduler *ops) =20 static inline struct null_vcpu *null_vcpu(const struct vcpu *v) { - return v->sched_priv; + return v->sched_unit->priv; } =20 static inline bool vcpu_check_affinity(struct vcpu *v, unsigned int cpu, @@ -422,7 +422,7 @@ static spinlock_t *null_switch_sched(struct scheduler *= new_ops, =20 ASSERT(nvc && is_idle_vcpu(nvc->vcpu)); =20 - idle_vcpu[cpu]->sched_priv =3D vdata; + idle_vcpu[cpu]->sched_unit->priv =3D vdata; =20 /* * We are holding the runqueue lock already (it's been taken in diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 492d8f6d2b..4547f55eda 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -235,7 +235,7 @@ static inline struct rt_private *rt_priv(const struct s= cheduler *ops) =20 static inline struct rt_vcpu *rt_vcpu(const struct vcpu *vcpu) { - return vcpu->sched_priv; + return vcpu->sched_unit->priv; } =20 static inline struct list_head *rt_runq(const struct scheduler *ops) @@ -760,7 +760,7 @@ rt_switch_sched(struct scheduler *new_ops, unsigned int= cpu, dprintk(XENLOG_DEBUG, "RTDS: timer initialized on cpu %u\n", cpu); } =20 - idle_vcpu[cpu]->sched_priv =3D vdata; + idle_vcpu[cpu]->sched_unit->priv =3D vdata; =20 return &prv->lock; } diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 1e9f5d5d5b..6be30c9161 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -81,7 +81,7 @@ static spinlock_t * sched_idle_switch_sched(struct scheduler *new_ops, unsigned int cpu, void *pdata, void *vdata) { - idle_vcpu[cpu]->sched_priv =3D NULL; + idle_vcpu[cpu]->sched_unit->priv =3D NULL; =20 return &sched_free_cpu_lock; } @@ -327,8 +327,8 @@ int sched_init_vcpu(struct vcpu *v, unsigned int proces= sor) init_timer(&v->poll_timer, poll_timer_fn, v, v->processor); =20 - v->sched_priv =3D sched_alloc_udata(dom_scheduler(d), unit, d->sched_p= riv); - if ( v->sched_priv =3D=3D NULL ) + unit->priv =3D sched_alloc_udata(dom_scheduler(d), unit, d->sched_priv= ); + if ( unit->priv =3D=3D NULL ) { xfree(unit); return 1; @@ -424,7 +424,7 @@ int sched_move_domain(struct domain *d, struct cpupool = *c) { spinlock_t *lock; =20 - vcpudata =3D v->sched_priv; + vcpudata =3D v->sched_unit->priv; =20 migrate_timer(&v->periodic_timer, new_p); migrate_timer(&v->singleshot_timer, new_p); @@ -442,7 +442,7 @@ int sched_move_domain(struct domain *d, struct cpupool = *c) */ spin_unlock_irq(lock); =20 - v->sched_priv =3D vcpu_priv[v->vcpu_id]; + v->sched_unit->priv =3D vcpu_priv[v->vcpu_id]; if ( !d->is_dying ) sched_move_irqs(v); =20 @@ -474,7 +474,7 @@ void sched_destroy_vcpu(struct vcpu *v) if ( test_and_clear_bool(v->is_urgent) ) atomic_dec(&per_cpu(schedule_data, v->processor).urgent_count); sched_remove_unit(vcpu_scheduler(v), unit); - sched_free_udata(vcpu_scheduler(v), v->sched_priv); + sched_free_udata(vcpu_scheduler(v), unit->priv); v->sched_unit =3D NULL; xfree(unit); } @@ -1929,7 +1929,7 @@ int schedule_cpu_switch(unsigned int cpu, struct cpup= ool *c) */ old_lock =3D pcpu_schedule_lock_irqsave(cpu, &flags); =20 - vpriv_old =3D idle->sched_priv; + vpriv_old =3D idle->sched_unit->priv; ppriv_old =3D sd->sched_priv; new_lock =3D sched_switch_sched(new_ops, cpu, ppriv, vpriv); =20 diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index ebe95b59a4..fb45da05ee 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -162,7 +162,6 @@ struct vcpu struct timer poll_timer; /* timeout for SCHEDOP_poll */ =20 struct sched_unit *sched_unit; - void *sched_priv; /* scheduler-specific data */ =20 struct vcpu_runstate_info runstate; #ifndef CONFIG_COMPAT @@ -277,6 +276,7 @@ struct vcpu struct sched_unit { struct domain *domain; struct vcpu *vcpu_list; + void *priv; /* scheduler private data */ unsigned int unit_id; }; =20 --=20 2.16.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel