The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9a45e76cfd25c3a01ef44350ddbda603bb07e408
commit 9a45e76cfd25c3a01ef44350ddbda603bb07e408 Author: Kyle Evans <[email protected]> AuthorDate: 2022-09-07 02:11:30 +0000 Commit: Kyle Evans <[email protected]> CommitDate: 2022-09-18 06:26:39 +0000 arm64, riscv: size boot stacks appropriately In 8db2e8fd16c4 ("Remove the secondary_stacks array in arm64 [...]"), bootstacks was setup to be allocated dynamically. While this is generally how x86 does it, it inadvertently shrunk each boot stack from KSTACK_PAGES pages to a single page. Resize these back up to the expected size using the kstack_pages tunable, as we'll need larger stacks with upcoming sanitizer work. Reviewed by: andrew, imp, markj Fixes: 8db2e8fd16c4 ("Remove the secondary_stacks array [...]") Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. (cherry picked from commit bab32a8029c3f9339acbd786ffe8f27ad9cfd288) --- sys/arm64/arm64/mp_machdep.c | 11 +++++++---- sys/riscv/riscv/mp_machdep.c | 10 +++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index 3e47c60088a8..d2f81d9a950f 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -81,6 +81,8 @@ __FBSDID("$FreeBSD$"); #include "pic_if.h" +#define MP_BOOTSTACK_SIZE (kstack_pages * PAGE_SIZE) + #define MP_QUIRK_CPULIST 0x01 /* The list of cpus may be wrong, */ /* don't panic if one fails to start */ static uint32_t mp_quirks; @@ -314,7 +316,8 @@ smp_after_idle_runnable(void *arg __unused) for (cpu = 1; cpu < mp_ncpus; cpu++) { if (bootstacks[cpu] != NULL) - kmem_free((vm_offset_t)bootstacks[cpu], PAGE_SIZE); + kmem_free((vm_offset_t)bootstacks[cpu], + MP_BOOTSTACK_SIZE); } } SYSINIT(smp_after_idle_runnable, SI_SUB_SMP, SI_ORDER_ANY, @@ -515,10 +518,10 @@ start_cpu(u_int cpuid, uint64_t target_cpu, int domain) dpcpu_init(dpcpu[cpuid - 1], cpuid); bootstacks[cpuid] = (void *)kmem_malloc_domainset( - DOMAINSET_PREF(domain), PAGE_SIZE, M_WAITOK | M_ZERO); + DOMAINSET_PREF(domain), MP_BOOTSTACK_SIZE, M_WAITOK | M_ZERO); naps = atomic_load_int(&aps_started); - bootstack = (char *)bootstacks[cpuid] + PAGE_SIZE; + bootstack = (char *)bootstacks[cpuid] + MP_BOOTSTACK_SIZE; printf("Starting CPU %u (%lx)\n", cpuid, target_cpu); pa = pmap_extract(kernel_pmap, (vm_offset_t)mpentry); @@ -537,7 +540,7 @@ start_cpu(u_int cpuid, uint64_t target_cpu, int domain) pcpu_destroy(pcpup); kmem_free((vm_offset_t)dpcpu[cpuid - 1], DPCPU_SIZE); dpcpu[cpuid - 1] = NULL; - kmem_free((vm_offset_t)bootstacks[cpuid], PAGE_SIZE); + kmem_free((vm_offset_t)bootstacks[cpuid], MP_BOOTSTACK_SIZE); bootstacks[cpuid] = NULL; mp_ncpus--; return (false); diff --git a/sys/riscv/riscv/mp_machdep.c b/sys/riscv/riscv/mp_machdep.c index e038b65d9aba..e4fb7e98badb 100644 --- a/sys/riscv/riscv/mp_machdep.c +++ b/sys/riscv/riscv/mp_machdep.c @@ -71,6 +71,8 @@ __FBSDID("$FreeBSD$"); #include <dev/ofw/ofw_cpu.h> #endif +#define MP_BOOTSTACK_SIZE (kstack_pages * PAGE_SIZE) + boolean_t ofw_cpu_reg(phandle_t node, u_int, cell_t *); uint32_t __riscv_boot_ap[MAXCPU]; @@ -312,7 +314,8 @@ smp_after_idle_runnable(void *arg __unused) for (cpu = 1; cpu <= mp_maxid; cpu++) { if (bootstacks[cpu] != NULL) - kmem_free((vm_offset_t)bootstacks[cpu], PAGE_SIZE); + kmem_free((vm_offset_t)bootstacks[cpu], + MP_BOOTSTACK_SIZE); } } SYSINIT(smp_after_idle_runnable, SI_SUB_SMP, SI_ORDER_ANY, @@ -476,10 +479,11 @@ cpu_init_fdt(u_int id, phandle_t node, u_int addr_size, pcell_t *reg) dpcpu[cpuid - 1] = (void *)kmem_malloc(DPCPU_SIZE, M_WAITOK | M_ZERO); dpcpu_init(dpcpu[cpuid - 1], cpuid); - bootstacks[cpuid] = (void *)kmem_malloc(PAGE_SIZE, M_WAITOK | M_ZERO); + bootstacks[cpuid] = (void *)kmem_malloc(MP_BOOTSTACK_SIZE, + M_WAITOK | M_ZERO); naps = atomic_load_int(&aps_started); - bootstack = (char *)bootstacks[cpuid] + PAGE_SIZE; + bootstack = (char *)bootstacks[cpuid] + MP_BOOTSTACK_SIZE; printf("Starting CPU %u (hart %lx)\n", cpuid, hart); atomic_store_32(&__riscv_boot_ap[hart], 1);
