From nobody Tue Nov 11 08:48:48 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=1569567772; cv=none; d=zoho.com; s=zohoarc; b=CclRTxnNutks+eGNQiKPCf9hI2vsktqHtSnUTHPPRCoHtgsLP+ZRBr8/vvRA92OEk2X1sMZfzBZnNiA9XAKu94aBCNYgLtZXQMkqxlk3gL+B/WqS7EAYQ2kKv36YVvHKwBYQa1F6kyaVJ/2m6kgflOC9+oAAKDkNZqG+ChWwa78= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569567772; 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=2dhCwf4rGqQ3I2/Bz4aR+hxQAoPlc+F6dMdMyf0/IMA=; b=YM45VPAao//KnXzBtJH8ySUj+1RQBzGtuEVtZ7w/aG2eY+Sr65lUBSgkT0jpVNb36hQHh7EKne2zdr8Bm/1qjxQ0xEe8A8A2VQ/0cQIsaT5TTlxhvOLg3YkOd1KnEMOgUBr5BBkwunqBGnJCcuEgPQj9Yebb7C8OC/fuG66/oLQ= 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 1569567772925608.6329835326771; Fri, 27 Sep 2019 00:02:52 -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 1iDkGX-0004OV-34; Fri, 27 Sep 2019 07:02:09 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iDkGV-0004MJ-SR for xen-devel@lists.xenproject.org; Fri, 27 Sep 2019 07:02:07 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by localhost (Halon) with ESMTPS id 93a549f8-e0f4-11e9-bf31-bc764e2007e4; Fri, 27 Sep 2019 07:01:07 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 3673AB005; Fri, 27 Sep 2019 07:01:04 +0000 (UTC) X-Inumbo-ID: 93a549f8-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:36 +0200 Message-Id: <20190927070050.12405-33-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 32/46] xen/sched: support allocating multiple vcpus into one 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 , George Dunlap , Dario Faggioli 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" With a scheduling granularity greater than 1 multiple vcpus share the same struct sched_unit. Support that. Setting the initial processor must be done carefully: we can't use sched_set_res() as that relies on for_each_sched_unit_vcpu() which in turn needs the vcpu already as a member of the domain's vcpu linked list, which isn't the case. Signed-off-by: Juergen Gross Reviewed-by: Dario Faggioli --- V4: - merge patch 36 of V3 into this one (Jan Beulich) - add some comments (Jan Beulich) - use unit_id instead of vcpu_list->vcpu_id (Jan Beulich) --- xen/common/schedule.c | 97 ++++++++++++++++++++++++++++++++++++++++-------= ---- 1 file changed, 76 insertions(+), 21 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index ae5c807c6a..b11a1c2538 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -347,7 +347,7 @@ static void sched_spin_unlock_double(spinlock_t *lock1,= spinlock_t *lock2, spin_unlock_irqrestore(lock1, flags); } =20 -static void sched_free_unit(struct sched_unit *unit) +static void sched_free_unit_mem(struct sched_unit *unit) { struct sched_unit *prev_unit; struct domain *d =3D unit->domain; @@ -366,8 +366,6 @@ static void sched_free_unit(struct sched_unit *unit) } } =20 - unit->vcpu_list->sched_unit =3D NULL; - free_cpumask_var(unit->cpu_hard_affinity); free_cpumask_var(unit->cpu_hard_affinity_saved); free_cpumask_var(unit->cpu_soft_affinity); @@ -375,18 +373,65 @@ static void sched_free_unit(struct sched_unit *unit) xfree(unit); } =20 +static void sched_free_unit(struct sched_unit *unit, struct vcpu *v) +{ + struct vcpu *vunit; + unsigned int cnt =3D 0; + + /* Don't count to be released vcpu, might be not in vcpu list yet. */ + for_each_sched_unit_vcpu ( unit, vunit ) + if ( vunit !=3D v ) + cnt++; + + v->sched_unit =3D NULL; + unit->runstate_cnt[v->runstate.state]--; + + if ( unit->vcpu_list =3D=3D v ) + unit->vcpu_list =3D v->next_in_list; + + if ( !cnt ) + sched_free_unit_mem(unit); +} + +static void sched_unit_add_vcpu(struct sched_unit *unit, struct vcpu *v) +{ + v->sched_unit =3D unit; + + /* All but idle vcpus are allocated with sequential vcpu_id. */ + if ( !unit->vcpu_list || unit->vcpu_list->vcpu_id > v->vcpu_id ) + { + unit->vcpu_list =3D v; + /* + * unit_id is always the same as lowest vcpu_id of unit. + * This is used for stopping for_each_sched_unit_vcpu() loop and in + * order to support cpupools with different granularities. + */ + unit->unit_id =3D v->vcpu_id; + } + unit->runstate_cnt[v->runstate.state]++; +} + static struct sched_unit *sched_alloc_unit(struct vcpu *v) { struct sched_unit *unit, **prev_unit; struct domain *d =3D v->domain; =20 + for_each_sched_unit ( d, unit ) + if ( unit->unit_id / sched_granularity =3D=3D + v->vcpu_id / sched_granularity ) + break; + + if ( unit ) + { + sched_unit_add_vcpu(unit, v); + return unit; + } + if ( (unit =3D xzalloc(struct sched_unit)) =3D=3D NULL ) return NULL; =20 - unit->vcpu_list =3D v; - unit->unit_id =3D v->vcpu_id; unit->domain =3D d; - unit->runstate_cnt[v->runstate.state]++; + sched_unit_add_vcpu(unit, v); =20 for ( prev_unit =3D &d->sched_unit_list; *prev_unit; prev_unit =3D &(*prev_unit)->next_in_list ) @@ -402,12 +447,10 @@ static struct sched_unit *sched_alloc_unit(struct vcp= u *v) !zalloc_cpumask_var(&unit->cpu_soft_affinity) ) goto fail; =20 - v->sched_unit =3D unit; - return unit; =20 fail: - sched_free_unit(unit); + sched_free_unit(unit, v); return NULL; } =20 @@ -457,21 +500,26 @@ int sched_init_vcpu(struct vcpu *v) else processor =3D sched_select_initial_cpu(v); =20 - sched_set_res(unit, 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, - v, v->processor); - init_timer(&v->singleshot_timer, vcpu_singleshot_timer_fn, - v, v->processor); - init_timer(&v->poll_timer, poll_timer_fn, - v, v->processor); + init_timer(&v->periodic_timer, vcpu_periodic_timer_fn, v, processor); + init_timer(&v->singleshot_timer, vcpu_singleshot_timer_fn, v, processo= r); + init_timer(&v->poll_timer, poll_timer_fn, v, processor); + + /* If this is not the first vcpu of the unit we are done. */ + if ( unit->priv !=3D NULL ) + { + v->processor =3D processor; + return 0; + } + + /* The first vcpu of an unit can be set via sched_set_res(). */ + sched_set_res(unit, get_sched_res(processor)); =20 unit->priv =3D sched_alloc_udata(dom_scheduler(d), unit, d->sched_priv= ); if ( unit->priv =3D=3D NULL ) { - sched_free_unit(unit); + sched_free_unit(unit, v); return 1; } =20 @@ -631,9 +679,16 @@ void sched_destroy_vcpu(struct vcpu *v) kill_timer(&v->poll_timer); if ( test_and_clear_bool(v->is_urgent) ) atomic_dec(&per_cpu(sched_urgent_count, v->processor)); - sched_remove_unit(vcpu_scheduler(v), unit); - sched_free_udata(vcpu_scheduler(v), unit->priv); - sched_free_unit(unit); + /* + * Vcpus are being destroyed top-down. So being the first vcpu of an u= nit + * is the same as being the only one. + */ + if ( unit->vcpu_list =3D=3D v ) + { + sched_remove_unit(vcpu_scheduler(v), unit); + sched_free_udata(vcpu_scheduler(v), unit->priv); + sched_free_unit(unit, v); + } } =20 int sched_init_domain(struct domain *d, int poolid) --=20 2.16.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel