From nobody Mon Feb 9 22:24:20 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=1559039725; cv=none; d=zoho.com; s=zohoarc; b=VV8BHqGFW2zsNtsSncLaHzMLZdQP2FVgqGPUkUAeUDzAl6fAV1GFMrpOfuWW5zA/anWwJSI6K3YEK3BYC1AZAF6WI1j0VgiRoErkHY9LxdlZ9kxyR2i5aQ9pSZ7qfIHFYLpEnW+H28AKcXBTyS/hrpN//kiEfpjXOPVR8Elq2bw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559039725; 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=+DdtpMxx+QCSiVWLvpxbz2VUUq5Q85IcnUjjn4iBYKo=; b=BNv2zUwyNcXt8KnFT5m06aR1rybYNYnNfymDK2jm4Kv/CnjC1iyeQwg6LsG8hp1n98QbERetD39GEiaVZthxlRPs8WY1dS80EaCZ/VnWCxa41nbtDzPiXV0JFfWGRC0MNVzY5re7tjSq1iwfW/E9nR4uFZB1p+ZhQVsLdutU3UA= 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 1559039725516923.2773786711336; Tue, 28 May 2019 03:35:25 -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 1hVZRK-0007Ht-A1; Tue, 28 May 2019 10:34:42 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hVZQI-00050k-2W for xen-devel@lists.xenproject.org; Tue, 28 May 2019 10:33:38 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 0a3a5ca3-8134-11e9-8980-bc764e045a96; Tue, 28 May 2019 10:33:32 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id CEB6BB0AE; Tue, 28 May 2019 10:33:31 +0000 (UTC) X-Inumbo-ID: 0a3a5ca3-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:33:12 +0200 Message-Id: <20190528103313.1343-60-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 59/60] xen/sched: support core scheduling for moving cpus to/from cpupools 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" With core scheduling active it is necessary to move multiple cpus at the same time to or from a cpupool in order to avoid split scheduling resources in between. Signed-off-by: Juergen Gross --- V1: new patch --- xen/common/cpupool.c | 87 +++++++++++++++++++++++++++++++++++-------= ---- xen/common/schedule.c | 3 +- xen/include/xen/sched-if.h | 1 + 3 files changed, 68 insertions(+), 23 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index ec81124182..4dac7dedca 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -265,23 +265,30 @@ static int cpupool_assign_cpu_locked(struct cpupool *= c, unsigned int cpu) { int ret; struct domain *d; + const cpumask_t *cpus; + + cpus =3D sched_get_opt_cpumask(c->opt_granularity, cpu); =20 if ( (cpupool_moving_cpu =3D=3D cpu) && (c !=3D cpupool_cpu_moving) ) return -EADDRNOTAVAIL; - ret =3D schedule_cpu_add(cpu, c); + ret =3D schedule_cpu_add(cpumask_first(cpus), c); if ( ret ) return ret; =20 - cpumask_clear_cpu(cpu, &cpupool_free_cpus); + rcu_read_lock(&sched_res_rculock); + + cpumask_andnot(&cpupool_free_cpus, &cpupool_free_cpus, cpus); if (cpupool_moving_cpu =3D=3D cpu) { cpupool_moving_cpu =3D -1; cpupool_put(cpupool_cpu_moving); cpupool_cpu_moving =3D NULL; } - cpumask_set_cpu(cpu, c->cpu_valid); + cpumask_or(c->cpu_valid, c->cpu_valid, cpus); cpumask_and(c->res_valid, c->cpu_valid, sched_res_mask); =20 + rcu_read_unlock(&sched_res_rculock); + rcu_read_lock(&domlist_read_lock); for_each_domain_in_cpupool(d, c) { @@ -295,6 +302,7 @@ static int cpupool_assign_cpu_locked(struct cpupool *c,= unsigned int cpu) static int cpupool_unassign_cpu_epilogue(struct cpupool *c) { int cpu =3D cpupool_moving_cpu; + const cpumask_t *cpus; struct domain *d; int ret; =20 @@ -307,7 +315,10 @@ static int cpupool_unassign_cpu_epilogue(struct cpupoo= l *c) */ rcu_read_lock(&domlist_read_lock); ret =3D cpu_disable_scheduler(cpu); - cpumask_set_cpu(cpu, &cpupool_free_cpus); + + rcu_read_lock(&sched_res_rculock); + cpus =3D get_sched_res(cpu)->cpus; + cpumask_or(&cpupool_free_cpus, &cpupool_free_cpus, cpus); =20 /* * cpu_disable_scheduler() returning an error doesn't require resetting @@ -320,7 +331,7 @@ static int cpupool_unassign_cpu_epilogue(struct cpupool= *c) { ret =3D schedule_cpu_rm(cpu); if ( ret ) - cpumask_clear_cpu(cpu, &cpupool_free_cpus); + cpumask_andnot(&cpupool_free_cpus, &cpupool_free_cpus, cpus); else { cpupool_moving_cpu =3D -1; @@ -328,6 +339,7 @@ static int cpupool_unassign_cpu_epilogue(struct cpupool= *c) cpupool_cpu_moving =3D NULL; } } + rcu_read_unlock(&domlist_read_lock); =20 for_each_domain_in_cpupool(d, c) { @@ -342,6 +354,7 @@ static int cpupool_unassign_cpu_prologue(struct cpupool= *c, unsigned int cpu) { int ret; struct domain *d; + const cpumask_t *cpus; =20 spin_lock(&cpupool_lock); ret =3D -EADDRNOTAVAIL; @@ -352,7 +365,11 @@ static int cpupool_unassign_cpu_prologue(struct cpupoo= l *c, unsigned int cpu) if ( !cpumask_test_cpu(cpu, c->cpu_valid) && (cpu !=3D cpupool_moving_= cpu) ) goto out; =20 - if ( (c->n_dom > 0) && (cpumask_weight(c->cpu_valid) =3D=3D 1) && + rcu_read_lock(&sched_res_rculock); + cpus =3D get_sched_res(cpu)->cpus; + + if ( (c->n_dom > 0) && + (cpumask_weight(c->cpu_valid) =3D=3D cpumask_weight(cpus)) && (cpu !=3D cpupool_moving_cpu) ) { rcu_read_lock(&domlist_read_lock); @@ -374,9 +391,10 @@ static int cpupool_unassign_cpu_prologue(struct cpupoo= l *c, unsigned int cpu) cpupool_moving_cpu =3D cpu; atomic_inc(&c->refcnt); cpupool_cpu_moving =3D c; - cpumask_clear_cpu(cpu, c->cpu_valid); + cpumask_andnot(c->cpu_valid, c->cpu_valid, cpus); cpumask_and(c->res_valid, c->cpu_valid, sched_res_mask); =20 + rcu_read_unlock(&domlist_read_lock); out: spin_unlock(&cpupool_lock); =20 @@ -428,12 +446,12 @@ static int cpupool_unassign_cpu(struct cpupool *c, un= signed int cpu) return ret; } =20 - work_cpu =3D smp_processor_id(); + work_cpu =3D sched_get_resource_cpu(smp_processor_id()); if ( work_cpu =3D=3D cpu ) { work_cpu =3D cpumask_first(cpupool0->cpu_valid); if ( work_cpu =3D=3D cpu ) - work_cpu =3D cpumask_next(cpu, cpupool0->cpu_valid); + work_cpu =3D cpumask_last(cpupool0->cpu_valid); } return continue_hypercall_on_cpu(work_cpu, cpupool_unassign_cpu_helper= , c); } @@ -499,6 +517,7 @@ void cpupool_rm_domain(struct domain *d) static int cpupool_cpu_add(unsigned int cpu) { int ret =3D 0; + const cpumask_t *cpus; =20 spin_lock(&cpupool_lock); cpumask_clear_cpu(cpu, &cpupool_locked_cpus); @@ -512,7 +531,11 @@ static int cpupool_cpu_add(unsigned int cpu) */ rcu_read_lock(&sched_res_rculock); get_sched_res(cpu)->cpupool =3D NULL; - ret =3D cpupool_assign_cpu_locked(cpupool0, cpu); + + cpus =3D sched_get_opt_cpumask(cpupool0->opt_granularity, cpu); + if ( cpumask_subset(cpus, &cpupool_free_cpus) ) + ret =3D cpupool_assign_cpu_locked(cpupool0, cpu); + rcu_read_unlock(&sched_res_rculock); =20 spin_unlock(&cpupool_lock); @@ -547,27 +570,33 @@ static void cpupool_cpu_remove(unsigned int cpu) static int cpupool_cpu_remove_prologue(unsigned int cpu) { int ret =3D 0; + cpumask_t *cpus; + unsigned int master_cpu; =20 spin_lock(&cpupool_lock); =20 - if ( cpumask_test_cpu(cpu, &cpupool_locked_cpus) ) + rcu_read_lock(&sched_res_rculock); + cpus =3D get_sched_res(cpu)->cpus; + master_cpu =3D sched_get_resource_cpu(cpu); + if ( cpumask_intersects(cpus, &cpupool_locked_cpus) ) ret =3D -EBUSY; else cpumask_set_cpu(cpu, &cpupool_locked_cpus); + rcu_read_unlock(&sched_res_rculock); =20 spin_unlock(&cpupool_lock); =20 if ( ret ) return ret; =20 - if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) + if ( cpumask_test_cpu(master_cpu, cpupool0->cpu_valid) ) { /* Cpupool0 is populated only after all cpus are up. */ ASSERT(system_state =3D=3D SYS_STATE_active); =20 - ret =3D cpupool_unassign_cpu_prologue(cpupool0, cpu); + ret =3D cpupool_unassign_cpu_prologue(cpupool0, master_cpu); } - else if ( !cpumask_test_cpu(cpu, &cpupool_free_cpus) ) + else if ( !cpumask_test_cpu(master_cpu, &cpupool_free_cpus) ) ret =3D -ENODEV; =20 return ret; @@ -657,27 +686,43 @@ int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *o= p) case XEN_SYSCTL_CPUPOOL_OP_ADDCPU: { unsigned cpu; + const cpumask_t *cpus; =20 cpu =3D op->cpu; cpupool_dprintk("cpupool_assign_cpu(pool=3D%d,cpu=3D%d)\n", op->cpupool_id, cpu); + spin_lock(&cpupool_lock); + + c =3D cpupool_find_by_id(op->cpupool_id); + ret =3D -ENOENT; + if ( c =3D=3D NULL ) + goto addcpu_out; if ( cpu =3D=3D XEN_SYSCTL_CPUPOOL_PAR_ANY ) - cpu =3D cpumask_first(&cpupool_free_cpus); + { + for_each_cpu ( cpu, &cpupool_free_cpus ) + { + cpus =3D sched_get_opt_cpumask(c->opt_granularity, cpu); + if ( cpumask_subset(cpus, &cpupool_free_cpus) ) + break; + } + ret =3D -ENODEV; + if ( cpu >=3D nr_cpu_ids ) + goto addcpu_out; + } ret =3D -EINVAL; if ( cpu >=3D nr_cpu_ids ) goto addcpu_out; ret =3D -ENODEV; - if ( !cpumask_test_cpu(cpu, &cpupool_free_cpus) || - cpumask_test_cpu(cpu, &cpupool_locked_cpus) ) - goto addcpu_out; - c =3D cpupool_find_by_id(op->cpupool_id); - ret =3D -ENOENT; - if ( c =3D=3D NULL ) + cpus =3D sched_get_opt_cpumask(c->opt_granularity, cpu); + if ( !cpumask_subset(cpus, &cpupool_free_cpus) || + cpumask_intersects(cpus, &cpupool_locked_cpus) ) goto addcpu_out; ret =3D cpupool_assign_cpu_locked(c, cpu); + addcpu_out: spin_unlock(&cpupool_lock); + cpupool_dprintk("cpupool_assign_cpu(pool=3D%d,cpu=3D%d) ret %d\n", op->cpupool_id, cpu, ret); } diff --git a/xen/common/schedule.c b/xen/common/schedule.c index b4e65e81b0..fed71b26d2 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -2469,8 +2469,7 @@ static struct notifier_block cpu_schedule_nfb =3D { .notifier_call =3D cpu_schedule_callback }; =20 -static const cpumask_t *sched_get_opt_cpumask(enum sched_gran opt, - unsigned int cpu) +const cpumask_t *sched_get_opt_cpumask(enum sched_gran opt, unsigned int c= pu) { const cpumask_t *mask; =20 diff --git a/xen/include/xen/sched-if.h b/xen/include/xen/sched-if.h index 714d793815..c125236068 100644 --- a/xen/include/xen/sched-if.h +++ b/xen/include/xen/sched-if.h @@ -613,5 +613,6 @@ affinity_balance_cpumask(const struct sched_unit *unit,= int step, } =20 void sched_rm_cpu(unsigned int cpu); +const cpumask_t *sched_get_opt_cpumask(enum sched_gran opt, unsigned int c= pu); =20 #endif /* __XEN_SCHED_IF_H__ */ --=20 2.16.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel