From nobody Fri Oct 13 09:27:29 2023 X-Original-To: dev-commits-src-main@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 4S6Lkn4Scvz4wl0n; Fri, 13 Oct 2023 09:27:29 +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 4S6Lkn3XlBz4RkB; Fri, 13 Oct 2023 09:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697189249; 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=aY2tiMRiqKUe9OtkViT86Att2j0lFJl587U31seS7fA=; b=lFh/hUHXo55v5fSccb6ciPAxP+vsNPmb+2VNuWDz6Ujowr7gXzi9L5BaEW2SoH/U4NLOvf n5QStYClyTc3fcohLDmTBUsewq+AoHGzTNhidG7vqxDo7wRD5QYfLaVMKYpXC7W7PcpJRV Y+bOXAsDliJaYula9deYHUKjcgKp/HhPX53x/Fl5VxpduLfRPeTUOf/pBD3dO4P03Uigy4 381PrAoog95hUr8EVNTLBvIeO1NHdCcIaUozBuTFgqv6FhT3gHuwbg6xuVfruMLNTvqP2Y LlmAyeoeDRYBAh4NXySXbDcqNTBRF/VqpJR9lonS1LfJESzmOjaSd3V6vIP/7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697189249; a=rsa-sha256; cv=none; b=lVLauozzmqey7P+DtgjEq3BM/3XqJ9K6Lo8eusrlOay1HKKq5xvH+5TXKiIZP5IjXDIYIT Wkth9EoV7b5RWuUcXVoM3b2xphk8xVUR2WNJ1UPGrK1IVVzEJ9ea4of9FfisOPggJckQkx aWuANIkEHh0fI9fXCBnnse4alpeIR6mUMnnPtkOKn2b7ZseWCnmK0RwIuhcWkUGDFg8thc TKd6VB5EpB8sgPPUfMg93tj+lRrRtrt4TWYKGXvpG5JVoFHCB6OG3cq4IBgBWdEkShlVhB wmHut7LZ94C281UCJ70eHKB/BIsREGCZTmaPjkjkVaiwUHeSBTdROjmm58AysA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697189249; 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=aY2tiMRiqKUe9OtkViT86Att2j0lFJl587U31seS7fA=; b=Jhg/EiuIHbymTpbJ4r2+Ef/ZE2OLfUsgkXNgW3ZvRUDHRlzoovLAgjZx2q+iuLwXKuuEAz KCDvUj5wddferivRSwo9XSshFNGDH6V2XKkcRykMW7MuerwBISF+ykPWYdKBpwPsdEvK3B b1GLJ7F+CI54g0m6Q55jkMyuPUFIKQrXcCr2gdv3Y1fpjhGP3WrOW9fOkosNIMmkfS16ns M/Biexw0M82MLTh5ZYpEWRgEMoXHDaeJougCW2h7HQlREIzUhlgKLlTWSenW1KLCKZ3//9 sIP/E73zLZ7cOGX/P0m3owVAc55tY+ZpJVYNKZsbdhwFYEL+/nVkXQXvPvJnuw== 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 4S6Lkn2ZdkzjL2; Fri, 13 Oct 2023 09:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39D9RTVp085623; Fri, 13 Oct 2023 09:27:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39D9RTS7085618; Fri, 13 Oct 2023 09:27:29 GMT (envelope-from git) Date: Fri, 13 Oct 2023 09:27:29 GMT Message-Id: <202310130927.39D9RTS7085618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ac63f7534d01 - main - arm64, riscv: Use KSTACK_PAGES for the thread0 kstack size designator List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac63f7534d0102352bf993ebe2c748ce2ffd432e Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ac63f7534d0102352bf993ebe2c748ce2ffd432e commit ac63f7534d0102352bf993ebe2c748ce2ffd432e Author: Konstantin Belousov AuthorDate: 2023-10-09 23:56:37 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-13 09:26:45 +0000 arm64, riscv: Use KSTACK_PAGES for the thread0 kstack size designator instead of kstack_pages. Although it is correct right now to use kstack_pages on amd64 since the kern.kstack_pages tunable is not functional on arm64, this is too fragile and wrong on riscv. Include opt_kstack_pages.h into machdep.c to get the right definition for KSTACK_PAGES. Reviewed by: jhb, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42143 --- sys/arm64/arm64/machdep.c | 3 ++- sys/riscv/riscv/machdep.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 4bfbfcaa91bd..8aa45a86fef4 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -26,6 +26,7 @@ */ #include "opt_acpi.h" +#include "opt_kstack_pages.h" #include "opt_platform.h" #include "opt_ddb.h" @@ -380,7 +381,7 @@ init_proc0(vm_offset_t kstack) proc_linkup0(&proc0, &thread0); thread0.td_kstack = kstack; - thread0.td_kstack_pages = kstack_pages; + thread0.td_kstack_pages = KSTACK_PAGES; #if defined(PERTHREAD_SSP) thread0.td_md.md_canary = boot_canary; #endif diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index 6bc0b996948a..261dc8d6d840 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -33,6 +33,7 @@ * SUCH DAMAGE. */ +#include "opt_kstack_pages.h" #include "opt_platform.h" #include @@ -286,7 +287,7 @@ init_proc0(vm_offset_t kstack) proc_linkup0(&proc0, &thread0); thread0.td_kstack = kstack; - thread0.td_kstack_pages = kstack_pages; + thread0.td_kstack_pages = KSTACK_PAGES; thread0.td_pcb = (struct pcb *)(thread0.td_kstack + thread0.td_kstack_pages * PAGE_SIZE) - 1; thread0.td_pcb->pcb_fpflags = 0;