From nobody Mon Feb 9 08:11:40 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=1557125906; cv=none; d=zoho.com; s=zohoarc; b=L/mqmTgQVh5JZaiB2ojUwAw/qzsUCH8abTX6/rLExmFbRGqnknzY+BBgMyoXc5boPgh8QhEunM4MPeWWlY1EVrudZObJ9aGVJtEoCB9itL3+UfuAASICBbLsF2aNUJVOsS5WmoiskUo30+86DjSJk6oiGiMLL+a5Qy/c5SK/Cgw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557125906; 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=CxwjcQly1Umj7P8RYr4ZCmPFmtnnbeEHmURYh7eNyks=; b=oovjZZsYsO9KbuT2GRtCuIhfgGfgWY6FIRTzaMHjpZath115ifQ3kKWFCsjPyFmN9oh/G5OKCEpAU703YMCEVdYdNGYU1aRDLoPcz/zgGdvzC5sbkEcgBGmJ05xzjxSiS+amwUvI73+5I0ylno+bXVz6slnWaZUj4POIyfxIv3o= 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 155712590623265.25734131858553; Sun, 5 May 2019 23:58:26 -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 1hNXYk-0002Db-FE; Mon, 06 May 2019 06:57:10 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hNXYf-00022w-HW for xen-devel@lists.xenproject.org; Mon, 06 May 2019 06:57:05 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 2743af03-6fcc-11e9-843c-bc764e045a96; Mon, 06 May 2019 06:57:04 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 393F1AF3F; Mon, 6 May 2019 06:56:59 +0000 (UTC) X-Inumbo-ID: 2743af03-6fcc-11e9-843c-bc764e045a96 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:38 +0200 Message-Id: <20190506065644.7415-40-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 39/45] xen/sched: support allocating multiple vcpus into one sched item 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_item. Support that. Setting the initial processor must be done carefully: we can't use sched_set_res() as that relies on for_each_sched_item_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 --- xen/common/schedule.c | 75 ++++++++++++++++++++++++++++++++++++++++++-----= ---- 1 file changed, 62 insertions(+), 13 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 2870e91cce..30ca9ef25e 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -275,10 +275,25 @@ static void sched_spin_unlock_double(spinlock_t *lock= 1, spinlock_t *lock2, spin_unlock_irqrestore(lock1, flags); } =20 -static void sched_free_item(struct sched_item *item) +static void sched_free_item(struct sched_item *item, struct vcpu *v) { struct sched_item *prev_item; struct domain *d =3D item->domain; + struct vcpu *vitem; + unsigned int cnt =3D 0; + + /* Don't count to be released vcpu, might be not in vcpu list yet. */ + for_each_sched_item_vcpu ( item, vitem ) + if ( vitem !=3D v ) + cnt++; + + v->sched_item =3D NULL; + + if ( cnt ) + return; + + if ( item->vcpu =3D=3D v ) + item->vcpu =3D v->next_in_list; =20 if ( d->sched_item_list =3D=3D item ) d->sched_item_list =3D item->next_in_list; @@ -294,8 +309,6 @@ static void sched_free_item(struct sched_item *item) } } =20 - item->vcpu->sched_item =3D NULL; - free_cpumask_var(item->cpu_hard_affinity); free_cpumask_var(item->cpu_hard_affinity_tmp); free_cpumask_var(item->cpu_hard_affinity_saved); @@ -304,17 +317,36 @@ static void sched_free_item(struct sched_item *item) xfree(item); } =20 +static void sched_item_add_vcpu(struct sched_item *item, struct vcpu *v) +{ + v->sched_item =3D item; + if ( !item->vcpu || item->vcpu->vcpu_id > v->vcpu_id ) + { + item->vcpu =3D v; + item->item_id =3D v->vcpu_id; + } +} + static struct sched_item *sched_alloc_item(struct vcpu *v) { struct sched_item *item, **prev_item; struct domain *d =3D v->domain; =20 + for_each_sched_item ( d, item ) + if ( item->vcpu->vcpu_id / sched_granularity =3D=3D + v->vcpu_id / sched_granularity ) + break; + + if ( item ) + { + sched_item_add_vcpu(item, v); + return item; + } + if ( (item =3D xzalloc(struct sched_item)) =3D=3D NULL ) return NULL; =20 - v->sched_item =3D item; - item->vcpu =3D v; - item->item_id =3D v->vcpu_id; + sched_item_add_vcpu(item, v); item->domain =3D d; =20 for ( prev_item =3D &d->sched_item_list; *prev_item; @@ -335,7 +367,7 @@ static struct sched_item *sched_alloc_item(struct vcpu = *v) return item; =20 fail: - sched_free_item(item); + sched_free_item(item, v); return NULL; } =20 @@ -377,8 +409,6 @@ int sched_init_vcpu(struct vcpu *v) else processor =3D sched_select_initial_cpu(v); =20 - sched_set_res(item, per_cpu(sched_res, processor)); - /* Initialise the per-vcpu timers. */ init_timer(&v->periodic_timer, vcpu_periodic_timer_fn, v, v->processor); @@ -387,10 +417,22 @@ int sched_init_vcpu(struct vcpu *v) init_timer(&v->poll_timer, poll_timer_fn, v, v->processor); =20 + /* If this is not the first vcpu of the item we are done. */ + if ( item->priv !=3D NULL ) + { + /* We can rely on previous vcpu to exist. */ + v->processor =3D cpumask_next(d->vcpu[v->vcpu_id - 1]->processor, + item->res->cpus); + return 0; + } + + /* The first vcpu of an item can be set via sched_set_res(). */ + sched_set_res(item, per_cpu(sched_res, processor)); + item->priv =3D sched_alloc_vdata(dom_scheduler(d), item, d->sched_priv= ); if ( item->priv =3D=3D NULL ) { - sched_free_item(item); + sched_free_item(item, v); return 1; } =20 @@ -544,9 +586,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_res, v->processor)->urgent_count); - sched_remove_item(vcpu_scheduler(v), item); - sched_free_vdata(vcpu_scheduler(v), item->priv); - sched_free_item(item); + /* + * Vcpus are being destroyed top-down. So being the first vcpu of an i= tem + * is the same as being the only one. + */ + if ( item->vcpu =3D=3D v ) + { + sched_remove_item(vcpu_scheduler(v), item); + sched_free_vdata(vcpu_scheduler(v), item->priv); + sched_free_item(item, 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