d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The SMP cleanup commit broke need_resched, this fixes that and also

Browse Source 
removed unncessary MPLOCKED and 'lock' prefixes from the interrupt
    nesting level, since (A) the MP lock is held at the time, and (B) since
    the neting level is restored prior to return any interrupted code
    will see a consistent value.
This commit is contained in:
Matthew Dillon 2000-03-29 06:15:43 +00:00
parent 863bdc0cff
commit bd5caafc4d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=58764
11 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/amd64/amd64/apic_vector.S
View File

@ -455,8 +455,7 @@ _Xcpuast:
movl _cpl, %eax
pushl %eax
movl $1, _astpending /* XXX */
lock
orl $AST_PENDING, _astpending /* XXX */
incb _intr_nesting_level
sti
@ -468,7 +467,7 @@ _Xcpuast:
lock
btrl %eax, CNAME(resched_cpus)
jnc 2f
orl $AST_RESCHED,_astpending
orl $AST_PENDING+AST_RESCHED,_astpending
lock
incl CNAME(want_resched_cnt)
2:
@ -512,7 +511,6 @@ _Xforward_irq:
movl _cpl, %eax
pushl %eax
lock
incb _intr_nesting_level
sti

2
sys/amd64/amd64/cpu_switch.S
View File

@ -363,7 +363,7 @@ sw1a:
movl %eax,%ecx
xorl %eax,%eax
andl $~WANT_RESCHED,_astpending
andl $~AST_RESCHED,_astpending
#ifdef DIAGNOSTIC
cmpl %eax,P_WCHAN(%ecx)

2
sys/amd64/amd64/exception.S
View File

@ -238,7 +238,7 @@ calltrap:
*/
pushl %ebx /* cpl to restore */
subl $4,%esp /* dummy unit to finish intr frame */
MPLOCKED incb _intr_nesting_level
incb _intr_nesting_level
MEXITCOUNT
jmp _doreti

2
sys/amd64/amd64/exception.s
View File

@ -238,7 +238,7 @@ calltrap:
*/
pushl %ebx /* cpl to restore */
subl $4,%esp /* dummy unit to finish intr frame */
MPLOCKED incb _intr_nesting_level
incb _intr_nesting_level
MEXITCOUNT
jmp _doreti

2
sys/amd64/amd64/swtch.s
View File

@ -363,7 +363,7 @@ sw1a:
movl %eax,%ecx
xorl %eax,%eax
andl $~WANT_RESCHED,_astpending
andl $~AST_RESCHED,_astpending
#ifdef DIAGNOSTIC
cmpl %eax,P_WCHAN(%ecx)

6
sys/i386/i386/apic_vector.s
View File

@ -455,8 +455,7 @@ _Xcpuast:
movl _cpl, %eax
pushl %eax
movl $1, _astpending /* XXX */
lock
orl $AST_PENDING, _astpending /* XXX */
incb _intr_nesting_level
sti
@ -468,7 +467,7 @@ _Xcpuast:
lock
btrl %eax, CNAME(resched_cpus)
jnc 2f
orl $AST_RESCHED,_astpending
orl $AST_PENDING+AST_RESCHED,_astpending
lock
incl CNAME(want_resched_cnt)
2:
@ -512,7 +511,6 @@ _Xforward_irq:
movl _cpl, %eax
pushl %eax
lock
incb _intr_nesting_level
sti

2
sys/i386/i386/exception.s
View File

@ -238,7 +238,7 @@ calltrap:
*/
pushl %ebx /* cpl to restore */
subl $4,%esp /* dummy unit to finish intr frame */
MPLOCKED incb _intr_nesting_level
incb _intr_nesting_level
MEXITCOUNT
jmp _doreti

2
sys/i386/i386/swtch.s
View File

@ -363,7 +363,7 @@ sw1a:
movl %eax,%ecx
xorl %eax,%eax
andl $~WANT_RESCHED,_astpending
andl $~AST_RESCHED,_astpending
#ifdef DIAGNOSTIC
cmpl %eax,P_WCHAN(%ecx)

2
sys/i386/i386/vm86bios.s
View File

@ -141,7 +141,7 @@ ENTRY(vm86_bioscall)
pushl _cpl /* cpl to restore */
#endif
subl $4,%esp /* dummy unit */
MPLOCKED incb _intr_nesting_level
incb _intr_nesting_level
MEXITCOUNT
jmp _doreti

6
sys/i386/isa/apic_vector.s
View File

@ -455,8 +455,7 @@ _Xcpuast:
movl _cpl, %eax
pushl %eax
movl $1, _astpending /* XXX */
lock
orl $AST_PENDING, _astpending /* XXX */
incb _intr_nesting_level
sti
@ -468,7 +467,7 @@ _Xcpuast:
lock
btrl %eax, CNAME(resched_cpus)
jnc 2f
orl $AST_RESCHED,_astpending
orl $AST_PENDING+AST_RESCHED,_astpending
lock
incl CNAME(want_resched_cnt)
2:
@ -512,7 +511,6 @@ _Xforward_irq:
movl _cpl, %eax
pushl %eax
lock
incb _intr_nesting_level
sti

6
sys/i386/isa/ipl.s
View File

@ -123,10 +123,10 @@ doreti_next2:
andl _ipending,%ecx /* set bit = unmasked pending INT */
jne doreti_unpend
movl %eax,_cpl
MPLOCKED decb _intr_nesting_level
decb _intr_nesting_level
/* Check for ASTs that can be handled now. */
cmpb $0,_astpending
cmpl $0,_astpending
je doreti_exit
testb $SEL_RPL_MASK,TF_CS(%esp)
jne doreti_ast
@ -271,7 +271,7 @@ doreti_swi:
ALIGN_TEXT
doreti_ast:
movl $0,_astpending
andl $~AST_PENDING,_astpending
sti
movl $T_ASTFLT,TF_TRAPNO(%esp)
call _trap