diff options
author | ups <ups@FreeBSD.org> | 2006-06-15 01:01:06 +0000 |
---|---|---|
committer | ups <ups@FreeBSD.org> | 2006-06-15 01:01:06 +0000 |
commit | b3a7439a45bf95ef2c21dfad6ba1a051467efad1 (patch) | |
tree | ef8795aacb2aaea54cc725dafc9bd2ea5f8fdba3 /sys/powerpc | |
parent | 63bddd18cc9d5d6e46d95bda0c636f912901812d (diff) | |
download | FreeBSD-src-b3a7439a45bf95ef2c21dfad6ba1a051467efad1.zip FreeBSD-src-b3a7439a45bf95ef2c21dfad6ba1a051467efad1.tar.gz |
Remove mpte optimization from pmap_enter_quick().
There is a race with the current locking scheme and removing
it should have no measurable performance impact.
This fixes page faults leading to panics in pmap_enter_quick_locked()
on amd64/i386.
Reviewed by: alc,jhb,peter,ps
Diffstat (limited to 'sys/powerpc')
-rw-r--r-- | sys/powerpc/aim/mmu_oea.c | 9 | ||||
-rw-r--r-- | sys/powerpc/powerpc/mmu_if.m | 6 | ||||
-rw-r--r-- | sys/powerpc/powerpc/mmu_oea.c | 9 | ||||
-rw-r--r-- | sys/powerpc/powerpc/pmap_dispatch.c | 7 |
4 files changed, 12 insertions, 19 deletions
diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c index 23e8c4f..6a9af00 100644 --- a/sys/powerpc/aim/mmu_oea.c +++ b/sys/powerpc/aim/mmu_oea.c @@ -313,8 +313,7 @@ void moea_copy_page(mmu_t, vm_page_t, vm_page_t); void moea_enter(mmu_t, pmap_t, vm_offset_t, vm_page_t, vm_prot_t, boolean_t); void moea_enter_object(mmu_t, pmap_t, vm_offset_t, vm_offset_t, vm_page_t, vm_prot_t); -vm_page_t moea_enter_quick(mmu_t, pmap_t, vm_offset_t, vm_page_t, vm_prot_t, - vm_page_t); +void moea_enter_quick(mmu_t, pmap_t, vm_offset_t, vm_page_t, vm_prot_t); vm_paddr_t moea_extract(mmu_t, pmap_t, vm_offset_t); vm_page_t moea_extract_and_hold(mmu_t, pmap_t, vm_offset_t, vm_prot_t); void moea_init(mmu_t); @@ -1174,16 +1173,16 @@ moea_enter_object(mmu_t mmu, pmap_t pm, vm_offset_t start, vm_offset_t end, PMAP_UNLOCK(pm); } -vm_page_t +void moea_enter_quick(mmu_t mmu, pmap_t pm, vm_offset_t va, vm_page_t m, - vm_prot_t prot, vm_page_t mpte) + vm_prot_t prot) { PMAP_LOCK(pm); moea_enter_locked(pm, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE), FALSE); PMAP_UNLOCK(pm); - return (NULL); + } vm_paddr_t diff --git a/sys/powerpc/powerpc/mmu_if.m b/sys/powerpc/powerpc/mmu_if.m index cd9a1d5..5fd0510 100644 --- a/sys/powerpc/powerpc/mmu_if.m +++ b/sys/powerpc/powerpc/mmu_if.m @@ -227,17 +227,13 @@ METHOD void enter_object { * @param _va mapping virtual address * @param _pg mapping physical page * @param _prot new page protection - used to see if page is exec. - * @param _mpte ??? - * - * @retval NULL (possibly a hint for future calls ?) */ -METHOD vm_page_t enter_quick { +METHOD void enter_quick { mmu_t _mmu; pmap_t _pmap; vm_offset_t _va; vm_page_t _pg; vm_prot_t _prot; - vm_page_t _mpte; }; diff --git a/sys/powerpc/powerpc/mmu_oea.c b/sys/powerpc/powerpc/mmu_oea.c index 23e8c4f..6a9af00 100644 --- a/sys/powerpc/powerpc/mmu_oea.c +++ b/sys/powerpc/powerpc/mmu_oea.c @@ -313,8 +313,7 @@ void moea_copy_page(mmu_t, vm_page_t, vm_page_t); void moea_enter(mmu_t, pmap_t, vm_offset_t, vm_page_t, vm_prot_t, boolean_t); void moea_enter_object(mmu_t, pmap_t, vm_offset_t, vm_offset_t, vm_page_t, vm_prot_t); -vm_page_t moea_enter_quick(mmu_t, pmap_t, vm_offset_t, vm_page_t, vm_prot_t, - vm_page_t); +void moea_enter_quick(mmu_t, pmap_t, vm_offset_t, vm_page_t, vm_prot_t); vm_paddr_t moea_extract(mmu_t, pmap_t, vm_offset_t); vm_page_t moea_extract_and_hold(mmu_t, pmap_t, vm_offset_t, vm_prot_t); void moea_init(mmu_t); @@ -1174,16 +1173,16 @@ moea_enter_object(mmu_t mmu, pmap_t pm, vm_offset_t start, vm_offset_t end, PMAP_UNLOCK(pm); } -vm_page_t +void moea_enter_quick(mmu_t mmu, pmap_t pm, vm_offset_t va, vm_page_t m, - vm_prot_t prot, vm_page_t mpte) + vm_prot_t prot) { PMAP_LOCK(pm); moea_enter_locked(pm, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE), FALSE); PMAP_UNLOCK(pm); - return (NULL); + } vm_paddr_t diff --git a/sys/powerpc/powerpc/pmap_dispatch.c b/sys/powerpc/powerpc/pmap_dispatch.c index d454af6..77f8368 100644 --- a/sys/powerpc/powerpc/pmap_dispatch.c +++ b/sys/powerpc/powerpc/pmap_dispatch.c @@ -122,11 +122,10 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end, MMU_ENTER_OBJECT(mmu_obj, pmap, start, end, m_start, prot); } -vm_page_t -pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, - vm_page_t mpte) +void +pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) { - return (MMU_ENTER_QUICK(mmu_obj, pmap, va, m, prot, mpte)); + MMU_ENTER_QUICK(mmu_obj, pmap, va, m, prot); } vm_paddr_t |