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

Implement the protection check required by the pmap_extract_and_hold()

Browse Source 
specification.  This enables the elimination of Giant from that function.
This commit is contained in:
Alan Cox 2004-06-23 04:37:14 +00:00
parent 29d4ba3f47
commit db2a1d54cc
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=130958
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -801,18 +801,34 @@ pmap_extract(pmap, va)
vm_page_t
pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot)
{
vm_paddr_t pa;
pd_entry_t pde, *pdep;
pt_entry_t pte;
vm_page_t m;
m = NULL;
mtx_lock(&Giant);
if ((pa = pmap_extract(pmap, va)) != 0) {
m = PHYS_TO_VM_PAGE(pa);
vm_page_lock_queues();
vm_page_hold(m);
vm_page_unlock_queues();
if (pmap == NULL)
return (m);
vm_page_lock_queues();
PMAP_LOCK(pmap);
pdep = pmap_pde(pmap, va);
if (pdep != NULL && (pde = *pdep)) {
if (pde & PG_PS) {
if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) {
m = PHYS_TO_VM_PAGE((pde & ~PDRMASK) |
(va & PDRMASK));
vm_page_hold(m);
}
} else {
pte = *pmap_pte(pmap, va);
if ((pte & PG_V) &&
((pte & PG_RW) || (prot & VM_PROT_WRITE) == 0)) {
m = PHYS_TO_VM_PAGE(pte & PG_FRAME);
vm_page_hold(m);
}
}
}
mtx_unlock(&Giant);
vm_page_unlock_queues();
PMAP_UNLOCK(pmap);
return (m);
}