diff options
| author | peter <peter@FreeBSD.org> | 2002-02-27 09:51:33 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2002-02-27 09:51:33 +0000 |
| commit | f2dee2e96fb9d27ab90c25bed77ca68fe1dbcaf9 (patch) | |
| tree | 9dff19aa68b1b5fb938a1f6533c4971702c3e104 /sys/i386/isa/apic_vector.s | |
| parent | fddda3307dd74c84941a41b9226b67ad3a2f1a99 (diff) | |
| download | FreeBSD-src-f2dee2e96fb9d27ab90c25bed77ca68fe1dbcaf9.zip FreeBSD-src-f2dee2e96fb9d27ab90c25bed77ca68fe1dbcaf9.tar.gz | |
Back out all the pmap related stuff I've touched over the last few days.
There is some unresolved badness that has been eluding me, particularly
affecting uniprocessor kernels. Turning off PG_G helped (which is a bad
sign) but didn't solve it entirely. Userland programs still crashed.
Diffstat (limited to 'sys/i386/isa/apic_vector.s')
| -rw-r--r-- | sys/i386/isa/apic_vector.s | 94 |
1 files changed, 11 insertions, 83 deletions
diff --git a/sys/i386/isa/apic_vector.s b/sys/i386/isa/apic_vector.s index e3a37e1..95c9133 100644 --- a/sys/i386/isa/apic_vector.s +++ b/sys/i386/isa/apic_vector.s @@ -181,108 +181,30 @@ Xspuriousint: iret /* - * Global address space TLB shootdown. + * Handle TLB shootdowns. */ .text SUPERALIGN_TEXT .globl Xinvltlb Xinvltlb: pushl %eax - pushl %ds - movl $KDSEL, %eax /* Kernel data selector */ - mov %ax, %ds #ifdef COUNT_XINVLTLB_HITS pushl %fs - movl $KPSEL, %eax /* Private space selector */ + movl $KPSEL, %eax mov %ax, %fs movl PCPU(CPUID), %eax popl %fs - incl xhits_gbl(,%eax,4) + ss + incl _xhits(,%eax,4) #endif /* COUNT_XINVLTLB_HITS */ movl %cr3, %eax /* invalidate the TLB */ movl %eax, %cr3 + ss /* stack segment, avoid %ds load */ movl $0, lapic+LA_EOI /* End Of Interrupt to APIC */ - lock - incl smp_tlb_wait - - popl %ds - popl %eax - iret - -/* - * Single page TLB shootdown - */ - .text - SUPERALIGN_TEXT - .globl Xinvlpg -Xinvlpg: - pushl %eax - pushl %ds - movl $KDSEL, %eax /* Kernel data selector */ - mov %ax, %ds - -#ifdef COUNT_XINVLTLB_HITS - pushl %fs - movl $KPSEL, %eax /* Private space selector */ - mov %ax, %fs - movl PCPU(CPUID), %eax - popl %fs - ss - incl xhits_pg(,%eax,4) -#endif /* COUNT_XINVLTLB_HITS */ - - movl smp_tlb_addr1, %eax - invlpg (%eax) /* invalidate single page */ - - movl $0, lapic+LA_EOI /* End Of Interrupt to APIC */ - - lock - incl smp_tlb_wait - - popl %ds - popl %eax - iret - -/* - * Page range TLB shootdown. - */ - .text - SUPERALIGN_TEXT - .globl Xinvlrng -Xinvlrng: - pushl %eax - pushl %edx - pushl %ds - movl $KDSEL, %eax /* Kernel data selector */ - mov %ax, %ds - -#ifdef COUNT_XINVLTLB_HITS - pushl %fs - movl $KPSEL, %eax /* Private space selector */ - mov %ax, %fs - movl PCPU(CPUID), %eax - popl %fs - incl xhits_rng(,%eax,4) -#endif /* COUNT_XINVLTLB_HITS */ - - movl smp_tlb_addr1, %edx - movl smp_tlb_addr2, %eax -1: invlpg (%edx) /* invalidate single page */ - addl $PAGE_SIZE, %edx - cmpl %edx, %eax - jb 1b - - movl $0, lapic+LA_EOI /* End Of Interrupt to APIC */ - - lock - incl smp_tlb_wait - - popl %ds - popl %edx popl %eax iret @@ -521,6 +443,12 @@ Xrendezvous: .data +#ifdef COUNT_XINVLTLB_HITS + .globl _xhits +_xhits: + .space (NCPU * 4), 0 +#endif /* COUNT_XINVLTLB_HITS */ + .globl apic_pin_trigger apic_pin_trigger: .long 0 |
