From nobody Fri Aug 4 16:55:26 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 4RHWzy4Ptfz4TrxD; Fri, 4 Aug 2023 16:55:26 +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 4RHWzy3r04z3ftC; Fri, 4 Aug 2023 16:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691168126; 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=fBtUKKM3Rq2zni3N6ZeJrdmLbAzI9Jb4GvIXR2/8tD0=; b=m47pUgYRKfmV+nJ9oo/2WqzuNhGvF65avT8t4eEhad0eNKOkbpw4SYH4Y9oRZBYCKkzLqV eqzKysc2Ijfo7j3k+rWB9ANi43e8fzWGhgxgaiVTtqbs9r1NXE+QFqo2IGvV11Ph+RmHTg mGcfkz3rfCavpX5f59Iq8QtY3p36lWnbBcPd0RZd+cf01FGcZtcWtScm5ZamRl1xdQHf7x ratKTmrv1ANj142ch0hGK7JDXJEhuzDbnCPNcX8hM2ioqCT2myJuxMBtMwbo96WRw4/vpG 1vRKYpy/1iVHc+R3Mg2NjQWHPpbOMrm6uKO8gfIXhObQb0c29DS4gX4epyc00A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691168126; 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=fBtUKKM3Rq2zni3N6ZeJrdmLbAzI9Jb4GvIXR2/8tD0=; b=nM66V6D+OoYfqyrtEVgaLruuxSrAAZHBL9L2R9YHyb8+nqlPT+e6jT5/NYG6KVSMBRirWJ 6OvczEBH3D4ysSZc3FfWWJOsJhjjPM8NtpQ3xvGcKhEDsoQq9KYD8uL6CdwJW4dISoj/oa CNsZfi5luPQ2OJBrgaEWmB0GnFTe833K53WfDO6l7AC4KQUA36/KFCS0P6Nn9GNpWnamU0 Ch2sa5vnKbgTVeRf43FLqcW7jmZRt9IvyOvJAG9VdPcnVUR/VXpWv441coNeYVPPPGfzeu jBt7Aczbgq3lf9tbHfPWK555WcTC9nuw/DZJN7ZmKKSYLKbwgmAPwOzPRLPywA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691168126; a=rsa-sha256; cv=none; b=YVpLUQIfWQiv+xsJDV9cHji1ag5GJKVgUN/LT9Of6U2XDEQn5gdI8xNoVMT9v3M8aF7CPO xN72dAYB+bDeTsLDJf6CGquhUFLwEy3bDXd1EumfQanKn/XcssqJDl58gvV/Yg89mwW5S8 PKkudLFDNL1lPmi5b25Vtzi9Bnsv+JZk/JWdmlj19VN8wSO1RE949mdgw6uY0dHhLKnnjQ 8F+fdeTeCXIu83AJTwuwJQ0+HFtRxOzEmsmf1b5OZD9T5cDkDAcUBmR19aKVdKvp9yigzE 1bwyEpw24XEHjER3mtxITskqE3YuvaFWcxulrFtkjMzUHaYd20CnG/aKMQWnSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RHWzy2tHsz195S; Fri, 4 Aug 2023 16:55:26 +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 374GtQOQ075560; Fri, 4 Aug 2023 16:55:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374GtQXp075559; Fri, 4 Aug 2023 16:55:26 GMT (envelope-from git) Date: Fri, 4 Aug 2023 16:55:26 GMT Message-Id: <202308041655.374GtQXp075559@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: 78cc000cbae9 - main - amd64: Increase sanitizers' static shadow memory reservation 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: 78cc000cbae9913e924aee13ec4fd367cb87336e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=78cc000cbae9913e924aee13ec4fd367cb87336e commit 78cc000cbae9913e924aee13ec4fd367cb87336e Author: Mark Johnston AuthorDate: 2023-08-04 16:25:50 +0000 Commit: Mark Johnston CommitDate: 2023-08-04 16:38:24 +0000 amd64: Increase sanitizers' static shadow memory reservation Because KASAN shadows the kernel image itself (KMSAN currently does not), a shadow mapping of the boot stack must be created very early during boot. pmap_san_enter() reserves a fixed number of pages for the purpose of creating and mapping this shadow region. After commit 789df254cc9e ("amd64: Use a larger boot stack"), it could happen that this reservation is insufficient; this happens when bootstack crosses a PAGE_SHIFT + KASAN_SHADOW_SCALE_SHIFT boundary. Update the calculation to take into account the new size of the boot stack. Fixes: 789df254cc9e ("amd64: Use a larger boot stack") Sponsored by: The FreeBSD Foundation --- sys/amd64/amd64/pmap.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 5bc40bd00a32..5d747e62d37c 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -11642,13 +11642,16 @@ pmap_pkru_clear(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) /* * Reserve enough memory to: * 1) allocate PDP pages for the shadow map(s), - * 2) shadow one page of memory, so one PD page, one PT page, and one shadow - * page per shadow map. + * 2) shadow the boot stack of KSTACK_PAGES pages, + * so we need one PD page, one or two PT pages, and KSTACK_PAGES shadow pages + * per shadow map. */ #ifdef KASAN -#define SAN_EARLY_PAGES (NKASANPML4E + 3) +#define SAN_EARLY_PAGES \ + (NKASANPML4E + 1 + 2 + howmany(KSTACK_PAGES, KASAN_SHADOW_SCALE)) #else -#define SAN_EARLY_PAGES (NKMSANSHADPML4E + NKMSANORIGPML4E + 2 * 3) +#define SAN_EARLY_PAGES \ + (NKMSANSHADPML4E + NKMSANORIGPML4E + 2 * (1 + 2 + KSTACK_PAGES)) #endif static uint64_t __nosanitizeaddress __nosanitizememory