git: 89423483e83f - stable/13 - amd64 pmap_vm_page_alloc_check(): loose the assert

Konstantin Belousov kib at FreeBSD.org
Mon Aug 23 23:22:26 UTC 2021


The branch stable/13 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=89423483e83f93993a01c3d5eb3bc3b626e74193

commit 89423483e83f93993a01c3d5eb3bc3b626e74193
Author:     Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-08-01 21:58:21 +0000
Commit:     Konstantin Belousov <kib at FreeBSD.org>
CommitDate: 2021-08-23 23:21:14 +0000

    amd64 pmap_vm_page_alloc_check(): loose the assert
    
    (cherry picked from commit 665895db262fa596b347e40f6857b37e0f43b184)
---
 sys/amd64/include/pmap.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 3228494a2aaa..6fb240e6363a 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -449,9 +449,10 @@ extern int invpcid_works;
 #define	pmap_unmapbios(va, sz)		pmap_unmapdev((va), (sz))
 
 #define	pmap_vm_page_alloc_check(m)					\
-	KASSERT(m->phys_addr < kernphys || m->phys_addr >= KERNend,	\
-	    ("allocating kernel page %p pa %#lx kernphys %#lx kernend %#lx", \
-	    m, m->phys_addr, kernphys, KERNend));
+	KASSERT(m->phys_addr < kernphys ||				\
+	    m->phys_addr >= kernphys + (vm_offset_t)&_end - KERNSTART,	\
+	    ("allocating kernel page %p pa %#lx kernphys %#lx end %p", \
+	    m, m->phys_addr, kernphys, &_end));
 
 struct thread;
 


More information about the dev-commits-src-branches mailing list