Author: nwhitehorn
Date: Thu Jan 13 04:37:48 2011
New Revision: 217341
URL: http://svn.freebsd.org/changeset/base/217341
Log:
Fix handling of NX pages on capable CPUs. Thanks to kib for prodding me
in the right direction.
Modified:
head/sys/powerpc/aim/mmu_oea64.c
head/sys/powerpc/aim/trap.c
head/sys/powerpc/include/spr.h
Modified: head/sys/powerpc/aim/mmu_oea64.c
==============================================================================
--- head/sys/powerpc/aim/mmu_oea64.c Thu Jan 13 02:26:22 2011
(r217340)
+++ head/sys/powerpc/aim/mmu_oea64.c Thu Jan 13 04:37:48 2011
(r217341)
@@ -650,8 +650,7 @@ moea64_setup_direct_map(mmu_t mmup, vm_o
moea64_pvo_enter(mmup, kernel_pmap, moea64_upvo_zone,
&moea64_pvo_kunmanaged, pa, pa,
- pte_lo, PVO_WIRED | PVO_LARGE |
- VM_PROT_EXECUTE);
+ pte_lo, PVO_WIRED | PVO_LARGE);
}
}
PMAP_UNLOCK(kernel_pmap);
@@ -1266,8 +1265,8 @@ moea64_enter_locked(mmu_t mmu, pmap_t pm
} else
pte_lo |= LPTE_BR;
- if (prot & VM_PROT_EXECUTE)
- pvo_flags |= VM_PROT_EXECUTE;
+ if ((prot & VM_PROT_EXECUTE) == 0)
+ pte_lo |= LPTE_NOEXEC;
if (wired)
pvo_flags |= PVO_WIRED;
@@ -1692,8 +1691,7 @@ moea64_kenter_attr(mmu_t mmu, vm_offset_
PMAP_LOCK(kernel_pmap);
error = moea64_pvo_enter(mmu, kernel_pmap, moea64_upvo_zone,
- &moea64_pvo_kunmanaged, va, pa, pte_lo,
- PVO_WIRED | VM_PROT_EXECUTE);
+ &moea64_pvo_kunmanaged, va, pa, pte_lo, PVO_WIRED);
if (error != 0 && error != ENOENT)
panic("moea64_kenter: failed to enter va %#zx pa %#zx: %d", va,
@@ -2191,8 +2189,8 @@ moea64_pvo_enter(mmu_t mmu, pmap_t pm, u
LIST_FOREACH(pvo, &moea64_pvo_table[ptegidx], pvo_olink) {
if (pvo->pvo_pmap == pm && PVO_VADDR(pvo) == va) {
if ((pvo->pvo_pte.lpte.pte_lo & LPTE_RPGN) == pa &&
- (pvo->pvo_pte.lpte.pte_lo & LPTE_PP) ==
- (pte_lo & LPTE_PP)) {
+ (pvo->pvo_pte.lpte.pte_lo & (LPTE_NOEXEC | LPTE_PP))
+ == (pte_lo & (LPTE_NOEXEC | LPTE_PP))) {
if (!(pvo->pvo_pte.lpte.pte_hi & LPTE_VALID)) {
/* Re-insert if spilled */
i = MOEA64_PTE_INSERT(mmu, ptegidx,
@@ -2246,8 +2244,6 @@ moea64_pvo_enter(mmu_t mmu, pmap_t pm, u
LIST_INSERT_HEAD(&moea64_pvo_table[ptegidx], pvo, pvo_olink);
pvo->pvo_vaddr &= ~ADDR_POFF;
- if (!(flags & VM_PROT_EXECUTE))
- pte_lo |= LPTE_NOEXEC;
if (flags & PVO_WIRED)
pvo->pvo_vaddr |= PVO_WIRED;
if (pvo_head != &moea64_pvo_kunmanaged)
Modified: head/sys/powerpc/aim/trap.c
==============================================================================
--- head/sys/powerpc/aim/trap.c Thu Jan 13 02:26:22 2011 (r217340)
+++ head/sys/powerpc/aim/trap.c Thu Jan 13 04:37:48 2011 (r217341)
@@ -523,7 +523,9 @@ trap_pfault(struct trapframe *frame, int
p = td->td_proc;
if (frame->exc == EXC_ISI) {
eva = frame->srr0;
- ftype = VM_PROT_READ | VM_PROT_EXECUTE;
+ ftype = VM_PROT_EXECUTE;
+ if (frame->srr1 & SRR1_ISI_PFAULT)
+ ftype |= VM_PROT_READ;
} else {
eva = frame->cpu.aim.dar;
if (frame->cpu.aim.dsisr & DSISR_STORE)
Modified: head/sys/powerpc/include/spr.h
==============================================================================
--- head/sys/powerpc/include/spr.h Thu Jan 13 02:26:22 2011
(r217340)
+++ head/sys/powerpc/include/spr.h Thu Jan 13 04:37:48 2011
(r217341)
@@ -111,6 +111,9 @@
#define SPR_SDR1 0x019 /* .68 Page table base address
register */
#define SPR_SRR0 0x01a /* 468 Save/Restore Register 0
*/
#define SPR_SRR1 0x01b /* 468 Save/Restore Register 1
*/
+#define SRR1_ISI_PFAULT 0x40000000 /* ISI page not found */
+#define SRR1_ISI_NOEXECUTE 0x10000000 /* Memory marked no-execute
*/
+#define SRR1_ISI_PP 0x08000000 /* PP bits forbid access */
#define SPR_DECAR 0x036 /* ..8 Decrementer auto reload
*/
#define SPR_EIE 0x050 /* ..8 Exception Interrupt ???
*/
#define SPR_EID 0x051 /* ..8 Exception Interrupt ???
*/
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
