From patchwork Wed Nov 17 09:57:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Fancellu X-Patchwork-Id: 12624283 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 155FFC433FE for ; Wed, 17 Nov 2021 09:57:36 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D89BC61AED for ; Wed, 17 Nov 2021 09:57:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D89BC61AED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.226675.391769 (Exim 4.92) (envelope-from ) id 1mnHh1-0002Md-2i; Wed, 17 Nov 2021 09:57:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 226675.391769; Wed, 17 Nov 2021 09:57:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mnHh0-0002KR-UQ; Wed, 17 Nov 2021 09:57:26 +0000 Received: by outflank-mailman (input) for mailman id 226675; Wed, 17 Nov 2021 09:57:26 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mnHh0-0002FH-CB for xen-devel@lists.xenproject.org; Wed, 17 Nov 2021 09:57:26 +0000 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by se1-gles-sth1.inumbo.com (Halon) with ESMTP id c3bf6d5e-478c-11ec-9787-a32c541c8605; Wed, 17 Nov 2021 10:57:24 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 34102ED1; Wed, 17 Nov 2021 01:57:24 -0800 (PST) Received: from e125770.cambridge.arm.com (e125770.cambridge.arm.com [10.1.195.16]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 79C953F70D; Wed, 17 Nov 2021 01:57:22 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c3bf6d5e-478c-11ec-9787-a32c541c8605 From: Luca Fancellu To: xen-devel@lists.xenproject.org Cc: bertrand.marquis@arm.com, wei.chen@arm.com, Stefano Stabellini , Julien Grall , Volodymyr Babchuk , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Wei Liu , Juergen Gross , Dario Faggioli Subject: [RFC PATCH 1/2] xen/cpupool: Create different cpupools at boot time Date: Wed, 17 Nov 2021 09:57:10 +0000 Message-Id: <20211117095711.26596-2-luca.fancellu@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211117095711.26596-1-luca.fancellu@arm.com> References: <20211117095711.26596-1-luca.fancellu@arm.com> Introduce an architecture specific way to create different cpupool at boot time, this is particularly useful on ARM biglittle system where there might be the need to have different cpupools for each type of core, but also systems using NUMA can have different cpu pool for each node. Signed-off-by: Luca Fancellu --- xen/arch/arm/Kconfig | 15 +++++++ xen/arch/arm/Makefile | 1 + xen/arch/arm/cpupool.c | 84 ++++++++++++++++++++++++++++++++++++++ xen/common/sched/cpupool.c | 5 ++- xen/include/xen/cpupool.h | 30 ++++++++++++++ 5 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 xen/arch/arm/cpupool.c create mode 100644 xen/include/xen/cpupool.h diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index ecfa6822e4..4d7cc9f3bc 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -33,6 +33,21 @@ config ACPI Advanced Configuration and Power Interface (ACPI) support for Xen is an alternative to device tree on ARM64. +config BOOT_TIME_CPUPOOLS + bool "Create cpupools per cpu type at boot time." + depends on ARM + default n + help + + Creates, during boot, a cpu pool for each type of CPU found on + the system. This option is useful on system with heterogeneous + types of core. + +config MAX_BOOT_TIME_CPUPOOLS + depends on BOOT_TIME_CPUPOOLS + int "Maximum number of cpupools that can be created at boot time." + default 16 + config GICV3 bool "GICv3 driver" depends on ARM_64 && !NEW_VGIC diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 07f634508e..0bb8b84750 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -13,6 +13,7 @@ obj-$(CONFIG_HAS_ALTERNATIVE) += alternative.o obj-y += bootfdt.init.o obj-y += cpuerrata.o obj-y += cpufeature.o +obj-$(CONFIG_BOOT_TIME_CPUPOOLS) += cpupool.o obj-y += decode.o obj-y += device.o obj-$(CONFIG_IOREQ_SERVER) += dm.o diff --git a/xen/arch/arm/cpupool.c b/xen/arch/arm/cpupool.c new file mode 100644 index 0000000000..550521e352 --- /dev/null +++ b/xen/arch/arm/cpupool.c @@ -0,0 +1,84 @@ +/****************************************************************************** + * cpupool.c + * + * (C) 2021, arm + */ + +#include +#include +#include +#include +#include +#include +#include "../../common/sched/private.h" + +typedef struct { + register_t midr; + struct cpupool *pool; +} pool_t; + +static pool_t __initdata pool_cpu_map[CONFIG_MAX_BOOT_TIME_CPUPOOLS]; + +void __init arch_allocate_cpupools(const cpumask_t *cpu_online_map, + cpupool_create_t cpupool_create) +{ + unsigned int cpu, i; + + /* First pool is the default pool0 associated with midr of the boot core */ + pool_cpu_map[0].midr = system_cpuinfo.midr.bits; + pool_cpu_map[0].pool = cpupool0; + + for_each_cpu ( cpu, cpu_online_map ) + { + for ( i = 0; i < CONFIG_MAX_BOOT_TIME_CPUPOOLS; i++ ) + if ( !pool_cpu_map[i].pool || + (cpu_data[cpu].midr.bits == pool_cpu_map[i].midr) ) + break; + + if ( i < CONFIG_MAX_BOOT_TIME_CPUPOOLS ) + { + if ( !pool_cpu_map[i].pool ) + { + /* There is no pool for this cpu midr, create it */ + pool_cpu_map[i].midr = cpu_data[cpu].midr.bits; + debugtrace_printk("Create pool %u for cpu MIDR: 0x%" + PRIregister"\n", i, pool_cpu_map[i].midr); + pool_cpu_map[i].pool = + cpupool_create(i, scheduler_get_default()->sched_id); + BUG_ON(IS_ERR(pool_cpu_map[i].pool)); + cpupool_put(pool_cpu_map[i].pool); + } + } + else + panic("Could not create cpupool, maximum number reached (%u)", + (unsigned int)(CONFIG_MAX_BOOT_TIME_CPUPOOLS)); + } + + /* Print useful information about the pools */ + for ( i = 0; i < CONFIG_MAX_BOOT_TIME_CPUPOOLS; i++ ) + if ( pool_cpu_map[i].pool ) + printk(XENLOG_INFO "Pool-%u contains cpu with MIDR: 0x%" + PRIregister"\n", i, pool_cpu_map[i].midr); +} + +struct cpupool *__init arch_get_cpupool(unsigned int cpu) +{ + unsigned int i; + + for ( i = 0; i < CONFIG_MAX_BOOT_TIME_CPUPOOLS; i++ ) + if ( pool_cpu_map[i].pool && + (cpu_data[cpu].midr.bits == pool_cpu_map[i].midr) ) + return pool_cpu_map[i].pool; + + return cpupool0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/common/sched/cpupool.c b/xen/common/sched/cpupool.c index 8c6e6eb9cc..7389f04e28 100644 --- a/xen/common/sched/cpupool.c +++ b/xen/common/sched/cpupool.c @@ -13,6 +13,7 @@ #include #include +#include #include #include #include @@ -1231,12 +1232,14 @@ static int __init cpupool_init(void) cpupool_put(cpupool0); register_cpu_notifier(&cpu_nfb); + arch_allocate_cpupools(&cpu_online_map, cpupool_create); + spin_lock(&cpupool_lock); cpumask_copy(&cpupool_free_cpus, &cpu_online_map); for_each_cpu ( cpu, &cpupool_free_cpus ) - cpupool_assign_cpu_locked(cpupool0, cpu); + cpupool_assign_cpu_locked(arch_get_cpupool(cpu), cpu); spin_unlock(&cpupool_lock); diff --git a/xen/include/xen/cpupool.h b/xen/include/xen/cpupool.h new file mode 100644 index 0000000000..4b50af9e3d --- /dev/null +++ b/xen/include/xen/cpupool.h @@ -0,0 +1,30 @@ +#ifndef __XEN_CPUPOOL_H +#define __XEN_CPUPOOL_H + +#include + +typedef struct cpupool* (*cpupool_create_t)(unsigned int, unsigned int); + +#ifdef CONFIG_BOOT_TIME_CPUPOOLS + +void arch_allocate_cpupools(const cpumask_t *cpu_online_map, + cpupool_create_t cpupool_create); + +struct cpupool *arch_get_cpupool(unsigned int cpu); + +#else + +static inline __init +void arch_allocate_cpupools(const cpumask_t *cpu_online_map, + cpupool_create_t cpupool_create) +{ +} + +static inline struct cpupool *__init arch_get_cpupool(unsigned int cpu) +{ + return cpupool0; +} + +#endif + +#endif /* __XEN_CPUPOOL_H */ From patchwork Wed Nov 17 09:57:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Fancellu X-Patchwork-Id: 12624285 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5816CC4332F for ; Wed, 17 Nov 2021 09:57:37 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 07ED561AED for ; Wed, 17 Nov 2021 09:57:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 07ED561AED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.226676.391786 (Exim 4.92) (envelope-from ) id 1mnHh2-0002lH-Cn; Wed, 17 Nov 2021 09:57:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 226676.391786; Wed, 17 Nov 2021 09:57:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mnHh2-0002kk-8u; Wed, 17 Nov 2021 09:57:28 +0000 Received: by outflank-mailman (input) for mailman id 226676; Wed, 17 Nov 2021 09:57:27 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mnHh0-0002FB-Rf for xen-devel@lists.xenproject.org; Wed, 17 Nov 2021 09:57:26 +0000 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by se1-gles-flk1.inumbo.com (Halon) with ESMTP id c4735faa-478c-11ec-a9d2-d9f7a1cc8784; Wed, 17 Nov 2021 10:57:26 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 73707D6E; Wed, 17 Nov 2021 01:57:25 -0800 (PST) Received: from e125770.cambridge.arm.com (e125770.cambridge.arm.com [10.1.195.16]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 653253F70D; Wed, 17 Nov 2021 01:57:24 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c4735faa-478c-11ec-a9d2-d9f7a1cc8784 From: Luca Fancellu To: xen-devel@lists.xenproject.org Cc: bertrand.marquis@arm.com, wei.chen@arm.com, Ian Jackson , Wei Liu , Anthony PERARD , Juergen Gross Subject: [RFC PATCH 2/2] tools/cpupools: Give a name to unnamed cpupools Date: Wed, 17 Nov 2021 09:57:11 +0000 Message-Id: <20211117095711.26596-3-luca.fancellu@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211117095711.26596-1-luca.fancellu@arm.com> References: <20211117095711.26596-1-luca.fancellu@arm.com> With the introduction of boot time cpupools, Xen can create at boot time many cpupools different from the cpupool with id 0. Since these newly created cpupools can't have an entry in Xenstore, name them with the same convention used for the cpupool 0: Pool-. Signed-off-by: Luca Fancellu --- tools/libs/light/libxl_utils.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/libs/light/libxl_utils.c b/tools/libs/light/libxl_utils.c index 4699c4a0a3..d97d91ca98 100644 --- a/tools/libs/light/libxl_utils.c +++ b/tools/libs/light/libxl_utils.c @@ -147,13 +147,16 @@ int libxl_cpupool_qualifier_to_cpupoolid(libxl_ctx *ctx, const char *p, char *libxl_cpupoolid_to_name(libxl_ctx *ctx, uint32_t poolid) { unsigned int len; - char path[strlen("/local/pool") + 12]; + char buffer[strlen("/local/pool") + 12]; char *s; - snprintf(path, sizeof(path), "/local/pool/%d/name", poolid); - s = xs_read(ctx->xsh, XBT_NULL, path, &len); - if (!s && (poolid == 0)) - return strdup("Pool-0"); + snprintf(buffer, sizeof(buffer), "/local/pool/%d/name", poolid); + s = xs_read(ctx->xsh, XBT_NULL, buffer, &len); + if (!s) + { + snprintf(buffer, sizeof(buffer), "Pool-%d", poolid); + return strdup(buffer); + } return s; }