From nobody Thu Feb 8 16:36:31 2024
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 4TW2gN4HVqz5B0dG;
Thu, 8 Feb 2024 16:36:32 +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 4TW2gN0506z4MmK;
Thu, 8 Feb 2024 16:36:32 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1707410192;
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=aa5Ovn7Zwmpakc2wma05Fw33B/oHWBX0bBSEpG2wmIs=;
b=SzjyW3J8U2RJzuCQQIAlGoSXzF+soFJENchp/vupTClZhLFiSnbGBmIGyfZggCKVZZHyrZ
Rx1nZseF4+n0q6zHoAgbUU37EdFAdDUv1Fl5vcZENmgPSYWyCHQkdNZCdN0VQcOVR+NFaj
MylaVZpdbD0F1x0nBN2EUSzhQLirRaJC89zQ6LlEnzL0X9B7LRSxOsfoVNd/9xUAgFCg8L
TqLT1hV+dqLyltmuKFfGa+FFYJj6uxxavOYnZ5gA48dXkn0GFW797xJ5WRnf51jOoI4U1y
Zion6pM+OemgrzPDeGoIqWVC85xRAZwFTPOI4tejOYg4JylNXrUBG66VCF47LA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1707410192;
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=aa5Ovn7Zwmpakc2wma05Fw33B/oHWBX0bBSEpG2wmIs=;
b=yQT3ROMDh4oLlKxBwI4V88C7ZajzjjSwus9unRX10nJECwiB0urggfrL7+YfCFyw5vMF8e
yQnFuHyHgI5bBneSGhaHsNLFDMu3pU8HG5DvsYcLrR51dGfNhSak+q3VfPjhvEFL4q00n0
dLyPG/lINc1HL3kUrYii2OgSeudTXIOXgZnqDqe1KdVMxJHEL4pwZi7NK2DyLJmjq4OJ4H
k7HrYRpIlH/dXf0ZhyNJF2BLZcdRMZr01ajuWzP4jHlCzOkByV1rJC94u648puJ1xqzkXC
5bcDK07OAdUwhE41YdbEJ/3qdgji1yTR/TgAr22RZBRQbOnQKFAl2hXuEEeDCw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707410192; a=rsa-sha256; cv=none;
b=F9DM+az2GdlZLiZVDJi3C9WiPozZ+W+tohy0mUl4mBYV0b3bgNmR4L0HyE5a5fNv9dKcyk
hrpTx+TWne/Ldqw7OaUycNO8YEBXkO0yhloLOD1Ua7vUXr4/AWRkgbFLXGKQzVg1iMi/KV
tm2UkabLvSuiubczoWsLPjUvMJhzlUaj6GsZw3vTzQvv1aL9EN74gBD7xZ6KnoZtUtSaca
S7zQ1WPNt0oZrOSw2hv/Fp/maJHR9CyvHOaS1uc5jHzN76UcXeOv5LGAa8Iu9gp6Aiq1j8
JqW5fSPKfVSbe8AJRKGyA27OpPmyupGw/YHV3mfyG905qU8BDQb1Jwf/2eQl4w==
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 4TW2gM6ClGzxbx;
Thu, 8 Feb 2024 16:36:31 +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 418GaVF6020676;
Thu, 8 Feb 2024 16:36:31 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 418GaVkp020673;
Thu, 8 Feb 2024 16:36:31 GMT
(envelope-from git)
Date: Thu, 8 Feb 2024 16:36:31 GMT
Message-Id: <202402081636.418GaVkp020673@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 52bf6257c2aa - main - arm64: Define shadow maps for
KMSAN
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
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: 52bf6257c2aac19788636e525b139ec57a38fb1c
Auto-Submitted: auto-generated
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=52bf6257c2aac19788636e525b139ec57a38fb1c
commit 52bf6257c2aac19788636e525b139ec57a38fb1c
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-02-08 15:56:58 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-02-08 16:35:11 +0000
arm64: Define shadow maps for KMSAN
Both are the same size as the kernel map.
Reviewed by: imp
MFC after: 2 weeks
Sponsored by: Klara, Inc.
Sponsored by: Juniper Networks, Inc.
Differential Revision: https://reviews.freebsd.org/D43154
---
sys/arm64/arm64/pmap.c | 6 ++++++
sys/arm64/include/vmparam.h | 14 ++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
index 58c21f9d2c30..7c7a9a08fd30 100644
--- a/sys/arm64/arm64/pmap.c
+++ b/sys/arm64/arm64/pmap.c
@@ -8175,6 +8175,12 @@ sysctl_kmaps(SYSCTL_HANDLER_ARGS)
else if (i == pmap_l0_index(KASAN_MIN_ADDRESS))
sbuf_printf(sb, "\nKASAN shadow map:\n");
#endif
+#ifdef KMSAN
+ else if (i == pmap_l0_index(KMSAN_SHAD_MIN_ADDRESS))
+ sbuf_printf(sb, "\nKMSAN shadow map:\n");
+ else if (i == pmap_l0_index(KMSAN_ORIG_MIN_ADDRESS))
+ sbuf_printf(sb, "\nKMSAN origin map:\n");
+#endif
l0e = kernel_pmap->pm_l0[i];
if ((l0e & ATTR_DESCR_VALID) == 0) {
diff --git a/sys/arm64/include/vmparam.h b/sys/arm64/include/vmparam.h
index d577b9315471..0967d3c0aedf 100644
--- a/sys/arm64/include/vmparam.h
+++ b/sys/arm64/include/vmparam.h
@@ -131,6 +131,12 @@
* 0xfffffeffffffffff End of DMAP
* 0xffffa00000000000 Start of DMAP
*
+ * 0xffff027fffffffff End of KMSAN origin map
+ * 0xffff020000000000 Start of KMSAN origin map
+ *
+ * 0xffff017fffffffff End of KMSAN shadow map
+ * 0xffff010000000000 Start of KMSAN shadow map
+ *
* 0xffff009fffffffff End of KASAN shadow map
* 0xffff008000000000 Start of KASAN shadow map
*
@@ -167,6 +173,14 @@
#define KASAN_MIN_ADDRESS (0xffff008000000000UL)
#define KASAN_MAX_ADDRESS (0xffff00a000000000UL)
+/* 512GiB KMSAN shadow map */
+#define KMSAN_SHAD_MIN_ADDRESS (0xffff010000000000UL)
+#define KMSAN_SHAD_MAX_ADDRESS (0xffff018000000000UL)
+
+/* 512GiB KMSAN origin map */
+#define KMSAN_ORIG_MIN_ADDRESS (0xffff020000000000UL)
+#define KMSAN_ORIG_MAX_ADDRESS (0xffff028000000000UL)
+
/* The address bits that hold a pointer authentication code */
#define PAC_ADDR_MASK (0xff7f000000000000UL)