From nobody Mon Feb 9 11:30:34 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=1565362813; cv=none; d=zoho.com; s=zohoarc; b=aPW4TCgDbB4LKwSJIx4lCU1euwle2Rszjv1eSluX9WNInHLC2juTf+wGHHPUS0Dodo9e9cnql8NzIzxU0VVlArNHXA+vzeImEZoS0yV7VUHQtDpHT7K0WudEHEyACllPFDxss5ho0GL1pL9dMiouX+tTGr8qdUIujs8EtHtShfo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565362813; 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=q1YIdUR6Wqd3sy1CNq1s2ZVmEpwCaf0HZ1KTaF65FzE=; b=L2efZ+XF4sqd7De7cuq8k3g2UMZhtNj3KCqbmxa37T2odHpwQkaGyNhUCUEWK6YnGjExD/f5JaD8/DgWtxNcux4UAfic6o/zPIl0icVaOTo/6+ZBPflSd/ltjB/avKpIJ208EgL0QnU0qUSg3jTb0A3EtaypamJQKNE53IV1naQ= 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 1565362813082165.68327447985007; Fri, 9 Aug 2019 08:00:13 -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 1hw6Mj-0008Bs-2J; Fri, 09 Aug 2019 14:59:37 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hw6M9-0006pR-8A for xen-devel@lists.xenproject.org; Fri, 09 Aug 2019 14:59:01 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3580a106-bab6-11e9-8bf6-4fc566d6eecf; Fri, 09 Aug 2019 14:58:56 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 51444B016; Fri, 9 Aug 2019 14:58:55 +0000 (UTC) X-Inumbo-ID: 3580a106-bab6-11e9-8bf6-4fc566d6eecf 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:33 +0200 Message-Id: <20190809145833.1020-49-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 48/48] xen/sched: add scheduling granularity enum 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 , Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Julien Grall , Jan Beulich , Dario Faggioli , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= 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" Add a scheduling granularity enum ("cpu", "core", "socket") for specification of the scheduling granularity. Initially it is set to "cpu", this can be modified by the new boot parameter (x86 only) "sched-gran". According to the selected granularity sched_granularity is set after all cpus are online. A test is added for all sched resources holding the same number of cpus. Fall back to core- or cpu-scheduling in that case. Signed-off-by: Juergen Gross --- RFC V2: - fixed freeing of sched_res when merging cpus - rename parameter to "sched-gran" (Jan Beulich) - rename parameter option from "thread" to "cpu" (Jan Beulich) V1: - rename scheduler_smp_init() to scheduler_gran_init(), let it be called by cpupool_init() - avoid using literal cpu number 0 in scheduler_percpu_init() (Jan Beulich) - style correction (Jan Beulich) - fallback to smaller granularity instead of panic in case of unbalanced cpu configuration V2: - style changes (Jan Beulich) - introduce CONFIG_HAS_SCHED_GRANULARITY (Jan Beulich) --- xen/arch/x86/Kconfig | 1 + xen/common/Kconfig | 3 ++ xen/common/cpupool.c | 2 ++ xen/common/schedule.c | 78 ++++++++++++++++++++++++++++++++++++++++++= ++++ xen/include/xen/sched-if.h | 1 + 5 files changed, 85 insertions(+) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 288dc6c042..3f88adae97 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -22,6 +22,7 @@ config X86 select HAS_PASSTHROUGH select HAS_PCI select HAS_PDX + select HAS_SCHED_GRANULARITY select HAS_UBSAN select HAS_VPCI if !PV_SHIM_EXCLUSIVE && HVM select NEEDS_LIBELF diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 16829f6274..e9247871a8 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -63,6 +63,9 @@ config HAS_GDBSX config HAS_IOPORTS bool =20 +config HAS_SCHED_GRANULARITY + bool + config NEEDS_LIBELF bool =20 diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index 6917488210..d12269d5a3 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -870,6 +870,8 @@ static int __init cpupool_init(void) unsigned int cpu; int err; =20 + scheduler_gran_init(); + cpupool0 =3D cpupool_create(0, 0, &err); BUG_ON(cpupool0 =3D=3D NULL); cpupool_put(cpupool0); diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 181adb00b2..bd596ba1dc 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -61,6 +62,23 @@ unsigned int __read_mostly sched_granularity =3D 1; bool __read_mostly sched_disable_smt_switching; cpumask_var_t sched_res_mask; =20 +#ifdef CONFIG_HAS_SCHED_GRANULARITY +static int __init sched_select_granularity(const char *str) +{ + if ( strcmp("cpu", str) =3D=3D 0 ) + opt_sched_granularity =3D SCHED_GRAN_cpu; + else if ( strcmp("core", str) =3D=3D 0 ) + opt_sched_granularity =3D SCHED_GRAN_core; + else if ( strcmp("socket", str) =3D=3D 0 ) + opt_sched_granularity =3D SCHED_GRAN_socket; + else + return -EINVAL; + + return 0; +} +custom_param("sched-gran", sched_select_granularity); +#endif + /* Common lock for free cpus. */ static DEFINE_SPINLOCK(sched_free_cpu_lock); =20 @@ -2606,6 +2624,66 @@ void scheduler_enable(void) scheduler_active =3D true; } =20 +static unsigned int __init sched_check_granularity(void) +{ + unsigned int cpu; + unsigned int siblings, gran =3D 0; + + if ( opt_sched_granularity =3D=3D SCHED_GRAN_cpu ) + return 1; + + for_each_online_cpu ( cpu ) + { + siblings =3D cpumask_weight(sched_get_opt_cpumask(opt_sched_granul= arity, + cpu)); + if ( gran =3D=3D 0 ) + gran =3D siblings; + else if ( gran !=3D siblings ) + return 0; + } + + sched_disable_smt_switching =3D true; + + return gran; +} + +/* Setup data for selected scheduler granularity. */ +void __init scheduler_gran_init(void) +{ + unsigned int gran =3D 0; + const char *fallback =3D NULL; + + while ( gran =3D=3D 0 ) + { + gran =3D sched_check_granularity(); + + if ( gran =3D=3D 0 ) + { + switch ( opt_sched_granularity ) + { + case SCHED_GRAN_core: + opt_sched_granularity =3D SCHED_GRAN_cpu; + fallback =3D "Asymmetric cpu configuration.\n" + "Falling back to sched-gran=3Dcpu.\n"; + break; + case SCHED_GRAN_socket: + opt_sched_granularity =3D SCHED_GRAN_core; + fallback =3D "Asymmetric cpu configuration.\n" + "Falling back to sched-gran=3Dcore.\n"; + break; + default: + ASSERT_UNREACHABLE(); + break; + } + } + } + + if ( fallback ) + warning_add(fallback); + + sched_granularity =3D gran; +} + /* Initialise the data structures. */ void __init scheduler_init(void) { diff --git a/xen/include/xen/sched-if.h b/xen/include/xen/sched-if.h index c152547a94..ace08d609c 100644 --- a/xen/include/xen/sched-if.h +++ b/xen/include/xen/sched-if.h @@ -625,5 +625,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); +void scheduler_gran_init(void); =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