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

Don't dink with interrupts in vm_page_zero_idle(). This code assumed it

Browse Source 
was being called with interrupts disabled, when it was actually being called
with them enabled.

Pointed out by:	tegge
This commit is contained in:
jhb 2000-10-23 23:32:36 +00:00
parent 11e8e4bacd
commit dd3e4087e8
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/amd64/amd64/vm_machdep.c
View File

@ -542,7 +542,7 @@ vm_page_zero_idle()
static int free_rover;
static int zero_state;
vm_page_t m;
int s, intrsave;
int s;
/*
* Attempt to maintain approximately 1/2 of our free pages in a
@ -560,8 +560,6 @@ vm_page_zero_idle()
if (mtx_try_enter(&Giant, MTX_DEF)) {
s = splvm();
intrsave = save_intr();
enable_intr();
zero_state = 0;
m = vm_page_list_find(PQ_FREE, free_rover, FALSE);
if (m != NULL && (m->flags & PG_ZERO) == 0) {
@ -583,16 +581,9 @@ vm_page_zero_idle()
}
free_rover = (free_rover + PQ_PRIME2) & PQ_L2_MASK;
splx(s);
restore_intr(intrsave);
mtx_exit(&Giant, MTX_DEF);
return (1);
}
/*
* We have to enable interrupts for a moment if the try_mplock fails
* in order to potentially take an IPI. XXX this should be in
* swtch.s
*/
__asm __volatile("sti; nop; cli" : : : "memory");
return (0);
}

11
sys/i386/i386/vm_machdep.c
View File

@ -542,7 +542,7 @@ vm_page_zero_idle()
static int free_rover;
static int zero_state;
vm_page_t m;
int s, intrsave;
int s;
/*
* Attempt to maintain approximately 1/2 of our free pages in a
@ -560,8 +560,6 @@ vm_page_zero_idle()
if (mtx_try_enter(&Giant, MTX_DEF)) {
s = splvm();
intrsave = save_intr();
enable_intr();
zero_state = 0;
m = vm_page_list_find(PQ_FREE, free_rover, FALSE);
if (m != NULL && (m->flags & PG_ZERO) == 0) {
@ -583,16 +581,9 @@ vm_page_zero_idle()
}
free_rover = (free_rover + PQ_PRIME2) & PQ_L2_MASK;
splx(s);
restore_intr(intrsave);
mtx_exit(&Giant, MTX_DEF);
return (1);
}
/*
* We have to enable interrupts for a moment if the try_mplock fails
* in order to potentially take an IPI. XXX this should be in
* swtch.s
*/
__asm __volatile("sti; nop; cli" : : : "memory");
return (0);
}