[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH] xen/arm: smpboot: Allocate the CPU sibling/core maps while preparing the CPU
From: Julien Grall <jgrall@xxxxxxxxxx> Commit 5047cd1d5dea "xen/common: Use enhanced ASSERT_ALLOC_CONTEXT in xmalloc()" extended the checks in _xmalloc() to catch any use of the helpers from context with interrupts disabled. Unfortunately, the rule is not followed when allocating the CPU sibling/core maps. (XEN) Xen call trace: (XEN) [<00238a5c>] _xmalloc+0xfc/0x314 (PC) (XEN) [<00000000>] 00000000 (LR) (XEN) [<00238c8c>] _xzalloc+0x18/0x4c (XEN) [<00288cb4>] smpboot.c#setup_cpu_sibling_map+0x38/0x138 (XEN) [<00289024>] start_secondary+0x1b4/0x270 (XEN) [<40010170>] 40010170 (XEN) (XEN) (XEN) **************************************** (XEN) Panic on CPU 2: (XEN) Assertion '!in_irq() && (local_irq_is_enabled() || num_online_cpus() <= 1)' failed at common/xmalloc_tlsf.c:601 (XEN) **************************************** This is happening because zalloc_cpumask_var() may allocate memory if NR_CPUS is > 2 * sizeof(unsigned long). Avoid the problem by allocate the per-CPU IRQs while preparing the CPU. This also has the benefit to remove a panic() in the secondary CPU code. Signed-off-by: Julien Grall <jgrall@xxxxxxxxxx> --- xen/arch/arm/smpboot.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index 4888bcd78a5a..2b0c92cd369b 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -79,15 +79,17 @@ DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_mask); static bool __read_mostly opt_hmp_unsafe = false; boolean_param("hmp-unsafe", opt_hmp_unsafe); -static void setup_cpu_sibling_map(int cpu) +static int setup_cpu_sibling_map(int cpu) { if ( !zalloc_cpumask_var(&per_cpu(cpu_sibling_mask, cpu)) || !zalloc_cpumask_var(&per_cpu(cpu_core_mask, cpu)) ) - panic("No memory for CPU sibling/core maps\n"); + return -ENOMEM; /* A CPU is a sibling with itself and is always on its own core. */ cpumask_set_cpu(cpu, per_cpu(cpu_sibling_mask, cpu)); cpumask_set_cpu(cpu, per_cpu(cpu_core_mask, cpu)); + + return 0; } static void remove_cpu_sibling_map(int cpu) @@ -292,9 +294,14 @@ smp_get_max_cpus (void) void __init smp_prepare_cpus(void) { + int rc; + cpumask_copy(&cpu_present_map, &cpu_possible_map); - setup_cpu_sibling_map(0); + rc = setup_cpu_sibling_map(0); + if ( rc ) + panic("Unable to allocate CPU sibling/core maps\n"); + } /* Boot the current CPU */ @@ -361,8 +368,6 @@ void start_secondary(void) set_current(idle_vcpu[cpuid]); - setup_cpu_sibling_map(cpuid); - /* Run local notifiers */ notify_cpu_starting(cpuid); /* @@ -530,9 +535,19 @@ static int cpu_smpboot_callback(struct notifier_block *nfb, void *hcpu) { unsigned int cpu = (unsigned long)hcpu; + unsigned int rc = 0; switch ( action ) { + case CPU_UP_PREPARE: + rc = setup_cpu_sibling_map(cpu); + if ( rc ) + printk(XENLOG_ERR + "Unable to allocate CPU sibling/core map for CPU%u\n", + cpu); + + break; + case CPU_DEAD: remove_cpu_sibling_map(cpu); break; -- 2.32.0
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |