From nobody Mon Feb 9 16:44:42 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=1559039670; cv=none; d=zoho.com; s=zohoarc; b=h5Vot3nNoiREiUUM2CgasCfJxVBtGIE7EbHO2ZdgdQNH7qjP8dM8OkpBL0s+JXOGvcVHJd2JXr/SsKF7k6/v0CUs9tSw8go60FY2oU0Gm3WQivaObz8ddAFGpXDiC2XmTMolCzU4YVFwYaKg7hwWaAFiXKztzburyxjYGtAGnBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559039670; 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=35xveFv0vskIUsTYMM7CvzuUAp3r4ti4moUDis1iptU=; b=XqoOo8zjjMpD4mQO7JpVEXvbTCtTvVkLWIFc796PdFNEUkD1y6cWreMDn3sY+n/wRA+1acteeP1UYMPAXzRh53/4RLRlo2oAeqqS01GIpxyibKsQmFGo2Hw2ocYgLz+osgyHomZH5w42I16NJTrf2kTHXpzKceU0/NdVDZfrNyw= 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 155903967003360.550852457537076; Tue, 28 May 2019 03:34:30 -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 1hVZQS-0005MQ-4n; Tue, 28 May 2019 10:33:48 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hVZQA-0004kh-Ad for xen-devel@lists.xenproject.org; Tue, 28 May 2019 10:33:30 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 06f4d7dd-8134-11e9-8980-bc764e045a96; Tue, 28 May 2019 10:33:27 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 5358CB04F; Tue, 28 May 2019 10:33:26 +0000 (UTC) X-Inumbo-ID: 06f4d7dd-8134-11e9-8980-bc764e045a96 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Tue, 28 May 2019 12:32:50 +0200 Message-Id: <20190528103313.1343-38-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190528103313.1343-1-jgross@suse.com> References: <20190528103313.1343-1-jgross@suse.com> Subject: [Xen-devel] [PATCH 37/60] xen/sched: add support for multiple vcpus per sched unit where missing 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 , 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" In several places there is support for multiple vcpus per sched unit missing. Add that missing support (with the exception of initial allocation) and missing helpers for that. Signed-off-by: Juergen Gross --- RFC V2: fix vcpu_runstate_helper() V1: add special handling for idle unit in unit_runnable() and unit_runnable_state() --- xen/common/schedule.c | 26 ++++++++------- xen/include/xen/sched-if.h | 80 +++++++++++++++++++++++++++++++++++++-----= ---- 2 files changed, 79 insertions(+), 27 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 352803622d..a4dbc19403 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -180,8 +180,9 @@ static inline void vcpu_runstate_change( s_time_t delta; struct sched_unit *unit =3D v->sched_unit; =20 - ASSERT(v->runstate.state !=3D new_state); ASSERT(spin_is_locked(get_sched_res(v->processor)->schedule_lock)); + if ( v->runstate.state =3D=3D new_state ) + return; =20 vcpu_urgent_count_update(v); =20 @@ -203,15 +204,16 @@ static inline void vcpu_runstate_change( static inline void sched_unit_runstate_change(struct sched_unit *unit, bool running, s_time_t new_entry_time) { - struct vcpu *v =3D unit->vcpu; + struct vcpu *v; =20 - if ( running ) - vcpu_runstate_change(v, v->new_state, new_entry_time); - else - vcpu_runstate_change(v, - ((v->pause_flags & VPF_blocked) ? RUNSTATE_blocked : - (vcpu_runnable(v) ? RUNSTATE_runnable : RUNSTATE_offline)), - new_entry_time); + for_each_sched_unit_vcpu ( unit, v ) + if ( running ) + vcpu_runstate_change(v, v->new_state, new_entry_time); + else + vcpu_runstate_change(v, + ((v->pause_flags & VPF_blocked) ? RUNSTATE_blocked : + (vcpu_runnable(v) ? RUNSTATE_runnable : RUNSTATE_offline)= ), + new_entry_time); } =20 void vcpu_runstate_get(struct vcpu *v, struct vcpu_runstate_info *runstate) @@ -1590,7 +1592,7 @@ static void sched_switch_units(struct sched_resource = *sd, (next->vcpu->runstate.state =3D=3D RUNSTATE_runnable) ? (now - next->state_entry_time) : 0, prev->next_time); =20 - ASSERT(prev->vcpu->runstate.state =3D=3D RUNSTATE_running); + ASSERT(unit_running(prev)); =20 TRACE_4D(TRC_SCHED_SWITCH, prev->domain->domain_id, prev->unit_id, next->domain->domain_id, next->unit_id); @@ -1598,7 +1600,7 @@ static void sched_switch_units(struct sched_resource = *sd, sched_unit_runstate_change(prev, false, now); prev->last_run_time =3D now; =20 - ASSERT(next->vcpu->runstate.state !=3D RUNSTATE_running); + ASSERT(!unit_running(next)); sched_unit_runstate_change(next, true, now); =20 /* @@ -1720,7 +1722,7 @@ void sched_context_switched(struct vcpu *vprev, struc= t vcpu *vnext) while ( atomic_read(&next->rendezvous_out_cnt) ) cpu_relax(); } - else if ( vprev !=3D vnext ) + else if ( vprev !=3D vnext && sched_granularity =3D=3D 1 ) context_saved(vprev); } =20 diff --git a/xen/include/xen/sched-if.h b/xen/include/xen/sched-if.h index 805cefaa07..98d4dc65e2 100644 --- a/xen/include/xen/sched-if.h +++ b/xen/include/xen/sched-if.h @@ -65,29 +65,61 @@ static inline bool is_idle_unit(const struct sched_unit= *unit) return is_idle_vcpu(unit->vcpu); } =20 +static inline unsigned int unit_running(const struct sched_unit *unit) +{ + return unit->runstate_cnt[RUNSTATE_running]; +} + static inline bool unit_runnable(const struct sched_unit *unit) { - return vcpu_runnable(unit->vcpu); + struct vcpu *v; + + if ( is_idle_unit(unit) ) + return true; + + for_each_sched_unit_vcpu ( unit, v ) + if ( vcpu_runnable(v) ) + return true; + + return false; } =20 static inline bool unit_runnable_state(const struct sched_unit *unit) { struct vcpu *v; - bool runnable; + bool runnable, ret =3D false; =20 - v =3D unit->vcpu; - runnable =3D vcpu_runnable(v); + if ( is_idle_unit(unit) ) + return true; =20 - v->new_state =3D runnable ? RUNSTATE_running - : (v->pause_flags & VPF_blocked) - ? RUNSTATE_blocked : RUNSTATE_offline; - return runnable; + for_each_sched_unit_vcpu ( unit, v ) + { + runnable =3D vcpu_runnable(v); + + v->new_state =3D runnable ? RUNSTATE_running + : (v->pause_flags & VPF_blocked) + ? RUNSTATE_blocked : RUNSTATE_offline; + + if ( runnable ) + ret =3D true; + } + + return ret; } =20 static inline void sched_set_res(struct sched_unit *unit, struct sched_resource *res) { - unit->vcpu->processor =3D res->processor; + int cpu =3D cpumask_first(res->cpus); + struct vcpu *v; + + for_each_sched_unit_vcpu ( unit, v ) + { + ASSERT(cpu < nr_cpu_ids); + v->processor =3D cpu; + cpu =3D cpumask_next(cpu, res->cpus); + } + unit->res =3D res; } =20 @@ -99,25 +131,37 @@ static inline unsigned int sched_unit_cpu(struct sched= _unit *unit) static inline void sched_set_pause_flags(struct sched_unit *unit, unsigned int bit) { - __set_bit(bit, &unit->vcpu->pause_flags); + struct vcpu *v; + + for_each_sched_unit_vcpu ( unit, v ) + __set_bit(bit, &v->pause_flags); } =20 static inline void sched_clear_pause_flags(struct sched_unit *unit, unsigned int bit) { - __clear_bit(bit, &unit->vcpu->pause_flags); + struct vcpu *v; + + for_each_sched_unit_vcpu ( unit, v ) + __clear_bit(bit, &v->pause_flags); } =20 static inline void sched_set_pause_flags_atomic(struct sched_unit *unit, unsigned int bit) { - set_bit(bit, &unit->vcpu->pause_flags); + struct vcpu *v; + + for_each_sched_unit_vcpu ( unit, v ) + set_bit(bit, &v->pause_flags); } =20 static inline void sched_clear_pause_flags_atomic(struct sched_unit *unit, unsigned int bit) { - clear_bit(bit, &unit->vcpu->pause_flags); + struct vcpu *v; + + for_each_sched_unit_vcpu ( unit, v ) + clear_bit(bit, &v->pause_flags); } =20 static inline struct sched_unit *sched_idle_unit(unsigned int cpu) @@ -443,12 +487,18 @@ static inline int sched_adjust_cpupool(const struct s= cheduler *s, =20 static inline void sched_unit_pause_nosync(struct sched_unit *unit) { - vcpu_pause_nosync(unit->vcpu); + struct vcpu *v; + + for_each_sched_unit_vcpu ( unit, v ) + vcpu_pause_nosync(v); } =20 static inline void sched_unit_unpause(struct sched_unit *unit) { - vcpu_unpause(unit->vcpu); + struct vcpu *v; + + for_each_sched_unit_vcpu ( unit, v ) + vcpu_unpause(v); } =20 #define REGISTER_SCHEDULER(x) static const struct scheduler *x##_entry \ --=20 2.16.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel