Date: Wed, 16 Sep 2015 23:46:20 +0000 (UTC) From: Zbigniew Bodek <zbb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287883 - head/sys/arm64/arm64 Message-ID: <201509162346.t8GNkKXn062084@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zbb Date: Wed Sep 16 23:46:20 2015 New Revision: 287883 URL: https://svnweb.freebsd.org/changeset/base/287883 Log: Release memory for CPUs that fail to init on ARM64 cpu_init_fdt will now release memory allocated for structures serving CPUs that have failed to init. Obtained from: Semihalf Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D3297 Modified: head/sys/arm64/arm64/mp_machdep.c Modified: head/sys/arm64/arm64/mp_machdep.c ============================================================================== --- head/sys/arm64/arm64/mp_machdep.c Wed Sep 16 23:34:51 2015 (r287882) +++ head/sys/arm64/arm64/mp_machdep.c Wed Sep 16 23:46:20 2015 (r287883) @@ -352,7 +352,6 @@ cpu_init_fdt(u_int id, phandle_t node, u if (id == 0) return (1); - CPU_SET(id, &all_cpus); pcpup = &__pcpu[id]; pcpu_init(pcpup, id, sizeof(struct pcpu)); @@ -371,8 +370,17 @@ cpu_init_fdt(u_int id, phandle_t node, u pa = pmap_extract(kernel_pmap, (vm_offset_t)mpentry); err = psci_cpu_on(target_cpu, pa, id); - if (err != PSCI_RETVAL_SUCCESS) - printf("Failed to start CPU %u\n", id); + if (err != PSCI_RETVAL_SUCCESS) { + /* Panic here if INVARIANTS are enabled */ + KASSERT(0, ("Failed to start CPU %u (%lx)\n", id, target_cpu)); + + pcpu_destroy(pcpup); + kmem_free(kernel_arena, (vm_offset_t)dpcpu[id - 1], DPCPU_SIZE); + dpcpu[id - 1] = NULL; + /* Notify the user that the CPU failed to start */ + printf("Failed to start CPU %u (%lx)\n", id, target_cpu); + } else + CPU_SET(id, &all_cpus); return (1); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509162346.t8GNkKXn062084>