From patchwork Mon Sep 30 16:39:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksii Kurochko X-Patchwork-Id: 13816699 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E96F7CE8373 for ; Mon, 30 Sep 2024 16:39:43 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.807581.1219133 (Exim 4.92) (envelope-from ) id 1svJQm-0007Sb-2V; Mon, 30 Sep 2024 16:39:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 807581.1219133; Mon, 30 Sep 2024 16:39: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 1svJQl-0007SU-VL; Mon, 30 Sep 2024 16:39:27 +0000 Received: by outflank-mailman (input) for mailman id 807581; Mon, 30 Sep 2024 16:39:27 +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 1svJQl-0007SO-1d for xen-devel@lists.xenproject.org; Mon, 30 Sep 2024 16:39:27 +0000 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [2a00:1450:4864:20::132]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8ddad504-7f4a-11ef-a0ba-8be0dac302b0; Mon, 30 Sep 2024 18:39:25 +0200 (CEST) Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-5398e4ae9efso2127047e87.1 for ; Mon, 30 Sep 2024 09:39:25 -0700 (PDT) Received: from fedora.. ([94.75.70.14]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5398c9cabc5sm907209e87.169.2024.09.30.09.39.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2024 09:39:24 -0700 (PDT) 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: 8ddad504-7f4a-11ef-a0ba-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727714365; x=1728319165; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=D1pDeiz8nM4t6DuT/iEUYMl7LEw5I2rMp9tqNS0aro4=; b=GmF+KWVvwYPH5/6BgRX02IxtCfo4uPHdI8k3OqvsZ3pSFK4ei+/6jzn12LgVMrrI8S /j3+roOUU8xYDFjb7/E9fNE8RG6DJNgf2E+4BrqGHV9u0Nj2Ha7ATZiBEPB/dEBnxDRu 0qXa1Z2Pr4tU/Dp7z61vYgS5YykuXDiVDDT7zazPLaSn8YytBeGSuSvAGAHSMNXOrWH+ EU8aOb9nzshD42VqlatmvvzmRjUj42WEGyVn393NITTyVYHnIeQTGkknHBP/A7xWEE+c 4dWuYuUwGZpwSYMYuepd8HO+NHvtFcf0OSa0lCdUSo9Hsrd3Hsg7gCjq3VbR64CxL1Bw QImA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727714365; x=1728319165; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=D1pDeiz8nM4t6DuT/iEUYMl7LEw5I2rMp9tqNS0aro4=; b=RNCqjb7MNBNaxTlxT8U8X1WQjjVlUzcu6s2vYWcYOMh+LEleMqYMGZlGpfjJnb9AVe CqdFIkSYSgyBmS/Sfg8Rc7izRahbhD3RPalRFS31CszlfoNGlbiMkNeBuqXte/0C5jEK wKQHh8RAk4uNOzlPevnhRZ8ESn9jsWZ3N7+k9UHs2KS8rI4XXUCUNmQxHyjdI/z6oS0y lyJJ+fNQLc6VBGmKdOQRKFNaQFcuD79vlRaYutDaKkcvN5UXvOE0XxqE8hnQWP16ejRC uR+N+HohJoXnPXsm1nPK7TFH9wnHDiYMrxZH6cZlLc4E9dtrUEVaE8oiIfaScRJW9BSi 27bQ== X-Gm-Message-State: AOJu0YxUClfy/BZt34vP2l+nVFhvdKxLzNnAVQsm9v5u0xuTlR+05xMN GDcwoIV/X8XUFEUJ2xXLza8Ap5h2N/qx49N4ad4b0uke+E8ed5iesM7X7w== X-Google-Smtp-Source: AGHT+IF+YYu2XdTL2N7RjKRBQHA171AE+sA0NF6x1dcJVLJ2vUSplwoDcfeKWyvBNOEe9U3DMxqppg== X-Received: by 2002:a05:6512:334e:b0:539:8af8:159b with SMTP id 2adb3069b0e04-5398af81608mr3247741e87.34.1727714364254; Mon, 30 Sep 2024 09:39:24 -0700 (PDT) From: Oleksii Kurochko To: xen-devel@lists.xenproject.org Cc: Oleksii Kurochko , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel , Volodymyr Babchuk , Andrew Cooper , Jan Beulich , Shawn Anastasio , Alistair Francis , Bob Eshleman , Connor Davis , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [PATCH v4] xen: move per-cpu area management into common code Date: Mon, 30 Sep 2024 18:39:18 +0200 Message-ID: <584dab4111041a660377f677cd829d4b2b4b8b2d.1727714022.git.oleksii.kurochko@gmail.com> X-Mailer: git-send-email 2.46.1 MIME-Version: 1.0 Centralize per-cpu area management to reduce code duplication and enhance maintainability across architectures. The per-cpu area management code, which is largely common among architectures, is moved to a shared implementation in xen/common/percpu.c. This change includes: * Remove percpu.c from the X86 and Arm architectures. * For x86, define INVALID_PERCPU_AREAS and PARK_OFFLINE_CPUS_VAR. * Drop the declaration of __per_cpu_offset[] from stubs.c in PPC and RISC-V to facilitate the build of the common per-cpu code. No functional changes for x86. For Arm add support of CPU_RESUME_FAILED, CPU_REMOVE and freeing of percpu in the case when system_state != SYS_STATE_suspend. Move the asm-generic/percpu.h definitions to xen/percpu.h, except for __per_cpu_start[] and __per_cpu_data_end[], which are moved to common/percpu.c as they are only used in common/percpu.c. Signed-off-by: Oleksii Kurochko Reviewed-by: Jan Beulich Reviewed-by: Michal Orzel --- Changes in V4: - s/GPL-2.0/GPL-2.0-only. - add __read_mostly to __percpu_cpu_offset variable definition. - s/PARK_OFFLINE_CPUS/PARK_OFFLINE_CPUS_VAR. - update the commit message ( s/PARK_OFFLINE_CPUS/PARK_OFFLINE_CPUS_VAR ). --- Changes in V3: - move __per_cpu_start[] and __per_cpu_data_end[] to xen/percpu.c. - move declaration of __per_cpu_offset[] to xen/percpu.h. - move park_offline_cpus, per_cpu{_ptr}, this_cpu{_ptr} to xen/percpu.h. - drop inclusion of in x86/asm/percpu.h. - add inclusion of ( as in asm/curren.h is used types from asm/current.h ) and ( get_per_cpu_offset() ) to xen/percpu.h to deal with compilation errors. - xen/types.h and asm/current.h to avoid compilation errors in case when xen/percpu.h is included explicitly or implicitly in assembler code. - update the commit message. --- Changes in V2: - move definition of park_offline_cpus for Arm, PPC and RISC-V to - add to arm/asm/smp.h inclusion of ( at least, it is needed as it uses DECLARE_PER_CPU and also to not break the build because of moved definition of park_offline_cpus to asm-generic/percpu.h ) - remove x86/percpu.c as all the code was moved to common percpu.c. - add define PARK_OFFLINE_CPUS to x86/asm/percpu.h as x86 defines it in own way. - drop ARCH_PERCPU_AREA_CHECK and ARCH_CPU_PERCPU_CALLBACK as the code inside this definitions were integrated to common code. - use park_offline_cpus ? 0 : -EBUSY; instead of arch_percpu_area_init_status() in init_percpu_area(). - update cpu_percpu_callback() to handle CPU_UP_CANCELED, case CPU_DEAD, case CPU_RESUME_FAILED and also CPU parking and SYS_STATE_suspend. - move declaration of percpu_init_areas() to xen/percpu.h. --- xen/arch/arm/Makefile | 1 - xen/arch/arm/include/asm/smp.h | 7 +- xen/arch/arm/percpu.c | 85 ---------------------- xen/arch/ppc/include/asm/smp.h | 6 -- xen/arch/ppc/stubs.c | 1 - xen/arch/riscv/include/asm/smp.h | 6 -- xen/arch/riscv/stubs.c | 1 - xen/arch/x86/Makefile | 1 - xen/arch/x86/include/asm/Makefile | 1 - xen/arch/x86/include/asm/percpu.h | 14 ++++ xen/arch/x86/percpu.c | 112 ----------------------------- xen/common/Makefile | 1 + xen/common/percpu.c | 114 ++++++++++++++++++++++++++++++ xen/include/asm-generic/percpu.h | 23 ------ xen/include/xen/percpu.h | 30 ++++++++ 15 files changed, 160 insertions(+), 243 deletions(-) delete mode 100644 xen/arch/arm/percpu.c create mode 100644 xen/arch/x86/include/asm/percpu.h delete mode 100644 xen/arch/x86/percpu.c create mode 100644 xen/common/percpu.c diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 7792bff597..e4ad1ce851 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -39,7 +39,6 @@ obj-$(CONFIG_MEM_ACCESS) += mem_access.o obj-y += mm.o obj-y += monitor.o obj-y += p2m.o -obj-y += percpu.o obj-y += platform.o obj-y += platform_hypercall.o obj-y += physdev.o diff --git a/xen/arch/arm/include/asm/smp.h b/xen/arch/arm/include/asm/smp.h index e99a3a3f53..8f765ed12a 100644 --- a/xen/arch/arm/include/asm/smp.h +++ b/xen/arch/arm/include/asm/smp.h @@ -2,6 +2,7 @@ #define __ASM_SMP_H #ifndef __ASSEMBLY__ +#include #include #include #endif @@ -12,12 +13,6 @@ extern unsigned long smp_up_cpu; DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_mask); DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask); -/* - * Do we, for platform reasons, need to actually keep CPUs online when we - * would otherwise prefer them to be off? - */ -#define park_offline_cpus false - extern void noreturn stop_cpu(void); extern int arch_smp_init(void); diff --git a/xen/arch/arm/percpu.c b/xen/arch/arm/percpu.c deleted file mode 100644 index 87fe960330..0000000000 --- a/xen/arch/arm/percpu.c +++ /dev/null @@ -1,85 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#include -#include -#include -#include -#include - -unsigned long __per_cpu_offset[NR_CPUS]; -#define INVALID_PERCPU_AREA (-(long)__per_cpu_start) -#define PERCPU_ORDER (get_order_from_bytes(__per_cpu_data_end-__per_cpu_start)) - -void __init percpu_init_areas(void) -{ - unsigned int cpu; - for ( cpu = 1; cpu < NR_CPUS; cpu++ ) - __per_cpu_offset[cpu] = INVALID_PERCPU_AREA; -} - -static int init_percpu_area(unsigned int cpu) -{ - char *p; - if ( __per_cpu_offset[cpu] != INVALID_PERCPU_AREA ) - return -EBUSY; - if ( (p = alloc_xenheap_pages(PERCPU_ORDER, 0)) == NULL ) - return -ENOMEM; - memset(p, 0, __per_cpu_data_end - __per_cpu_start); - __per_cpu_offset[cpu] = p - __per_cpu_start; - return 0; -} - -struct free_info { - unsigned int cpu; - struct rcu_head rcu; -}; -static DEFINE_PER_CPU(struct free_info, free_info); - -static void _free_percpu_area(struct rcu_head *head) -{ - struct free_info *info = container_of(head, struct free_info, rcu); - unsigned int cpu = info->cpu; - char *p = __per_cpu_start + __per_cpu_offset[cpu]; - free_xenheap_pages(p, PERCPU_ORDER); - __per_cpu_offset[cpu] = INVALID_PERCPU_AREA; -} - -static void free_percpu_area(unsigned int cpu) -{ - struct free_info *info = &per_cpu(free_info, cpu); - info->cpu = cpu; - call_rcu(&info->rcu, _free_percpu_area); -} - -static int cpu_percpu_callback( - struct notifier_block *nfb, unsigned long action, void *hcpu) -{ - unsigned int cpu = (unsigned long)hcpu; - int rc = 0; - - switch ( action ) - { - case CPU_UP_PREPARE: - rc = init_percpu_area(cpu); - break; - case CPU_UP_CANCELED: - case CPU_DEAD: - free_percpu_area(cpu); - break; - default: - break; - } - - return notifier_from_errno(rc); -} - -static struct notifier_block cpu_percpu_nfb = { - .notifier_call = cpu_percpu_callback, - .priority = 100 /* highest priority */ -}; - -static int __init percpu_presmp_init(void) -{ - register_cpu_notifier(&cpu_percpu_nfb); - return 0; -} -presmp_initcall(percpu_presmp_init); diff --git a/xen/arch/ppc/include/asm/smp.h b/xen/arch/ppc/include/asm/smp.h index 7b1517ce18..2b872218be 100644 --- a/xen/arch/ppc/include/asm/smp.h +++ b/xen/arch/ppc/include/asm/smp.h @@ -7,10 +7,4 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_mask); DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask); -/* - * Do we, for platform reasons, need to actually keep CPUs online when we - * would otherwise prefer them to be off? - */ -#define park_offline_cpus false - #endif diff --git a/xen/arch/ppc/stubs.c b/xen/arch/ppc/stubs.c index bdb5f8c66d..fff82f5cf3 100644 --- a/xen/arch/ppc/stubs.c +++ b/xen/arch/ppc/stubs.c @@ -141,7 +141,6 @@ void smp_send_state_dump(unsigned int cpu) /* domain.c */ DEFINE_PER_CPU(struct vcpu *, curr_vcpu); -unsigned long __per_cpu_offset[NR_CPUS]; void context_switch(struct vcpu *prev, struct vcpu *next) { diff --git a/xen/arch/riscv/include/asm/smp.h b/xen/arch/riscv/include/asm/smp.h index a824be8e78..092b101ff4 100644 --- a/xen/arch/riscv/include/asm/smp.h +++ b/xen/arch/riscv/include/asm/smp.h @@ -10,12 +10,6 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_mask); DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask); -/* - * Do we, for platform reasons, need to actually keep CPUs online when we - * would otherwise prefer them to be off? - */ -#define park_offline_cpus false - /* * Mapping between Xen logical cpu index and hartid. */ diff --git a/xen/arch/riscv/stubs.c b/xen/arch/riscv/stubs.c index 2aa245f272..5951b0ce91 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -133,7 +133,6 @@ void smp_send_state_dump(unsigned int cpu) /* domain.c */ DEFINE_PER_CPU(struct vcpu *, curr_vcpu); -unsigned long __per_cpu_offset[NR_CPUS]; void context_switch(struct vcpu *prev, struct vcpu *next) { diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 1fa12ed4aa..b35fd5196c 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -54,7 +54,6 @@ obj-y += mpparse.o obj-y += nmi.o obj-y += numa.o obj-y += pci.o -obj-y += percpu.o obj-y += physdev.o obj-$(CONFIG_COMPAT) += x86_64/physdev.o obj-$(CONFIG_X86_PSR) += psr.o diff --git a/xen/arch/x86/include/asm/Makefile b/xen/arch/x86/include/asm/Makefile index daab34ff0a..2c27787d31 100644 --- a/xen/arch/x86/include/asm/Makefile +++ b/xen/arch/x86/include/asm/Makefile @@ -1,3 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only generic-y += div64.h -generic-y += percpu.h diff --git a/xen/arch/x86/include/asm/percpu.h b/xen/arch/x86/include/asm/percpu.h new file mode 100644 index 0000000000..34f589f990 --- /dev/null +++ b/xen/arch/x86/include/asm/percpu.h @@ -0,0 +1,14 @@ +#ifndef __X86_PERCPU_H__ +#define __X86_PERCPU_H__ + +#define PARK_OFFLINE_CPUS_VAR + +/* + * Force uses of per_cpu() with an invalid area to attempt to access the + * middle of the non-canonical address space resulting in a #GP, rather than a + * possible #PF at (NULL + a little) which has security implications in the + * context of PV guests. + */ +#define INVALID_PERCPU_AREA (0x8000000000000000UL - (unsigned long)__per_cpu_start) + +#endif /* __X86_PERCPU_H__ */ diff --git a/xen/arch/x86/percpu.c b/xen/arch/x86/percpu.c deleted file mode 100644 index 3205eacea6..0000000000 --- a/xen/arch/x86/percpu.c +++ /dev/null @@ -1,112 +0,0 @@ -#include -#include -#include -#include -#include - -unsigned long __per_cpu_offset[NR_CPUS]; - -/* - * Force uses of per_cpu() with an invalid area to attempt to access the - * middle of the non-canonical address space resulting in a #GP, rather than a - * possible #PF at (NULL + a little) which has security implications in the - * context of PV guests. - */ -#define INVALID_PERCPU_AREA (0x8000000000000000UL - (unsigned long)__per_cpu_start) -#define PERCPU_ORDER get_order_from_bytes(__per_cpu_data_end - __per_cpu_start) - -void __init percpu_init_areas(void) -{ - unsigned int cpu; - - for ( cpu = 1; cpu < NR_CPUS; cpu++ ) - __per_cpu_offset[cpu] = INVALID_PERCPU_AREA; -} - -static int init_percpu_area(unsigned int cpu) -{ - char *p; - - if ( __per_cpu_offset[cpu] != INVALID_PERCPU_AREA ) - return 0; - - if ( (p = alloc_xenheap_pages(PERCPU_ORDER, 0)) == NULL ) - return -ENOMEM; - - memset(p, 0, __per_cpu_data_end - __per_cpu_start); - __per_cpu_offset[cpu] = p - __per_cpu_start; - - return 0; -} - -struct free_info { - unsigned int cpu; - struct rcu_head rcu; -}; -static DEFINE_PER_CPU(struct free_info, free_info); - -static void cf_check _free_percpu_area(struct rcu_head *head) -{ - struct free_info *info = container_of(head, struct free_info, rcu); - unsigned int cpu = info->cpu; - char *p = __per_cpu_start + __per_cpu_offset[cpu]; - - free_xenheap_pages(p, PERCPU_ORDER); - __per_cpu_offset[cpu] = INVALID_PERCPU_AREA; -} - -static void free_percpu_area(unsigned int cpu) -{ - struct free_info *info = &per_cpu(free_info, cpu); - - info->cpu = cpu; - call_rcu(&info->rcu, _free_percpu_area); -} - -static int cf_check cpu_percpu_callback( - struct notifier_block *nfb, unsigned long action, void *hcpu) -{ - unsigned int cpu = (unsigned long)hcpu; - int rc = 0; - - switch ( action ) - { - case CPU_UP_PREPARE: - rc = init_percpu_area(cpu); - break; - case CPU_UP_CANCELED: - case CPU_DEAD: - case CPU_RESUME_FAILED: - if ( !park_offline_cpus && system_state != SYS_STATE_suspend ) - free_percpu_area(cpu); - break; - case CPU_REMOVE: - if ( park_offline_cpus ) - free_percpu_area(cpu); - break; - } - - return notifier_from_errno(rc); -} - -static struct notifier_block cpu_percpu_nfb = { - .notifier_call = cpu_percpu_callback, - .priority = 100 /* highest priority */ -}; - -static int __init cf_check percpu_presmp_init(void) -{ - register_cpu_notifier(&cpu_percpu_nfb); - - return 0; -} -presmp_initcall(percpu_presmp_init); - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/common/Makefile b/xen/common/Makefile index fc52e0857d..f90bb00d23 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -31,6 +31,7 @@ obj-y += notifier.o obj-$(CONFIG_NUMA) += numa.o obj-y += page_alloc.o obj-y += pdx.o +obj-y += percpu.o obj-$(CONFIG_PERF_COUNTERS) += perfc.o obj-bin-$(CONFIG_HAS_PMAP) += pmap.init.o obj-y += preempt.o diff --git a/xen/common/percpu.c b/xen/common/percpu.c new file mode 100644 index 0000000000..09b12be1b0 --- /dev/null +++ b/xen/common/percpu.c @@ -0,0 +1,114 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#include +#include +#include +#include +#include +#include + +#ifndef INVALID_PERCPU_AREA +#define INVALID_PERCPU_AREA (-(long)__per_cpu_start) +#endif + +#define PERCPU_ORDER get_order_from_bytes(__per_cpu_data_end - __per_cpu_start) + +extern char __per_cpu_start[]; +extern const char __per_cpu_data_end[]; + +unsigned long __read_mostly __per_cpu_offset[NR_CPUS]; + +void __init percpu_init_areas(void) +{ + unsigned int cpu; + + for ( cpu = 1; cpu < NR_CPUS; cpu++ ) + __per_cpu_offset[cpu] = INVALID_PERCPU_AREA; +} + +static int init_percpu_area(unsigned int cpu) +{ + char *p; + + if ( __per_cpu_offset[cpu] != INVALID_PERCPU_AREA ) + return park_offline_cpus ? 0 : -EBUSY; + + if ( (p = alloc_xenheap_pages(PERCPU_ORDER, 0)) == NULL ) + return -ENOMEM; + + memset(p, 0, __per_cpu_data_end - __per_cpu_start); + __per_cpu_offset[cpu] = p - __per_cpu_start; + + return 0; +} + +struct free_info { + unsigned int cpu; + struct rcu_head rcu; +}; +static DEFINE_PER_CPU(struct free_info, free_info); + +static void cf_check _free_percpu_area(struct rcu_head *head) +{ + struct free_info *info = container_of(head, struct free_info, rcu); + unsigned int cpu = info->cpu; + char *p = __per_cpu_start + __per_cpu_offset[cpu]; + + free_xenheap_pages(p, PERCPU_ORDER); + __per_cpu_offset[cpu] = INVALID_PERCPU_AREA; +} + +static void free_percpu_area(unsigned int cpu) +{ + struct free_info *info = &per_cpu(free_info, cpu); + + info->cpu = cpu; + call_rcu(&info->rcu, _free_percpu_area); +} + +static int cf_check cpu_percpu_callback( + struct notifier_block *nfb, unsigned long action, void *hcpu) +{ + unsigned int cpu = (unsigned long)hcpu; + int rc = 0; + + switch ( action ) + { + case CPU_UP_PREPARE: + rc = init_percpu_area(cpu); + break; + case CPU_UP_CANCELED: + case CPU_DEAD: + case CPU_RESUME_FAILED: + if ( !park_offline_cpus && system_state != SYS_STATE_suspend ) + free_percpu_area(cpu); + break; + case CPU_REMOVE: + if ( park_offline_cpus ) + free_percpu_area(cpu); + break; + } + + return notifier_from_errno(rc); +} + +static struct notifier_block cpu_percpu_nfb = { + .notifier_call = cpu_percpu_callback, + .priority = 100 /* highest priority */ +}; + +static int __init cf_check percpu_presmp_init(void) +{ + register_cpu_notifier(&cpu_percpu_nfb); + + return 0; +} +presmp_initcall(percpu_presmp_init); + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-generic/percpu.h b/xen/include/asm-generic/percpu.h index 60af4f9ff9..3fdb3a2a02 100644 --- a/xen/include/asm-generic/percpu.h +++ b/xen/include/asm-generic/percpu.h @@ -2,29 +2,6 @@ #ifndef __ASM_GENERIC_PERCPU_H__ #define __ASM_GENERIC_PERCPU_H__ -#ifndef __ASSEMBLY__ - -#include -#include - -extern char __per_cpu_start[]; -extern const char __per_cpu_data_end[]; -extern unsigned long __per_cpu_offset[NR_CPUS]; -void percpu_init_areas(void); - -#define per_cpu(var, cpu) \ - (*RELOC_HIDE(&per_cpu__##var, __per_cpu_offset[cpu])) - -#define this_cpu(var) \ - (*RELOC_HIDE(&per_cpu__##var, get_per_cpu_offset())) - -#define per_cpu_ptr(var, cpu) \ - (*RELOC_HIDE(var, __per_cpu_offset[cpu])) -#define this_cpu_ptr(var) \ - (*RELOC_HIDE(var, get_per_cpu_offset())) - -#endif - #endif /* __ASM_GENERIC_PERCPU_H__ */ /* diff --git a/xen/include/xen/percpu.h b/xen/include/xen/percpu.h index 57522f346b..e7f585c7ed 100644 --- a/xen/include/xen/percpu.h +++ b/xen/include/xen/percpu.h @@ -29,6 +29,36 @@ #include +#ifndef __ASSEMBLY__ + +#include +#include + +#ifndef PARK_OFFLINE_CPUS_VAR +/* + * Do we, for platform reasons, need to actually keep CPUs online when we + * would otherwise prefer them to be off? + */ +#define park_offline_cpus false +#endif + +extern unsigned long __per_cpu_offset[]; + +#define per_cpu(var, cpu) \ + (*RELOC_HIDE(&per_cpu__##var, __per_cpu_offset[cpu])) + +#define this_cpu(var) \ + (*RELOC_HIDE(&per_cpu__##var, get_per_cpu_offset())) + +#define per_cpu_ptr(var, cpu) \ + (*RELOC_HIDE(var, __per_cpu_offset[cpu])) +#define this_cpu_ptr(var) \ + (*RELOC_HIDE(var, get_per_cpu_offset())) + +void percpu_init_areas(void); + +#endif /* __ASSEMBLY__ */ + /* Linux compatibility. */ #define get_cpu_var(var) this_cpu(var) #define put_cpu_var(var)