d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Assert that the page queues lock is held in pmap_remove_all().

Browse Source 
- Fix a diagnostic message and comment in pmap_remove_all().
 - Eliminate excessive white space from pmap_remove_all().

Approved by:	re
This commit is contained in:
Alan Cox 2002-11-23 04:48:13 +00:00
parent 2442bdd81b
commit 4817d8e5e6
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/amd64/amd64/pmap.c
View File

@ -1871,24 +1871,21 @@ pmap_remove_all(vm_page_t m)
#if defined(PMAP_DIAGNOSTIC) #if defined(PMAP_DIAGNOSTIC)
/* /*
* XXX this makes pmap_page_protect(NONE) illegal for non-managed * XXX This makes pmap_remove_all() illegal for non-managed pages!
* pages!
*/ */
if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) { if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) {
panic("pmap_page_protect: illegal for unmanaged page, va: 0x%x", VM_PAGE_TO_PHYS(m)); panic("pmap_remove_all: illegal for unmanaged page, va: 0x%x",
VM_PAGE_TO_PHYS(m));
} }
#endif #endif
mtx_assert(&vm_page_queue_mtx, MA_OWNED);
s = splvm(); s = splvm();
while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) {
pv->pv_pmap->pm_stats.resident_count--; pv->pv_pmap->pm_stats.resident_count--;
pte = pmap_pte_quick(pv->pv_pmap, pv->pv_va); pte = pmap_pte_quick(pv->pv_pmap, pv->pv_va);
tpte = atomic_readandclear_int(pte); tpte = atomic_readandclear_int(pte);
if (tpte & PG_W) if (tpte & PG_W)
pv->pv_pmap->pm_stats.wired_count--; pv->pv_pmap->pm_stats.wired_count--;
if (tpte & PG_A) if (tpte & PG_A)
vm_page_flag_set(m, PG_REFERENCED); vm_page_flag_set(m, PG_REFERENCED);
@ -1907,16 +1904,13 @@ pmap_remove_all(vm_page_t m)
vm_page_dirty(m); vm_page_dirty(m);
} }
pmap_invalidate_page(pv->pv_pmap, pv->pv_va); pmap_invalidate_page(pv->pv_pmap, pv->pv_va);
TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist);
TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
m->md.pv_list_count--; m->md.pv_list_count--;
pmap_unuse_pt(pv->pv_pmap, pv->pv_va, pv->pv_ptem); pmap_unuse_pt(pv->pv_pmap, pv->pv_va, pv->pv_ptem);
free_pv_entry(pv); free_pv_entry(pv);
} }
vm_page_flag_clear(m, PG_WRITEABLE); vm_page_flag_clear(m, PG_WRITEABLE);
splx(s); splx(s);
} }

14
sys/i386/i386/pmap.c
View File

@ -1871,24 +1871,21 @@ pmap_remove_all(vm_page_t m)
#if defined(PMAP_DIAGNOSTIC) #if defined(PMAP_DIAGNOSTIC)
/* /*
* XXX this makes pmap_page_protect(NONE) illegal for non-managed * XXX This makes pmap_remove_all() illegal for non-managed pages!
* pages!
*/ */
if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) { if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) {
panic("pmap_page_protect: illegal for unmanaged page, va: 0x%x", VM_PAGE_TO_PHYS(m)); panic("pmap_remove_all: illegal for unmanaged page, va: 0x%x",
VM_PAGE_TO_PHYS(m));
} }
#endif #endif
mtx_assert(&vm_page_queue_mtx, MA_OWNED);
s = splvm(); s = splvm();
while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) {
pv->pv_pmap->pm_stats.resident_count--; pv->pv_pmap->pm_stats.resident_count--;
pte = pmap_pte_quick(pv->pv_pmap, pv->pv_va); pte = pmap_pte_quick(pv->pv_pmap, pv->pv_va);
tpte = atomic_readandclear_int(pte); tpte = atomic_readandclear_int(pte);
if (tpte & PG_W) if (tpte & PG_W)
pv->pv_pmap->pm_stats.wired_count--; pv->pv_pmap->pm_stats.wired_count--;
if (tpte & PG_A) if (tpte & PG_A)
vm_page_flag_set(m, PG_REFERENCED); vm_page_flag_set(m, PG_REFERENCED);
@ -1907,16 +1904,13 @@ pmap_remove_all(vm_page_t m)
vm_page_dirty(m); vm_page_dirty(m);
} }
pmap_invalidate_page(pv->pv_pmap, pv->pv_va); pmap_invalidate_page(pv->pv_pmap, pv->pv_va);
TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist);
TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
m->md.pv_list_count--; m->md.pv_list_count--;
pmap_unuse_pt(pv->pv_pmap, pv->pv_va, pv->pv_ptem); pmap_unuse_pt(pv->pv_pmap, pv->pv_va, pv->pv_ptem);
free_pv_entry(pv); free_pv_entry(pv);
} }
vm_page_flag_clear(m, PG_WRITEABLE); vm_page_flag_clear(m, PG_WRITEABLE);
splx(s); splx(s);
} }