MFi386 r241356

Add several asserts.

MFC after:	3 days
This commit is contained in:
Alan Cox 2012-10-10 17:15:34 +00:00
parent 8d92e1db93
commit 0bec9f73db

View File

@ -2014,6 +2014,9 @@ pmap_pv_reclaim(pmap_t locked_pmap)
pmap_pte_release(pte); pmap_pte_release(pte);
if ((tpte & PG_W) != 0) if ((tpte & PG_W) != 0)
continue; continue;
KASSERT(tpte != 0,
("pmap_pv_reclaim: pmap %p va %x zero pte",
pmap, va));
if ((tpte & PG_G) != 0) if ((tpte & PG_G) != 0)
pmap_invalidate_page(pmap, va); pmap_invalidate_page(pmap, va);
m = PHYS_TO_VM_PAGE(tpte & PG_FRAME); m = PHYS_TO_VM_PAGE(tpte & PG_FRAME);
@ -2286,6 +2289,8 @@ pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t va, vm_page_t *free)
PMAP_LOCK_ASSERT(pmap, MA_OWNED); PMAP_LOCK_ASSERT(pmap, MA_OWNED);
oldpte = *ptq; oldpte = *ptq;
PT_SET_VA_MA(ptq, 0, TRUE); PT_SET_VA_MA(ptq, 0, TRUE);
KASSERT(oldpte != 0,
("pmap_remove_pte: pmap %p va %x zero pte", pmap, va));
if (oldpte & PG_W) if (oldpte & PG_W)
pmap->pm_stats.wired_count -= 1; pmap->pm_stats.wired_count -= 1;
/* /*
@ -2470,6 +2475,8 @@ pmap_remove_all(vm_page_t m)
pte = pmap_pte_quick(pmap, pv->pv_va); pte = pmap_pte_quick(pmap, pv->pv_va);
tpte = *pte; tpte = *pte;
PT_SET_VA_MA(pte, 0, TRUE); PT_SET_VA_MA(pte, 0, TRUE);
KASSERT(tpte != 0, ("pmap_remove_all: pmap %p va %x zero pte",
pmap, pv->pv_va));
if (tpte & PG_W) if (tpte & PG_W)
pmap->pm_stats.wired_count--; pmap->pm_stats.wired_count--;
if (tpte & PG_A) if (tpte & PG_A)
@ -3533,6 +3540,8 @@ pmap_remove_pages(pmap_t pmap)
PMAP_LOCK(pmap); PMAP_LOCK(pmap);
sched_pin(); sched_pin();
TAILQ_FOREACH_SAFE(pc, &pmap->pm_pvchunk, pc_list, npc) { TAILQ_FOREACH_SAFE(pc, &pmap->pm_pvchunk, pc_list, npc) {
KASSERT(pc->pc_pmap == pmap, ("Wrong pmap %p %p", pmap,
pc->pc_pmap));
allfree = 1; allfree = 1;
for (field = 0; field < _NPCM; field++) { for (field = 0; field < _NPCM; field++) {
inuse = ~pc->pc_map[field] & pc_freemask[field]; inuse = ~pc->pc_map[field] & pc_freemask[field];