Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the locking against oneself, migrate LWPs only from runqueue.

Browse Source 
Part of the fix for PR/38882.
This commit is contained in:
rmind 2008-07-14 01:27:15 +00:00
parent 4f91cff093
commit 7c330ba82f
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/kern/kern_cpu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_cpu.c,v 1.33 2008/06/22 13:59:06 ad Exp $ */ /* $NetBSD: kern_cpu.c,v 1.34 2008/07/14 01:27:15 rmind Exp $ */
/*- /*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@ -57,7 +57,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.33 2008/06/22 13:59:06 ad Exp $"); __KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.34 2008/07/14 01:27:15 rmind Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -275,19 +275,24 @@ cpu_xc_offline(struct cpu_info *ci)
mutex_enter(proc_lock); mutex_enter(proc_lock);
spc_dlock(ci, mci); spc_dlock(ci, mci);
LIST_FOREACH(l, &alllwp, l_list) { LIST_FOREACH(l, &alllwp, l_list) {
lwp_lock(l); /*
if (l->l_cpu != ci || (l->l_pflag & LP_BOUND) != 0) { * Since runqueues are locked - LWPs cannot be enqueued (and
lwp_unlock(l); * cannot change the state), thus is safe to perform the
* checks without locking each LWP.
*/
if (l->l_cpu != ci || (l->l_pflag & LP_BOUND) != 0 ||
l->l_stat != LSRUN)
continue; continue;
} /* At this point, we are sure about the state of LWP */
if (l->l_stat == LSRUN && (l->l_flag & LW_INMEM) != 0) { KASSERT(lwp_locked(l, spc->spc_mutex));
if ((l->l_flag & LW_INMEM) != 0) {
sched_dequeue(l); sched_dequeue(l);
l->l_cpu = mci; l->l_cpu = mci;
lwp_setlock(l, mspc->spc_mutex); lwp_setlock(l, mspc->spc_mutex);
sched_enqueue(l, false); sched_enqueue(l, false);
lwp_unlock(l);
} else { } else {
lwp_migrate(l, mci); l->l_cpu = mci;
lwp_setlock(l, mspc->spc_mutex);
} }
} }
spc_dunlock(ci, mci); spc_dunlock(ci, mci);