From nobody Mon Feb 9 15:45:23 2026 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=1557125913; cv=none; d=zoho.com; s=zohoarc; b=Nk8kYzRxUj2AD3pfn+w1mCyTdzMv/iQ6Hdmjq/x4j3ip8p/4XPD/aEycZS+WIan2SMDqhFOKDaN728LHDzwLKr53E1qXYgsiNQNKiA0d7gkVnIdKZ7jMfRfCWlqzlhNziTbFpksDMeeRxSnRnC2MbvdSSJCAXDh02q9C9MszVDM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557125913; 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=QMWuIfxHmcQaFzODmhAdp+/QAL//vhCsg/0T/gxaVGY=; b=l9/W+8Jr/tdI6XnLAZ6hsMNuKjGy5MIBJ/QWHj2tEynS4tfDNJtJOgD+U3e7swbD27acaiBerdlHii1o80sEE40WQTXdsR9d7AfumUhTu/rWdVPGIelyEzqv1pmnHJU97sKKNvDZ3er6DAA/5GQ7z5HcFnLt+O2XlYYikfe/UBQ= 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 1557125913653159.14867054079377; Sun, 5 May 2019 23:58:33 -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 1hNXYd-0001yI-5g; Mon, 06 May 2019 06:57:03 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hNXYb-0001wq-Nd for xen-devel@lists.xenproject.org; Mon, 06 May 2019 06:57:01 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 20443224-6fcc-11e9-a7f1-eb0466932004; Mon, 06 May 2019 06:56:52 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 09644AEAE; Mon, 6 May 2019 06:56:50 +0000 (UTC) X-Inumbo-ID: 20443224-6fcc-11e9-a7f1-eb0466932004 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Mon, 6 May 2019 08:56:05 +0200 Message-Id: <20190506065644.7415-7-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190506065644.7415-1-jgross@suse.com> References: <20190506065644.7415-1-jgross@suse.com> Subject: [Xen-devel] [PATCH RFC V2 06/45] xen/sched: introduce struct sched_resource 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 , Dario Faggioli , Julien Grall , 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" Add a scheduling abstraction layer between physical processors and the schedulers by introducing a struct sched_resource. Each scheduler item running is active on such a scheduler resource. For the time being there is one struct sched_resource per cpu, but in future there might be one for each core or socket only. Signed-off-by: Juergen Gross --- xen/common/sched_credit.c | 2 ++ xen/common/sched_credit2.c | 7 +++++++ xen/common/sched_null.c | 3 +++ xen/common/sched_rt.c | 2 ++ xen/common/schedule.c | 15 +++++++++++++++ xen/include/xen/sched-if.h | 8 ++++++++ xen/include/xen/sched.h | 3 +++ 7 files changed, 40 insertions(+) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index cb8e167fc9..fc068a1c5f 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -1040,6 +1040,7 @@ csched_item_insert(const struct scheduler *ops, struc= t sched_item *item) lock =3D vcpu_schedule_lock_irq(vc); =20 vc->processor =3D csched_cpu_pick(ops, item); + item->res =3D per_cpu(sched_res, vc->processor); =20 spin_unlock_irq(lock); =20 @@ -1675,6 +1676,7 @@ csched_runq_steal(int peer_cpu, int cpu, int pri, int= balance_step) WARN_ON(vc->is_urgent); runq_remove(speer); vc->processor =3D cpu; + vc->sched_item->res =3D per_cpu(sched_res, cpu); /* * speer will start executing directly on cpu, without having = to * go through runq_insert(). So we must update the runnable co= unt diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 9c052c24a7..614d71d948 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -2519,6 +2519,7 @@ static void migrate(const struct scheduler *ops, &trqd->active); svc->vcpu->processor =3D cpumask_cycle(trqd->pick_bias, cpumask_scratch_cpu(cpu)); + svc->vcpu->sched_item->res =3D per_cpu(sched_res, svc->vcpu->proce= ssor); trqd->pick_bias =3D svc->vcpu->processor; ASSERT(svc->vcpu->processor < nr_cpu_ids); =20 @@ -2774,6 +2775,7 @@ csched2_item_migrate( } _runq_deassign(svc); vc->processor =3D new_cpu; + item->res =3D per_cpu(sched_res, new_cpu); return; } =20 @@ -2794,7 +2796,10 @@ csched2_item_migrate( if ( trqd !=3D svc->rqd ) migrate(ops, svc, trqd, now); else + { vc->processor =3D new_cpu; + item->res =3D per_cpu(sched_res, new_cpu); + } } =20 static int @@ -3119,6 +3124,7 @@ csched2_item_insert(const struct scheduler *ops, stru= ct sched_item *item) lock =3D vcpu_schedule_lock_irq(vc); =20 vc->processor =3D csched2_cpu_pick(ops, item); + item->res =3D per_cpu(sched_res, vc->processor); =20 spin_unlock_irq(lock); =20 @@ -3596,6 +3602,7 @@ csched2_schedule( { snext->credit +=3D CSCHED2_MIGRATE_COMPENSATION; snext->vcpu->processor =3D cpu; + snext->vcpu->sched_item->res =3D per_cpu(sched_res, cpu); SCHED_STAT_CRANK(migrated); ret.migrated =3D 1; } diff --git a/xen/common/sched_null.c b/xen/common/sched_null.c index eb51ddbccb..114b32e2e1 100644 --- a/xen/common/sched_null.c +++ b/xen/common/sched_null.c @@ -343,6 +343,7 @@ static void vcpu_assign(struct null_private *prv, struc= t vcpu *v, { per_cpu(npc, cpu).vcpu =3D v; v->processor =3D cpu; + v->sched_item->res =3D per_cpu(sched_res, cpu); cpumask_clear_cpu(cpu, &prv->cpus_free); =20 dprintk(XENLOG_G_INFO, "%d <-- %pv\n", cpu, v); @@ -429,6 +430,7 @@ static void null_item_insert(const struct scheduler *op= s, retry: =20 cpu =3D v->processor =3D pick_cpu(prv, v); + item->res =3D per_cpu(sched_res, cpu); =20 spin_unlock(lock); =20 @@ -675,6 +677,7 @@ static void null_item_migrate(const struct scheduler *o= ps, * by this, will be fixed-up during resume. */ v->processor =3D new_cpu; + item->res =3D per_cpu(sched_res, new_cpu); } =20 #ifndef NDEBUG diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index c830aac92f..44b86fc08d 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -902,6 +902,7 @@ rt_item_insert(const struct scheduler *ops, struct sche= d_item *item) =20 /* This is safe because vc isn't yet being scheduled */ vc->processor =3D rt_cpu_pick(ops, item); + item->res =3D per_cpu(sched_res, vc->processor); =20 lock =3D vcpu_schedule_lock_irq(vc); =20 @@ -1132,6 +1133,7 @@ rt_schedule(const struct scheduler *ops, s_time_t now= , bool_t tasklet_work_sched if ( snext->vcpu->processor !=3D cpu ) { snext->vcpu->processor =3D cpu; + snext->vcpu->sched_item->res =3D per_cpu(sched_res, cpu); ret.migrated =3D 1; } ret.time =3D snext->cur_budget; /* invoke the scheduler next time = */ diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 2d719a6acc..e3d9ab5a3a 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -63,6 +63,7 @@ static void poll_timer_fn(void *data); /* This is global for now so that private implementations can reach it */ DEFINE_PER_CPU(struct schedule_data, schedule_data); DEFINE_PER_CPU(struct scheduler *, scheduler); +DEFINE_PER_CPU(struct sched_resource *, sched_res); =20 /* Scratch space for cpumasks. */ DEFINE_PER_CPU(cpumask_t, cpumask_scratch); @@ -305,6 +306,7 @@ int sched_init_vcpu(struct vcpu *v, unsigned int proces= sor) if ( (item =3D sched_alloc_item(v)) =3D=3D NULL ) return 1; =20 + item->res =3D per_cpu(sched_res, processor); /* Initialise the per-vcpu timers. */ init_timer(&v->periodic_timer, vcpu_periodic_timer_fn, v, v->processor); @@ -419,6 +421,7 @@ int sched_move_domain(struct domain *d, struct cpupool = *c) sched_set_affinity(v, &cpumask_all, &cpumask_all); =20 v->processor =3D new_p; + v->sched_item->res =3D per_cpu(sched_res, new_p); /* * With v->processor modified we must not * - make any further changes assuming we hold the scheduler lock, @@ -787,9 +790,11 @@ void restore_vcpu_affinity(struct domain *d) } =20 v->processor =3D cpumask_any(cpumask_scratch_cpu(cpu)); + v->sched_item->res =3D per_cpu(sched_res, v->processor); =20 lock =3D vcpu_schedule_lock_irq(v); v->processor =3D sched_pick_cpu(vcpu_scheduler(v), v->sched_item); + v->sched_item->res =3D per_cpu(sched_res, v->processor); spin_unlock_irq(lock); =20 if ( old_cpu !=3D v->processor ) @@ -1618,6 +1623,13 @@ static int cpu_schedule_up(unsigned int cpu) { struct schedule_data *sd =3D &per_cpu(schedule_data, cpu); void *sched_priv; + struct sched_resource *res; + + res =3D xzalloc(struct sched_resource); + if ( res =3D=3D NULL ) + return -ENOMEM; + res->processor =3D cpu; + per_cpu(sched_res, cpu) =3D res; =20 per_cpu(scheduler, cpu) =3D &ops; spin_lock_init(&sd->_lock); @@ -1682,6 +1694,9 @@ static void cpu_schedule_down(unsigned int cpu) sd->sched_priv =3D NULL; =20 kill_timer(&sd->s_timer); + + xfree(per_cpu(sched_res, cpu)); + per_cpu(sched_res, cpu) =3D NULL; } =20 static int cpu_schedule_callback( diff --git a/xen/include/xen/sched-if.h b/xen/include/xen/sched-if.h index b4a93bb76b..10570c9f6e 100644 --- a/xen/include/xen/sched-if.h +++ b/xen/include/xen/sched-if.h @@ -44,9 +44,14 @@ struct schedule_data { =20 #define curr_on_cpu(c) (per_cpu(schedule_data, c).curr) =20 +struct sched_resource { + unsigned processor; +}; + DECLARE_PER_CPU(struct schedule_data, schedule_data); DECLARE_PER_CPU(struct scheduler *, scheduler); DECLARE_PER_CPU(struct cpupool *, cpupool); +DECLARE_PER_CPU(struct sched_resource *, sched_res); =20 /* * Scratch space, for avoiding having too many cpumask_t on the stack. @@ -362,7 +367,10 @@ static inline void sched_migrate(const struct schedule= r *s, if ( s->migrate ) s->migrate(s, item, cpu); else + { item->vcpu->processor =3D cpu; + item->res =3D per_cpu(sched_res, cpu); + } } =20 static inline int sched_pick_cpu(const struct scheduler *s, diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index bd6489a33d..aa4ff25f76 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -276,10 +276,13 @@ struct vcpu struct arch_vcpu arch; }; =20 +struct sched_resource; + struct sched_item { struct vcpu *vcpu; void *priv; /* scheduler private data */ struct sched_item *next_in_list; + struct sched_resource *res; }; =20 #define for_each_sched_item(d, e) \ --=20 2.16.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel