From nobody Sun Sep 18 06:27:17 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MVdBt1vSdz4c3Bb; Sun, 18 Sep 2022 06:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MVdBs6mmlz3ZC1; Sun, 18 Sep 2022 06:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663482437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SP2O40bmL2vTWcoTAniz6SmzYWdBuVhEvNcSU9vo/Pg=; b=ts/2TbwZbuZLJ+f/QWoPLrf7U3hnEWaXLr9YCzRX6Y3pd5oNTv5lXo1cTLzNtzs5n/t5QQ eOwolU628wzESaTjpjBVxD3YRlsXk69/wylrxYzCE5Bs6yZ7xMCbILF20UPzlQkAUFL5Un CBkzzKAKIBDcOs7Wx3zZ79kWeiyv4acbmy1BMtrmXkybLaCyv/MqpF17mTna4KOtFBKMDv 5g905hrxbd5LKBLzIAGCZ56PV7/u0qkmej34Hr1Va8iY4AYHK8Luzd34oThmd0UCWlhGMm hQz5trNCSH9/SOHqLiUeFuR5839EaG3rVdCIGpt78zTds8nXqLvukLrySbCoIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MVdBs5rgszxbB; Sun, 18 Sep 2022 06:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28I6RHG9068266; Sun, 18 Sep 2022 06:27:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28I6RHdH068265; Sun, 18 Sep 2022 06:27:17 GMT (envelope-from git) Date: Sun, 18 Sep 2022 06:27:17 GMT Message-Id: <202209180627.28I6RHdH068265@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 6ef5bf8c21aa - stable/12 - arm64, riscv: size boot stacks appropriately List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 6ef5bf8c21aa06b451422c1ba94aa8c8ae186c56 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663482437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SP2O40bmL2vTWcoTAniz6SmzYWdBuVhEvNcSU9vo/Pg=; b=PLsUiAKQqye02K75B/+RhVgcPjL8aQKPEX0SevGKzw3w2xWXQ8hi6LW89nzqUoOSK2u7lz 4BSieeDWGBgcnWImUWwrb1+TWGGXtRiGZzi/izPmI7rT+nn7IHtT2pRW7V0aNrxe1MbFMd qUaa+WZds/4Xga74tYIm29o5P/KHABYtr+T3ou8dFsPGWaMJKdn5raYBO0OizaMtvFvtto xdmADC6vXY6Wcyhx909u1wqInJ93vTXqPHjuYB5NyfvPMstxOC3Qd/+VQrXIsd3AuEDDzR S2eiiJxZX7B6NMN9CSJ5eKR07YRLTv7MNMXJrtFfD0ASg/X3f3+KVA+MGpZIWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663482437; a=rsa-sha256; cv=none; b=XJQfWav9QRW9tKqVc/vd2CauSalZX/tp3+jYn1KbzpDo1Fsg0uggkTysi/eHXjNxeps9kW W1TBD4q7dke84YQVncK7wO2hE3baJdlMvPJfQXFuGFPEp+ZCazZN3miHYLeWvRQ/poixSi hZDbNfgxxRuSo+OBiGpNu8Y2C/8GRG9IdThyf0/V77sWiwL7Xc159sx+CDdOYFhTwHXjTW 0KCxFpSpaUS7Cn9UQENiAGnCAt3WODl4f8D8sSBsKqz8UsoYoO3Dc87GFQCxu+OiRb9wbj QNoUkacxv2KqMqxUkZbnwZ8xIOIpbddT+l04BP9BBQclNimJujHiyShDMsjHrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6ef5bf8c21aa06b451422c1ba94aa8c8ae186c56 commit 6ef5bf8c21aa06b451422c1ba94aa8c8ae186c56 Author: Kyle Evans AuthorDate: 2022-09-07 02:11:30 +0000 Commit: Kyle Evans CommitDate: 2022-09-17 19:32:46 +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 | 12 ++++++++---- sys/riscv/riscv/mp_machdep.c | 10 +++++++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index 8e57fc2eac5f..85a22b01ff81 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -76,6 +76,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; @@ -344,7 +346,8 @@ smp_after_idle_runnable(void *arg __unused) pc = pcpu_find(cpu); while ((void *)atomic_load_ptr(&pc->pc_curpcb) == NULL) cpu_spinwait(); - kmem_free((vm_offset_t)bootstacks[cpu], PAGE_SIZE); + kmem_free((vm_offset_t)bootstacks[cpu], + MP_BOOTSTACK_SIZE); } } } @@ -510,10 +513,11 @@ start_cpu(u_int id, uint64_t target_cpu) 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 (%lx)\n", cpuid, target_cpu); pa = pmap_extract(kernel_pmap, (vm_offset_t)mpentry); @@ -532,7 +536,7 @@ start_cpu(u_int id, uint64_t target_cpu) 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--; diff --git a/sys/riscv/riscv/mp_machdep.c b/sys/riscv/riscv/mp_machdep.c index 2cc1e5f5ca61..97d604bb832d 100644 --- a/sys/riscv/riscv/mp_machdep.c +++ b/sys/riscv/riscv/mp_machdep.c @@ -69,6 +69,8 @@ __FBSDID("$FreeBSD$"); #include #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]; @@ -307,7 +309,8 @@ smp_after_idle_runnable(void *arg __unused) pc = pcpu_find(cpu); while ((void *)atomic_load_ptr(&pc->pc_curpcb) == NULL) cpu_spinwait(); - kmem_free((vm_offset_t)bootstacks[cpu], PAGE_SIZE); + kmem_free((vm_offset_t)bootstacks[cpu], + MP_BOOTSTACK_SIZE); } } } @@ -472,10 +475,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);