From nobody Mon Jul 24 22:50:11 2023 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 4R8wNM5Hn3z4nvXd; Mon, 24 Jul 2023 22:50: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 4R8wNM3L9Pz3HMD; Mon, 24 Jul 2023 22:50:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690239011; 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=RSwrZ+NNwZvUB+aCPxcl+9MkyQLYvWTelN1ES3cnrx4=; b=hzHpfK/13iDBnHPh5AUozmqc4GEBofVf4uHu5FZuDKkaJ+IY10LDTk9fK2Owcke8tj1aBe v0takAiaVRkRpctAGJ9V9R3t9qmtXqvJlXh9kaxd/G4JpHI6IPy5qFLQ1UdXK+v0ZwcgBz 98EJlGTxxnhTN3WHoAlv8acWXIs+dYq0gbIrBQxgyVDBVT3OWfsEVoXrJoIRFkYccAAnUQ 1pO4zyVFKphW4WNqBmiTEDAmNSWlefWC3qUIPe09JoPcHvVkfnAPN3sEsPXDsPcT8y0P+q 24CLRPGiGt7NmKHxHC5lgfNqKULSYb99wvhb31pSUM29WfjsCunF12q6HfEFiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690239011; 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=RSwrZ+NNwZvUB+aCPxcl+9MkyQLYvWTelN1ES3cnrx4=; b=mPVDIuN1+MPBQq+HsK+LTmA6A9BEmaGjBG4qiNL4XtiR9B+FrKfh2fbMCHrb0/UYg7FOAZ kbpoD6SWcfTtTZ+/QVJ8b7yFz9v456Jt7D+NBqhPpdU0o3Rzh+3QqmEsrXyYontW170y5X n5rdXPCkE58Dh5maGPODEpzFayWw3LOuFgXqBIatqT+O5hTDt7Q47m8G+uZ3qvAu4bm4SC p+TApM5Ig/5UIqCIiMMoGMRfcpbjZl1evYgASNfSeaeA693IoEnkSwfCFVsAgCIwhr9muc zzJjijouaKGUyk1H35FdKaoH5ki98H7U+pvLFiif1YGkmO8BhQNVWfkPKoozOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690239011; a=rsa-sha256; cv=none; b=yJQutLRAyc/w6Z2P7FVJt7cgVv+EXjp20I9UpIXsXu8l+QnTqq7hO8vjXuhqpVqVlezLDS gDRjPoIktu2OE0aWCpbhsG7jGXiXj34yYYS1TLx8Bo6ZPiI7bDd5moUor+GmLf+rYRAe8G Ma8m7UyG3Mg/rDvMSjSf5cZVZeaEhN4fr+92w5jgrh9QntWY69iFvdeF5hDoSJdmSV1dDW nss1mQmZ+P8f7cxvApMENPKSGFp9wjXHJqqyo1Ouh77/XSqrWbyC4BhKaWkwOWuk5n0Qaj 6yxLsRiOd/7Xwi0+b+NwLFMtLAARy+UsG63oZf8sFH/XCvdVEwsjA16d0qwRZQ== 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 4R8wNM2Qkyzc6p; Mon, 24 Jul 2023 22:50: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 36OMoBME081293; Mon, 24 Jul 2023 22:50:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36OMoBKk081290; Mon, 24 Jul 2023 22:50:11 GMT (envelope-from git) Date: Mon, 24 Jul 2023 22:50:11 GMT Message-Id: <202307242250.36OMoBKk081290@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 789df254cc9e - main - amd64: Use a larger boot stack 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 789df254cc9e20c860ccc149b94dd1f92843ec9a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=789df254cc9e20c860ccc149b94dd1f92843ec9a commit 789df254cc9e20c860ccc149b94dd1f92843ec9a Author: Mark Johnston AuthorDate: 2023-07-24 22:47:42 +0000 Commit: Mark Johnston CommitDate: 2023-07-24 22:49:36 +0000 amd64: Use a larger boot stack With sanitizers enabled, it becomes possible to overflow the stack when only a single page is used. Follow arm64's example and use the default kernel stack size instead. This is a bit wasteful, but without a guard page, overflow merely corrupts adjacent .bss entries and is thus difficult to debug. Note, with a GENERIC kernel we already consume over half of the available boot stack space, see the review for an example. Reviewed by: kib Reported by: Jenkins MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41166 --- sys/amd64/amd64/genassym.c | 1 + sys/amd64/amd64/locore.S | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c index feb3c7f503ce..4c17561b6e39 100644 --- a/sys/amd64/amd64/genassym.c +++ b/sys/amd64/amd64/genassym.c @@ -116,6 +116,7 @@ ASSYM(KERNBASE, KERNBASE); ASSYM(KERNLOAD, KERNLOAD); ASSYM(DMAP_MIN_ADDRESS, DMAP_MIN_ADDRESS); ASSYM(DMAP_MAX_ADDRESS, DMAP_MAX_ADDRESS); +ASSYM(KSTACK_PAGES, KSTACK_PAGES); ASSYM(PCB_R15, offsetof(struct pcb, pcb_r15)); ASSYM(PCB_R14, offsetof(struct pcb, pcb_r14)); diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index f034a25c9b1b..41386756021e 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -48,7 +48,7 @@ .set dmapbase,DMAP_MIN_ADDRESS .set dmapend,DMAP_MAX_ADDRESS -#define BOOTSTACK_SIZE 4096 +#define BOOTSTACK_SIZE (PAGE_SIZE * KSTACK_PAGES) .text /********************************************************************** @@ -148,7 +148,7 @@ ENTRY(la57_trampoline_gdt) ENTRY(la57_trampoline_end) .bss - ALIGN_DATA /* just to be sure */ + .p2align PAGE_SHIFT .globl bootstack .space BOOTSTACK_SIZE /* space for bootstack - temporary stack */ bootstack: