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

Pass the PDE from pmap_remove() to pmap_remove_page() so that the latter

Browse Source 
procedure doesn't have to recompute it.
This commit is contained in:
alc 2005-08-22 20:02:40 +00:00
parent a41f7da35f
commit c525799625
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,7 +205,7 @@ static void pmap_clear_ptes(vm_page_t m, long bit);
static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq,
vm_offset_t sva, pd_entry_t ptepde); vm_offset_t sva, pd_entry_t ptepde);
static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); static void pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde);
static void pmap_remove_entry(struct pmap *pmap, vm_page_t m, static void pmap_remove_entry(struct pmap *pmap, vm_page_t m,
vm_offset_t va); vm_offset_t va);
static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m); static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m);
@ -1530,16 +1530,17 @@ pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t va, pd_entry_t ptepde)
* Remove a single page from a process address space * Remove a single page from a process address space
*/ */
static void static void
pmap_remove_page(pmap_t pmap, vm_offset_t va) pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde)
{ {
pd_entry_t ptepde;
pt_entry_t *pte; pt_entry_t *pte;
PMAP_LOCK_ASSERT(pmap, MA_OWNED); PMAP_LOCK_ASSERT(pmap, MA_OWNED);
pte = pmap_pte_pde(pmap, va, &ptepde); if ((*pde & PG_V) == 0)
if (pte == NULL || (*pte & PG_V) == 0)
return; return;
pmap_remove_pte(pmap, pte, va, ptepde); pte = pmap_pde_to_pte(pde, va);
if ((*pte & PG_V) == 0)
return;
pmap_remove_pte(pmap, pte, va, *pde);
pmap_invalidate_page(pmap, va); pmap_invalidate_page(pmap, va);
} }
@ -1578,7 +1579,7 @@ pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
if (sva + PAGE_SIZE == eva) { if (sva + PAGE_SIZE == eva) {
pde = pmap_pde(pmap, sva); pde = pmap_pde(pmap, sva);
if (pde && (*pde & PG_PS) == 0) { if (pde && (*pde & PG_PS) == 0) {
pmap_remove_page(pmap, sva); pmap_remove_page(pmap, sva, pde);
goto out; goto out;
} }
} }