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

Finish the PG_NX support at the pmap level.

Browse Source 
Reviewed by:	alc
This commit is contained in:
Ruslan Ermilov 2006-11-23 21:36:02 +00:00
parent 1862415c25
commit 7b0381568e
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2126,7 +2126,8 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
return;
}
if (prot & VM_PROT_WRITE)
if ((prot & (VM_PROT_WRITE|VM_PROT_EXECUTE)) ==
(VM_PROT_WRITE|VM_PROT_EXECUTE))
return;
anychanged = 0;
@ -2162,7 +2163,10 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
* Check for large page.
*/
if ((ptpaddr & PG_PS) != 0) {
*pde &= ~(PG_M|PG_RW);
if ((prot & VM_PROT_WRITE) == 0)
*pde &= ~(PG_M|PG_RW);
if ((prot & VM_PROT_EXECUTE) == 0)
*pde |= pg_nx;
anychanged = 1;
continue;
}
@ -2177,6 +2181,8 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
retry:
obits = pbits = *pte;
if ((pbits & PG_V) == 0)
continue;
if (pbits & PG_MANAGED) {
m = NULL;
if (pbits & PG_A) {
@ -2192,7 +2198,10 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
}
}
pbits &= ~(PG_RW | PG_M);
if ((prot & VM_PROT_WRITE) == 0)
pbits &= ~(PG_RW | PG_M);
if ((prot & VM_PROT_EXECUTE) == 0)
pbits |= pg_nx;
if (pbits != obits) {
if (!atomic_cmpset_long(pte, obits, pbits))