svn commit: r340522 - in stable/12/sys: amd64/amd64 i386/i386

[Mark Johnston]

Author: markj
Date: Sat Nov 17 20:55:11 2018
New Revision: 340522
URL: https://svnweb.freebsd.org/changeset/base/340522

Log:
  MFC r339490:
  Add an assertion to pmap_enter().

Modified:
  stable/12/sys/amd64/amd64/pmap.c
  stable/12/sys/i386/i386/pmap.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/amd64/amd64/pmap.c
==============================================================================
--- stable/12/sys/amd64/amd64/pmap.c	Sat Nov 17 20:54:24 2018	(r340521)
+++ stable/12/sys/amd64/amd64/pmap.c	Sat Nov 17 20:55:11 2018	(r340522)
@@ -5141,6 +5141,8 @@ retry:
 				vm_page_aflag_set(om, PGA_REFERENCED);
 			CHANGE_PV_LIST_LOCK_TO_PHYS(&lock, opa);
 			pv = pmap_pvh_remove(&om->md, pmap, va);
+			KASSERT(pv != NULL,
+			    ("pmap_enter: no PV entry for %#lx", va));
 			if ((newpte & PG_MANAGED) == 0)
 				free_pv_entry(pmap, pv);
 			if ((om->aflags & PGA_WRITEABLE) != 0 &&

Modified: stable/12/sys/i386/i386/pmap.c
==============================================================================
--- stable/12/sys/i386/i386/pmap.c	Sat Nov 17 20:54:24 2018	(r340521)
+++ stable/12/sys/i386/i386/pmap.c	Sat Nov 17 20:55:11 2018	(r340522)
@@ -3820,6 +3820,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, v
 			if ((origpte & PG_A) != 0)
 				vm_page_aflag_set(om, PGA_REFERENCED);
 			pv = pmap_pvh_remove(&om->md, pmap, va);
+			KASSERT(pv != NULL,
+			    ("pmap_enter: no PV entry for %#x", va));
 			if ((newpte & PG_MANAGED) == 0)
 				free_pv_entry(pmap, pv);
 			if ((om->aflags & PGA_WRITEABLE) != 0 &&