From nobody Fri Oct 20 15:56:11 2023 X-Original-To: dev-commits-src-branches@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 4SBq236DQtz4xw19; Fri, 20 Oct 2023 15:56:11 +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 4SBq235qGXz3DxH; Fri, 20 Oct 2023 15:56:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817371; 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=SZiHgBVxH5GiL5rBZOi0kHyIHavvEiZYt4LqzY9G30k=; b=azV91ZiLGpwyN2Rn7VTezy3nzVnMzeD5AAl6dRlKTFTFWlyLf45pPl+aYZcj/+vyrDuIxd ZAJZwxLQ192uF3b+NcqmQF3kzmSFqj4KCLmaFA7jDMgM4lbzuXhkXZ//085h4tqVbblneV owAvmPVQ8DcQwTpn14lXc8i81NMDy8yTKB9lYCRVbnjVsDfxOKvhOt2hHz6YUIV08RPqp/ xKB3ZJ+/C7xR8tBWMAC222a+kfKfEjTPL2xk+q0SvWt+bL6TSloyfRov5Vo45gvXPAwG2C o2jv20/wUkHBI7oXV/FJNH3tyAhMgh0C6V+lE5DtZDZYb9l+64+Lli2bC7MVbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697817371; a=rsa-sha256; cv=none; b=CC7weM08H+Yq1jXxIBolXaFzTbIdARviTmGu7bZYKSLEg3PnoNomYYe9/+OOyggOM021zs dVjsFL2KH/1ZPYETqQdVu8pz8IlErRuCxpziZfrlWRAks55bG3aBsBBsaz6vVEX4yHytZp iX7z2KZUlchpvlaZulWVhpdN5qfeE5PJd7ipoY0gqdP/xbwc+Kp2T25QFDU2N1XJBkyuHr DTuWVLNtep13lyx5DwnAFJMqHJ+4Qx36MTvcuPrRXgsuT+VDHJJJEPDZhEnsmoP161SRfC xG0gbQwXnQMlLMxPw0HTfC3NceZD0eZ55cecN0qq9ozD9kU38tSJSGHT3CkfEQ== 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=1697817371; 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=SZiHgBVxH5GiL5rBZOi0kHyIHavvEiZYt4LqzY9G30k=; b=uLCfwQJUBhG3bnZksked0A1zIlRhImF9Rp9lbhM11vk6GbCzcMUrI8VQuLDKpE1Iwv95ed lFQVmWYmJxFWSHbrlFrrKV4yTD2+XjUXcRCCF8p8bvdO6aXjltyUoA554aU3OaAn1Odal5 VcDkroToF1UneZqLfw1VBDyL6EUSJBINTXeBcrKLW2EjsxCAuf6URxbOheg9P3XWMX+zls 2JuXZKeM1TklCFXygT1P/PTjZSoA/eTRkLcF92N+gEXIi/64yKHv8/YyQuy0yquMita0AJ wiKir8akm1g2ZL0HdsHzJdk1ie/20snP3W5DcuC4d5osvMbisGjUMVn3aA0Elw== 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 4SBq234tWvzfM6; Fri, 20 Oct 2023 15:56:11 +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 39KFuB2I021581; Fri, 20 Oct 2023 15:56:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KFuB8Y021578; Fri, 20 Oct 2023 15:56:11 GMT (envelope-from git) Date: Fri, 20 Oct 2023 15:56:11 GMT Message-Id: <202310201556.39KFuB8Y021578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3f5b4dd6cd35 - stable/14 - arm64, riscv: Use KSTACK_PAGES for the thread0 kstack size designator List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 3f5b4dd6cd35e00544c332422918c296ca853162 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3f5b4dd6cd35e00544c332422918c296ca853162 commit 3f5b4dd6cd35e00544c332422918c296ca853162 Author: Konstantin Belousov AuthorDate: 2023-10-09 23:56:37 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-20 15:55:45 +0000 arm64, riscv: Use KSTACK_PAGES for the thread0 kstack size designator (cherry picked from commit ac63f7534d0102352bf993ebe2c748ce2ffd432e) --- 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;