diff options
| author | ru <ru@FreeBSD.org> | 2006-11-23 21:36:02 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2006-11-23 21:36:02 +0000 |
| commit | 02d4467a52b4fd3f779d3b517e1704fca560b414 (patch) | |
| tree | 0a6fbc9faa298981691c4cb7dd6b962c5edf08e0 /sys | |
| parent | e0689a2121f12b9dee3f1186a49a5d9733cfd4bf (diff) | |
| download | FreeBSD-src-02d4467a52b4fd3f779d3b517e1704fca560b414.zip FreeBSD-src-02d4467a52b4fd3f779d3b517e1704fca560b414.tar.gz | |
Finish the PG_NX support at the pmap level.
Reviewed by: alc
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/amd64/pmap.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 1e796f8..a23184d 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -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 @@ retry: } } - 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)) |
