diff options
author | alc <alc@FreeBSD.org> | 1999-04-25 18:40:05 +0000 |
---|---|---|
committer | alc <alc@FreeBSD.org> | 1999-04-25 18:40:05 +0000 |
commit | 4be4456eab17cc243bba5d62ce59ba675507482b (patch) | |
tree | f1a857fd54e7513a222c3ac80159109633258559 /sys/amd64 | |
parent | 3d195cb3978503570288063104cffe7cba6dca4c (diff) | |
download | FreeBSD-src-4be4456eab17cc243bba5d62ce59ba675507482b.zip FreeBSD-src-4be4456eab17cc243bba5d62ce59ba675507482b.tar.gz |
pmap_dispose_proc and pmap_copy_page:
Conditionally compile 386-specific code.
pmap_enter:
Eliminate unnecessary TLB shootdowns.
pmap_zero_page and pmap_zero_page_area:
Use invltlb_1pg instead of duplicating the code.
Diffstat (limited to 'sys/amd64')
-rw-r--r-- | sys/amd64/amd64/pmap.c | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index f4768a9..bca25cc 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.231 1999/04/19 18:45:21 alc Exp $ + * $Id: pmap.c,v 1.232 1999/04/23 20:29:58 dt Exp $ */ /* @@ -970,9 +970,10 @@ pmap_dispose_proc(p) vm_page_unwire(m, 0); vm_page_free(m); } - +#if defined(I386_CPU) if (cpu_class <= CPUCLASS_386) invltlb(); +#endif } /* @@ -2126,7 +2127,13 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_offset_t pa, vm_prot_t prot, if ((prot & VM_PROT_WRITE) && (origpte & PG_V)) { if ((origpte & PG_RW) == 0) { *pte |= PG_RW; +#ifdef SMP + cpu_invlpg((void *)va); + if (pmap->pm_active & other_cpus) + smp_invltlb(); +#else invltlb_1pg(va); +#endif } return; } @@ -2194,8 +2201,15 @@ validate: */ if ((origpte & ~(PG_M|PG_A)) != newpte) { *pte = newpte | PG_A; - if (origpte) + if (origpte) { +#ifdef SMP + cpu_invlpg((void *)va); + if (pmap->pm_active & other_cpus) + smp_invltlb(); +#else invltlb_1pg(va); +#endif + } } } @@ -2742,11 +2756,7 @@ pmap_zero_page(phys) #endif *(int *) CMAP2 = PG_V | PG_RW | (phys & PG_FRAME) | PG_A | PG_M; - if (cpu_class == CPUCLASS_386) { - invltlb(); - } else { - invlpg((u_int)CADDR2); - } + invltlb_1pg((vm_offset_t)CADDR2); #if defined(I686_CPU) if (cpu_class == CPUCLASS_686) @@ -2794,11 +2804,7 @@ pmap_zero_page_area(phys, off, size) #endif *(int *) CMAP2 = PG_V | PG_RW | (phys & PG_FRAME) | PG_A | PG_M; - if (cpu_class == CPUCLASS_386) { - invltlb(); - } else { - invlpg((u_int)CADDR2); - } + invltlb_1pg((vm_offset_t)CADDR2); #if defined(I686_CPU) if (cpu_class == CPUCLASS_686 && off == 0 && size == PAGE_SIZE) @@ -2847,9 +2853,12 @@ pmap_copy_page(src, dst) *(int *) CMAP1 = PG_V | (src & PG_FRAME) | PG_A; *(int *) CMAP2 = PG_V | PG_RW | (dst & PG_FRAME) | PG_A | PG_M; +#if defined(I386_CPU) if (cpu_class == CPUCLASS_386) { invltlb(); - } else { + } else +#endif + { invlpg((u_int)CADDR1); invlpg((u_int)CADDR2); } |