From nobody Fri Oct 20 15:58:47 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 4SBq532PJrz4xwKy; Fri, 20 Oct 2023 15:58:47 +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 4SBq531lvXz3FvC; Fri, 20 Oct 2023 15:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817527; 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=Sa+G/c0wcg9IWkWTus+rFhjGoRhoI1OfTjK1GLGxvJc=; b=gQ0WcglnCBFhGNwhw/Abk/1K9SGgrn7PbYvOSySEzWDiBFzEi8mwi03yaum2FL6jFdZPgG /+x5+RtayUtYNApsgrjUbsZW2TNvm0u3y6fA0PrtJzFBI+W3SdA2DTbaCX57nhiKN97aSO u9foJW8xYd1AmvhbMoMvfoFubb+H3LY03aoQG+TeHUm2VRUP5YFGIt6HE9HUMazHdH2WZ9 ve5JuFeuyo0cFOjLl7l7h+rEcdY4g2JCzMeKsv9q5EmBl9SBB1Fb8nO8zJG0Ux/usTDIsr Qx+WeoxtbuMmFg7qplTs40S1NlEIfUOPWQBxELrEdA14sTr4TGlrOYrDRgPRVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697817527; a=rsa-sha256; cv=none; b=iLbiLwY02YQy//ZqgArdj554XUUuOLy/pGWpF8T30sSGvqwDIz1TxkmeH/FhadL8wE/orW eZhI3t9tEU7CGVRFJnQTHNmfgeQWjlb4A5LZk3Z0lX5petirpMrBGb1x+5dJk2dY1wJ7Uj yCXKqI74KcCKspHW1qKFrtTo/g1CaEzvmZPzHIoBE8arOrCrZJbtVx1ZpXDCqFvskc6jFL dE2YEmXX3rHZJ7jVcWZvOh5ncSHRDaiD8iy0prLmPC4vpk4pc6N7b1EI8KknA+njGukJYN lpkeXdKT4xjEjKf6Y1h1RGAQr6sRmBD8lmoMhNXykGfZny6VB157skF2DDjb2w== 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=1697817527; 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=Sa+G/c0wcg9IWkWTus+rFhjGoRhoI1OfTjK1GLGxvJc=; b=Ga5uHIhHBbQWWS6kIEBBDt55f6hWlsrI1Jhhwjwx0ttdfIvVowgiMCZcdfJ3YOiP3o4MU+ wPP7Dm+a5jomBpEVwSZsgd7LLDByqImzBFx7NycsyBcpceXYTtfsHSXmS/ojMuTErRcNGO h2cztWLo+QjDShGslqluEUqcJcjlcXFu8O0YIjk5wZARm9m7TAbGJHLRZi8EhonZxcxvRK TeSjBP9RneEU1C5lZpD70ervd0yPq4emF+eaHT1j50p1MWuKQIweYqc0YxgHhTcqCdGWhT Gowq8bnlY8RiWX8Wx1XAqtUgX0y9/AQ4+HbjgPPKhffaR02lTkMXyv0McoZ9cQ== 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 4SBq530pbjzfdD; Fri, 20 Oct 2023 15:58:47 +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 39KFwlul022263; Fri, 20 Oct 2023 15:58:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KFwlmw022260; Fri, 20 Oct 2023 15:58:47 GMT (envelope-from git) Date: Fri, 20 Oct 2023 15:58:47 GMT Message-Id: <202310201558.39KFwlmw022260@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: 7dd8fb3cd9fc - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 7dd8fb3cd9fccd11082cc82eba68de4c6114e48d Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7dd8fb3cd9fccd11082cc82eba68de4c6114e48d commit 7dd8fb3cd9fccd11082cc82eba68de4c6114e48d Author: Konstantin Belousov AuthorDate: 2023-10-09 23:56:37 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-20 15:58:14 +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 0c64160596be..a575ca5eb818 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" @@ -363,7 +364,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 9aeeb4f1252c..b8a60d3a2bff 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 @@ -289,7 +290,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;