diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2021-08-10 20:23:42 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2021-08-11 01:22:07 +0000 |
| commit | 4fd450a87df015fe85cadfac0e22c73e3c878d24 (patch) | |
| tree | 52a9a31b2436d5a575cbb82f3cc05d123cb2ecef | |
| parent | 805c3af898a8fed6a92caa069011c0ce7fa542ef (diff) | |
| download | src-4fd450a87df015fe85cadfac0e22c73e3c878d24.tar.gz src-4fd450a87df015fe85cadfac0e22c73e3c878d24.zip | |
amd64 pmap: Pre-set PG_M on 2MB KASAN shadow map entries
Also remove a redundant assertion in pmap_kasan_enter().
Reviewed by: alc, kib
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D31295
| -rw-r--r-- | sys/amd64/amd64/pmap.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index bc203990faa1..bff4f5376fda 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -11321,7 +11321,7 @@ pmap_kasan_enter(vm_offset_t va) m = pmap_kasan_enter_alloc_2m(); if (m != NULL) { *pde = (pd_entry_t)(VM_PAGE_TO_PHYS(m) | X86_PG_RW | - X86_PG_PS | X86_PG_V | pg_nx); + X86_PG_PS | X86_PG_V | X86_PG_A | X86_PG_M | pg_nx); } else { m = pmap_kasan_enter_alloc_4k(); *pde = (pd_entry_t)(VM_PAGE_TO_PHYS(m) | X86_PG_RW | @@ -11333,8 +11333,6 @@ pmap_kasan_enter(vm_offset_t va) pte = pmap_pde_to_pte(pde, va); if ((*pte & X86_PG_V) != 0) return; - KASSERT((*pte & X86_PG_V) == 0, - ("%s: shadow address %#lx is already mapped", __func__, va)); m = pmap_kasan_enter_alloc_4k(); *pte = (pt_entry_t)(VM_PAGE_TO_PHYS(m) | X86_PG_RW | X86_PG_V | X86_PG_M | X86_PG_A | pg_nx); |