amd64 pmap_vm_page_alloc_check(): loose the assert

Current expression checks that vm_page_alloc(9) never returns a page
belonging to the preload area.  This is not true if something was freed
from there, for instance a preloaded module was unloaded, or ucode update
freed.

Only check that we never allow to allocate a page belonging to the kernel
proper, check against _end.

Reported and tested by:	dhw
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week

This commit is contained in:

Konstantin Belousov

2021-08-02 00:58:21 +03:00

parent 56be282bc9

commit 665895db26

1 changed files with 4 additions and 3 deletions

									
										sys/amd64/include/pmap.h
									
		+4
		-3
	
												View File
												
				@@ -457,9 +457,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;