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

If a process needs to be swapped in, wakeup the swapper from within

Browse Source 
critical_exit as the process is getting scheduled to run.  This is subotimal
but for now avoid the LOR between the scheduler and the sleepq systems.
This is a 5.3 candidate.

Submitted by: davidxu
MFC After: 3 days
This commit is contained in:
Scott Long 2004-10-16 06:38:22 +00:00
parent a9bdcd3711
commit b96741f410
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/kern/kern_switch.c
View File

@ -584,6 +584,10 @@ critical_exit(void)
KASSERT(td->td_critnest != 0,
("critical_exit: td_critnest == 0"));
if (td->td_critnest == 1) {
if (td->td_pflags & TDP_WAKEPROC0) {
td->td_pflags &= ~TDP_WAKEPROC0;
wakeup(&proc0);
}
#ifdef PREEMPTION
mtx_assert(&sched_lock, MA_NOTOWNED);
if (td->td_pflags & TDP_OWEPREEMPT) {

10
sys/kern/kern_synch.c
View File

@ -391,13 +391,13 @@ setrunnable(struct thread *td)
if ((p->p_sflag & PS_INMEM) == 0) {
if ((p->p_sflag & PS_SWAPPINGIN) == 0) {
p->p_sflag |= PS_SWAPINREQ;
#ifndef SMP
/*
* XXX: Disabled on SMP due to a LOR between
* sched_lock and the sleepqueue chain locks.
* due to a LOR between sched_lock and
* the sleepqueue chain locks, delay
* wakeup proc0 until thread leaves
* critical region.
*/
wakeup(&proc0);
#endif
curthread->td_pflags |= TDP_WAKEPROC0;
}
} else
sched_wakeup(td);

2
sys/sys/proc.h
View File

@ -369,7 +369,7 @@ struct thread {
#define TDP_SA 0x00000080 /* A scheduler activation based thread. */
#define TDP_OWEPREEMPT 0x00000100 /* Thread has a pending preemption. */
#define TDP_OWEUPC 0x00000200 /* Call addupc() at next AST. */
#define TDP_UNUSED10 0x00000400 /* -- available-- */
#define TDP_WAKEPROC0 0x00000400 /* Wants caller to wakeup(&proc0) */
#define TDP_CAN_UNBIND 0x00000800 /* Only temporarily bound. */
#define TDP_SCHED1 0x00001000 /* Reserved for scheduler private use */
#define TDP_SCHED2 0x00002000 /* Reserved for scheduler private use */