git: fb448e37e98a - stable/13 - arm64: Ignore 1GB mappings in pmap_advise()
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 01 Oct 2022 16:13:26 UTC
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=fb448e37e98ab7930b2b8e8bcbd79e6756c4aacc
commit fb448e37e98ab7930b2b8e8bcbd79e6756c4aacc
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2022-09-24 13:26:54 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2022-10-01 15:34:58 +0000
arm64: Ignore 1GB mappings in pmap_advise()
For the same reason as commit 4c224f8e5f36cfad5a9af8db7c7acdecc3d4c7b5.
(cherry picked from commit 89a2ef4d5226135deb89cececdf32d55812d84fd)
---
sys/arm64/arm64/pmap.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
index d76376a96e56..5dd7c11062f9 100644
--- a/sys/arm64/arm64/pmap.c
+++ b/sys/arm64/arm64/pmap.c
@@ -5920,13 +5920,8 @@ pmap_advise(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, int advice)
l1 = pmap_l0_to_l1(l0, sva);
if (pmap_load(l1) == 0)
continue;
- if ((pmap_load(l1) & ATTR_DESCR_MASK) == L1_BLOCK) {
- KASSERT(va_next <= eva,
- ("partial update of non-transparent 1G page "
- "l1 %#lx sva %#lx eva %#lx va_next %#lx",
- pmap_load(l1), sva, eva, va_next));
+ if ((pmap_load(l1) & ATTR_DESCR_MASK) == L1_BLOCK)
continue;
- }
va_next = (sva + L2_SIZE) & ~L2_OFFSET;
if (va_next < sva)