From nobody Tue Nov 11 08:42:58 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=1569567748; cv=none; d=zoho.com; s=zohoarc; b=VYX+Wla5pVdffEsooJYFL85RRhTPeGKzZJpD3BBo1qmRJjgFETKvQ++p6HpEXPn9DTAY1YXXL3vAEfX6YuV8mcVCfWlNNif5LrJwv59ikLj4e5uOKZQkZZXAwm2e53HkgBKhji1Vz8uAlxOUU1/+zYYA0A1B4B6g9MlVnPdNDR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569567748; 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=TbcKuagrc5YGH7EKLFjcWXYUx9FWZwhRDvjDqHM/UbY=; b=aVUxXIExiDpVf4g5g7qWuVXEA0RZfDSHM7ginztWktmtBOXaebcvjfRvjH6POSdZ71pc9UcAay8GpETxHXBQkdCnQ+6SrVtO64jP4kyghBZpgv2ezBUwbSzNDc4EUgSPAAbrW+rFugO6XSsKMgkzyZ91s394MWvxtKgnQ+IuNOo= 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 1569567748299736.4696317575483; Fri, 27 Sep 2019 00:02:28 -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 1iDkFR-00033i-Pz; Fri, 27 Sep 2019 07:01:01 +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 1iDkFQ-00033V-9P for xen-devel@lists.xenproject.org; Fri, 27 Sep 2019 07:01:00 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by localhost (Halon) with ESMTPS id 8d452f74-e0f4-11e9-966c-12813bfff9fa; 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 49083AE1A; Fri, 27 Sep 2019 07:00:55 +0000 (UTC) X-Inumbo-ID: 8d452f74-e0f4-11e9-966c-12813bfff9fa 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:08 +0200 Message-Id: <20190927070050.12405-5-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 04/46] 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 unit 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 Reviewed-by: Dario Faggioli --- V1: - add accessor functions - use DEFINE_PER_CPU_READ_MOSTLY (Dario Faggioli) V3: - don't pre-define struct sched_resource in sched.h (Jan Beulich) - rename res->processor to res->master_cpu (Jan Beulich) --- 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 | 19 ++++++++++++++++++- xen/include/xen/sched-if.h | 18 ++++++++++++++++++ xen/include/xen/sched.h | 1 + 7 files changed, 51 insertions(+), 1 deletion(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 3f77cabc73..4b4d7021de 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -1026,6 +1026,7 @@ csched_unit_insert(const struct scheduler *ops, struc= t sched_unit *unit) lock =3D vcpu_schedule_lock_irq(vc); =20 vc->processor =3D csched_cpu_pick(ops, unit); + unit->res =3D get_sched_res(vc->processor); =20 spin_unlock_irq(lock); =20 @@ -1662,6 +1663,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_unit->res =3D get_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 7eb8330a31..2981d642b0 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -2520,6 +2520,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_unit->res =3D get_sched_res(svc->vcpu->processor); trqd->pick_bias =3D svc->vcpu->processor; ASSERT(svc->vcpu->processor < nr_cpu_ids); =20 @@ -2775,6 +2776,7 @@ csched2_unit_migrate( } _runq_deassign(svc); vc->processor =3D new_cpu; + unit->res =3D get_sched_res(new_cpu); return; } =20 @@ -2795,7 +2797,10 @@ csched2_unit_migrate( if ( trqd !=3D svc->rqd ) migrate(ops, svc, trqd, now); else + { vc->processor =3D new_cpu; + unit->res =3D get_sched_res(new_cpu); + } } =20 static int @@ -3120,6 +3125,7 @@ csched2_unit_insert(const struct scheduler *ops, stru= ct sched_unit *unit) lock =3D vcpu_schedule_lock_irq(vc); =20 vc->processor =3D csched2_cpu_pick(ops, unit); + unit->res =3D get_sched_res(vc->processor); =20 spin_unlock_irq(lock); =20 @@ -3597,6 +3603,7 @@ csched2_schedule( { snext->credit +=3D CSCHED2_MIGRATE_COMPENSATION; snext->vcpu->processor =3D cpu; + snext->vcpu->sched_unit->res =3D get_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 48ee5ad0b8..cb5e1b52db 100644 --- a/xen/common/sched_null.c +++ b/xen/common/sched_null.c @@ -337,6 +337,7 @@ static void vcpu_assign(struct null_private *prv, struc= t vcpu *v, =20 per_cpu(npc, cpu).vcpu =3D v; v->processor =3D cpu; + v->sched_unit->res =3D get_sched_res(cpu); cpumask_clear_cpu(cpu, &prv->cpus_free); =20 dprintk(XENLOG_G_INFO, "%d <-- %pv\n", cpu, v); @@ -457,6 +458,7 @@ static void null_unit_insert(const struct scheduler *op= s, =20 retry: cpu =3D v->processor =3D pick_cpu(prv, v); + unit->res =3D get_sched_res(cpu); =20 spin_unlock(lock); =20 @@ -749,6 +751,7 @@ static void null_unit_migrate(const struct scheduler *o= ps, */ out: v->processor =3D new_cpu; + unit->res =3D get_sched_res(new_cpu); } =20 #ifndef NDEBUG diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 4547f55eda..01e95f3276 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -893,6 +893,7 @@ rt_unit_insert(const struct scheduler *ops, struct sche= d_unit *unit) =20 /* This is safe because vc isn't yet being scheduled */ vc->processor =3D rt_cpu_pick(ops, unit); + unit->res =3D get_sched_res(vc->processor); =20 lock =3D vcpu_schedule_lock_irq(vc); =20 @@ -1123,6 +1124,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_unit->res =3D get_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 d34b789a8f..774f127d88 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -67,6 +67,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_READ_MOSTLY(struct sched_resource *, sched_res); =20 /* Scratch space for cpumasks. */ DEFINE_PER_CPU(cpumask_t, cpumask_scratch); @@ -89,7 +90,7 @@ sched_idle_switch_sched(struct scheduler *new_ops, unsign= ed int cpu, static int sched_idle_cpu_pick(const struct scheduler *ops, const struct sched_unit *= unit) { - return unit->vcpu_list->processor; + return unit->res->master_cpu; } =20 static void * @@ -364,6 +365,7 @@ int sched_init_vcpu(struct vcpu *v, unsigned int proces= sor) if ( (unit =3D sched_alloc_unit(v)) =3D=3D NULL ) return 1; =20 + unit->res =3D get_sched_res(processor); /* Initialise the per-vcpu timers. */ spin_lock_init(&v->periodic_timer_lock); init_timer(&v->periodic_timer, vcpu_periodic_timer_fn, @@ -479,6 +481,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_unit->res =3D get_sched_res(new_p); /* * With v->processor modified we must not * - make any further changes assuming we hold the scheduler lock, @@ -831,12 +834,14 @@ void restore_vcpu_affinity(struct domain *d) } =20 v->processor =3D cpumask_any(cpumask_scratch_cpu(cpu)); + v->sched_unit->res =3D get_sched_res(v->processor); =20 spin_unlock_irq(lock); =20 /* v->processor might have changed, so reacquire the lock. */ lock =3D vcpu_schedule_lock_irq(v); v->processor =3D sched_pick_cpu(vcpu_scheduler(v), v->sched_unit); + v->sched_unit->res =3D get_sched_res(v->processor); spin_unlock_irq(lock); =20 if ( old_cpu !=3D v->processor ) @@ -1710,6 +1715,13 @@ static void poll_timer_fn(void *data) static int cpu_schedule_up(unsigned int cpu) { struct schedule_data *sd =3D &per_cpu(schedule_data, cpu); + struct sched_resource *res; + + res =3D xzalloc(struct sched_resource); + if ( res =3D=3D NULL ) + return -ENOMEM; + res->master_cpu =3D cpu; + set_sched_res(cpu, res); =20 per_cpu(scheduler, cpu) =3D &sched_idle_ops; spin_lock_init(&sd->_lock); @@ -1723,6 +1735,8 @@ static int cpu_schedule_up(unsigned int cpu) =20 if ( idle_vcpu[cpu] =3D=3D NULL ) vcpu_create(idle_vcpu[0]->domain, cpu, cpu); + else + idle_vcpu[cpu]->sched_unit->res =3D res; =20 if ( idle_vcpu[cpu] =3D=3D NULL ) return -ENOMEM; @@ -1745,6 +1759,9 @@ static void cpu_schedule_down(unsigned int cpu) struct schedule_data *sd =3D &per_cpu(schedule_data, cpu); =20 kill_timer(&sd->s_timer); + + set_sched_res(cpu, NULL); + xfree(sd); } =20 void sched_rm_cpu(unsigned int cpu) diff --git a/xen/include/xen/sched-if.h b/xen/include/xen/sched-if.h index a10f278ba3..5c9ac07587 100644 --- a/xen/include/xen/sched-if.h +++ b/xen/include/xen/sched-if.h @@ -44,9 +44,24 @@ struct schedule_data { =20 #define curr_on_cpu(c) (per_cpu(schedule_data, c).curr) =20 +struct sched_resource { + unsigned int master_cpu; /* Cpu with lowest id in scheduling resource= . */ +}; + 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); + +static inline struct sched_resource *get_sched_res(unsigned int cpu) +{ + return per_cpu(sched_res, cpu); +} + +static inline void set_sched_res(unsigned int cpu, struct sched_resource *= res) +{ + per_cpu(sched_res, cpu) =3D res; +} =20 /* * Scratch space, for avoiding having too many cpumask_t on the stack. @@ -334,7 +349,10 @@ static inline void sched_migrate(const struct schedule= r *s, if ( s->migrate ) s->migrate(s, unit, cpu); else + { unit->vcpu_list->processor =3D cpu; + unit->res =3D get_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 36b1c3b010..5b034d5b59 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -278,6 +278,7 @@ struct sched_unit { struct vcpu *vcpu_list; void *priv; /* scheduler private data */ struct sched_unit *next_in_list; + struct sched_resource *res; 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