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

Actually harvest interrupt threads when the last handler is removed from a

Browse Source 
thread.
This commit is contained in:
John Baldwin 2000-10-20 07:46:12 +00:00
parent 13b0500f02
commit d1182da2cf
6 changed files with 102 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/amd64/isa/intr_machdep.c
View File

@ -49,14 +49,15 @@
#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/syslog.h>
#include <sys/ipl.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/unistd.h>
#include <sys/errno.h>
#include <sys/interrupt.h>
#include <machine/ipl.h>
#include <machine/md_var.h>
#include <machine/segments.h>
#include <sys/bus.h>
@ -690,8 +691,23 @@ inthand_remove(struct intrec *idesc)
ih->next = ih->next->next;
}
if (ithd->it_ih == NULL) /* no handlers left, */
if (ithd->it_ih == NULL) { /* no handlers left, */
icu_unset(ithd->irq, idesc->handler);
ithds[ithd->irq] = NULL;
mtx_enter(&sched_lock, MTX_SPIN);
if (ithd->it_proc->p_stat == SWAIT) {
ithd->it_proc->p_stat = SRUN;
setrunqueue(ithd->it_proc);
/*
* We don't do an ast here because we really
* don't care when it runs next.
*
* XXX: should we lower the threads priority?
*/
}
mtx_exit(&sched_lock, MTX_SPIN);
}
free(idesc, M_DEVBUF);
return (0);
}

17
sys/amd64/isa/ithread.c
View File

@ -44,14 +44,15 @@
#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/syslog.h>
#include <sys/ipl.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/unistd.h>
#include <sys/errno.h>
#include <sys/interrupt.h>
#include <machine/ipl.h>
#include <machine/md_var.h>
#include <machine/segments.h>
@ -84,7 +85,6 @@
#endif
#include <sys/vmmeter.h>
#include <machine/mutex.h>
#include <sys/ktr.h>
#include <machine/cpu.h>
@ -174,6 +174,19 @@ ithd_loop(void *dummy)
* list of handlers, giving each one a go at it.
*/
for (;;) {
/*
* If we don't have any handlers, then we are an orphaned
* thread and just need to die.
*/
if (me->it_ih == NULL) {
CTR2(KTR_INTR, "ithd_loop pid %d(%s) exiting",
me->it_proc->p_pid, me->it_proc->p_comm);
curproc->p_ithd = NULL;
free(me, M_DEVBUF);
mtx_enter(&Giant, MTX_DEF);
kthread_exit(0);
}
CTR3(KTR_INTR, "ithd_loop pid %d(%s) need=%d",
me->it_proc->p_pid, me->it_proc->p_comm, me->it_need);
while (me->it_need) {

20
sys/amd64/isa/nmi.c
View File

@ -49,14 +49,15 @@
#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/syslog.h>
#include <sys/ipl.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/unistd.h>
#include <sys/errno.h>
#include <sys/interrupt.h>
#include <machine/ipl.h>
#include <machine/md_var.h>
#include <machine/segments.h>
#include <sys/bus.h>
@ -690,8 +691,23 @@ inthand_remove(struct intrec *idesc)
ih->next = ih->next->next;
}
if (ithd->it_ih == NULL) /* no handlers left, */
if (ithd->it_ih == NULL) { /* no handlers left, */
icu_unset(ithd->irq, idesc->handler);
ithds[ithd->irq] = NULL;
mtx_enter(&sched_lock, MTX_SPIN);
if (ithd->it_proc->p_stat == SWAIT) {
ithd->it_proc->p_stat = SRUN;
setrunqueue(ithd->it_proc);
/*
* We don't do an ast here because we really
* don't care when it runs next.
*
* XXX: should we lower the threads priority?
*/
}
mtx_exit(&sched_lock, MTX_SPIN);
}
free(idesc, M_DEVBUF);
return (0);
}

20
sys/i386/isa/intr_machdep.c
View File

@ -49,14 +49,15 @@
#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/syslog.h>
#include <sys/ipl.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/unistd.h>
#include <sys/errno.h>
#include <sys/interrupt.h>
#include <machine/ipl.h>
#include <machine/md_var.h>
#include <machine/segments.h>
#include <sys/bus.h>
@ -690,8 +691,23 @@ inthand_remove(struct intrec *idesc)
ih->next = ih->next->next;
}
if (ithd->it_ih == NULL) /* no handlers left, */
if (ithd->it_ih == NULL) { /* no handlers left, */
icu_unset(ithd->irq, idesc->handler);
ithds[ithd->irq] = NULL;
mtx_enter(&sched_lock, MTX_SPIN);
if (ithd->it_proc->p_stat == SWAIT) {
ithd->it_proc->p_stat = SRUN;
setrunqueue(ithd->it_proc);
/*
* We don't do an ast here because we really
* don't care when it runs next.
*
* XXX: should we lower the threads priority?
*/
}
mtx_exit(&sched_lock, MTX_SPIN);
}
free(idesc, M_DEVBUF);
return (0);
}

17
sys/i386/isa/ithread.c
View File

@ -44,14 +44,15 @@
#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/syslog.h>
#include <sys/ipl.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/unistd.h>
#include <sys/errno.h>
#include <sys/interrupt.h>
#include <machine/ipl.h>
#include <machine/md_var.h>
#include <machine/segments.h>
@ -84,7 +85,6 @@
#endif
#include <sys/vmmeter.h>
#include <machine/mutex.h>
#include <sys/ktr.h>
#include <machine/cpu.h>
@ -174,6 +174,19 @@ ithd_loop(void *dummy)
* list of handlers, giving each one a go at it.
*/
for (;;) {
/*
* If we don't have any handlers, then we are an orphaned
* thread and just need to die.
*/
if (me->it_ih == NULL) {
CTR2(KTR_INTR, "ithd_loop pid %d(%s) exiting",
me->it_proc->p_pid, me->it_proc->p_comm);
curproc->p_ithd = NULL;
free(me, M_DEVBUF);
mtx_enter(&Giant, MTX_DEF);
kthread_exit(0);
}
CTR3(KTR_INTR, "ithd_loop pid %d(%s) need=%d",
me->it_proc->p_pid, me->it_proc->p_comm, me->it_need);
while (me->it_need) {

20
sys/i386/isa/nmi.c
View File

@ -49,14 +49,15 @@
#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/syslog.h>
#include <sys/ipl.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/unistd.h>
#include <sys/errno.h>
#include <sys/interrupt.h>
#include <machine/ipl.h>
#include <machine/md_var.h>
#include <machine/segments.h>
#include <sys/bus.h>
@ -690,8 +691,23 @@ inthand_remove(struct intrec *idesc)
ih->next = ih->next->next;
}
if (ithd->it_ih == NULL) /* no handlers left, */
if (ithd->it_ih == NULL) { /* no handlers left, */
icu_unset(ithd->irq, idesc->handler);
ithds[ithd->irq] = NULL;
mtx_enter(&sched_lock, MTX_SPIN);
if (ithd->it_proc->p_stat == SWAIT) {
ithd->it_proc->p_stat = SRUN;
setrunqueue(ithd->it_proc);
/*
* We don't do an ast here because we really
* don't care when it runs next.
*
* XXX: should we lower the threads priority?
*/
}
mtx_exit(&sched_lock, MTX_SPIN);
}
free(idesc, M_DEVBUF);
return (0);
}