From nobody Mon Feb 9 10:58:04 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=1565362789; cv=none; d=zoho.com; s=zohoarc; b=Vr2UzvABxh01JQ4+h0r1x2ztSVJaPGwsXJKhuYLTjocjtKuXIxl13jtGtXgb9eEF0Pb5/HhjXctn2lbgf/Mty9qaoDgt2UMW7Y2jk2Bmi6umYnsc/g5lr7msnakje25/4NYt1WHiG6RLAT9Vd2fDygknHYdokl411aQqrsAUogI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565362789; 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=swb4FYhu08lN6CBBlIB2czYg8QkReHIhcXMuvfebsvI=; b=ilw1tAHAz2oIV2Iq3I1u5Z2XPcskV9LuHBSzmxa3cHA7q+fVn87Uc094HPt2b3pc+gsdaMn6Ce2zbAu7gKMxZ42dVZzxsj33lALY7oVRHNE71sLjzpf5CdrxAxj62q8FhAxjDINF/6bGwSdshGI955ihew7KMEzB1ux0NzfmUl0= 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 1565362789873663.6767155453628; Fri, 9 Aug 2019 07:59:49 -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 1hw6MN-0007KY-0G; Fri, 09 Aug 2019 14:59:15 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hw6M4-0006f8-3H for xen-devel@lists.xenproject.org; Fri, 09 Aug 2019 14:58:56 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 336738f2-bab6-11e9-8980-bc764e045a96; Fri, 09 Aug 2019 14:58:52 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id BF8A0B0CC; Fri, 9 Aug 2019 14:58:51 +0000 (UTC) X-Inumbo-ID: 336738f2-bab6-11e9-8980-bc764e045a96 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Fri, 9 Aug 2019 16:58:24 +0200 Message-Id: <20190809145833.1020-40-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190809145833.1020-1-jgross@suse.com> References: <20190809145833.1020-1-jgross@suse.com> Subject: [Xen-devel] [PATCH v2 39/48] xen/sched: move per-cpu variable cpupool to 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" Having a pointer to struct cpupool in struct sched_resource instead of per cpu is enough. Signed-off-by: Juergen Gross --- V1: new patch --- xen/common/cpupool.c | 4 +--- xen/common/sched_credit.c | 2 +- xen/common/sched_rt.c | 2 +- xen/common/schedule.c | 8 ++++---- xen/include/xen/sched-if.h | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index 17d671585a..bace684464 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -34,8 +34,6 @@ static cpumask_t cpupool_locked_cpus; =20 static DEFINE_SPINLOCK(cpupool_lock); =20 -DEFINE_PER_CPU(struct cpupool *, cpupool); - #define cpupool_dprintk(x...) ((void)0) =20 static void free_cpupool_struct(struct cpupool *c) @@ -510,7 +508,7 @@ static int cpupool_cpu_add(unsigned int cpu) * (or unplugging would have failed) and that is the default behavior * anyway. */ - per_cpu(cpupool, cpu) =3D NULL; + get_sched_res(cpu)->cpupool =3D NULL; ret =3D cpupool_assign_cpu_locked(cpupool0, cpu); =20 spin_unlock(&cpupool_lock); diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index a65751068d..d14c997d9d 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -1681,7 +1681,7 @@ static struct csched_unit * csched_load_balance(struct csched_private *prv, int cpu, struct csched_unit *snext, bool *stolen) { - struct cpupool *c =3D per_cpu(cpupool, cpu); + struct cpupool *c =3D get_sched_res(cpu)->cpupool; struct csched_unit *speer; cpumask_t workers; cpumask_t *online; diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 205ff13c09..a252e1d82d 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -775,7 +775,7 @@ rt_deinit_pdata(const struct scheduler *ops, void *pcpu= , int cpu) =20 if ( prv->repl_timer.cpu =3D=3D cpu ) { - struct cpupool *c =3D per_cpu(cpupool, cpu); + struct cpupool *c =3D get_sched_res(cpu)->cpupool; unsigned int new_cpu =3D cpumask_cycle(cpu, cpupool_online_cpumask= (c)); =20 /* diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 635ee88c31..afd4170730 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -1098,7 +1098,7 @@ int cpu_disable_scheduler(unsigned int cpu) cpumask_t online_affinity; int ret =3D 0; =20 - c =3D per_cpu(cpupool, cpu); + c =3D get_sched_res(cpu)->cpupool; if ( c =3D=3D NULL ) return ret; =20 @@ -1167,7 +1167,7 @@ static int cpu_disable_scheduler_check(unsigned int c= pu) struct cpupool *c; struct vcpu *v; =20 - c =3D per_cpu(cpupool, cpu); + c =3D get_sched_res(cpu)->cpupool; if ( c =3D=3D NULL ) return 0; =20 @@ -2497,8 +2497,8 @@ int schedule_cpu_switch(unsigned int cpu, struct cpup= ool *c) void *ppriv, *ppriv_old, *vpriv, *vpriv_old; struct scheduler *old_ops =3D get_sched_res(cpu)->scheduler; struct scheduler *new_ops =3D (c =3D=3D NULL) ? &sched_idle_ops : c->s= ched; - struct cpupool *old_pool =3D per_cpu(cpupool, cpu); struct sched_resource *sd =3D get_sched_res(cpu); + struct cpupool *old_pool =3D sd->cpupool; spinlock_t *old_lock, *new_lock; unsigned long flags; =20 @@ -2580,7 +2580,7 @@ int schedule_cpu_switch(unsigned int cpu, struct cpup= ool *c) sched_free_vdata(old_ops, vpriv_old); sched_free_pdata(old_ops, ppriv_old, cpu); =20 - per_cpu(cpupool, cpu) =3D c; + get_sched_res(cpu)->cpupool =3D c; /* When a cpu is added to a pool, trigger it to go pick up some work */ if ( c !=3D NULL ) cpu_raise_softirq(cpu, SCHEDULE_SOFTIRQ); diff --git a/xen/include/xen/sched-if.h b/xen/include/xen/sched-if.h index 94057ea9dd..73b19a2763 100644 --- a/xen/include/xen/sched-if.h +++ b/xen/include/xen/sched-if.h @@ -37,6 +37,7 @@ extern const cpumask_t *sched_res_mask; * one it wants (This may be the one right in front of it).*/ struct sched_resource { struct scheduler *scheduler; + struct cpupool *cpupool; spinlock_t *schedule_lock, _lock; struct sched_unit *curr; /* current task = */ @@ -51,7 +52,6 @@ struct sched_resource { =20 #define curr_on_cpu(c) (get_sched_res(c)->curr) =20 -DECLARE_PER_CPU(struct cpupool *, cpupool); DECLARE_PER_CPU(struct sched_resource *, sched_res); =20 static inline struct sched_resource *get_sched_res(unsigned int cpu) --=20 2.16.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel