qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 23:34:45 -07:00
Code Releases Activity

runtime: fix scheduler race condition

Browse Source 
In starttheworld() we assume that P's with local work
are situated in the beginning of idle P list.
However, once we start the first M, it can execute all local G's
and steal G's from other P's.
That breaks the assumption above. Thus starttheworld() will fail
to start some P's with local work.
It seems that it can not lead to very bad things, but still
it's wrong and breaks other assumtions
(e.g. we can have a spinning M with local work).
The fix is to collect all P's with local work first,
and only then start them.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/10051045
This commit is contained in:
Dmitriy Vyukov 2013-06-12 18:46:35 +04:00
parent e5cbebc1ad
commit dbcfed93e7
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/pkg/runtime/proc.c
View File

@ -420,16 +420,9 @@ runtime·starttheworld(void)
pidleput(p); pidleput(p);
break; break;
} }
mp = mget(); p->m = mget();
if(mp == nil) {
p->link = p1; p->link = p1;
p1 = p; p1 = p;
continue;
}
if(mp->nextp)
runtime·throw("starttheworld: inconsistent mp->nextp");
mp->nextp = p;
runtime·notewakeup(&mp->park);
} }
if(runtime·sched.sysmonwait) { if(runtime·sched.sysmonwait) {
runtime·sched.sysmonwait = false; runtime·sched.sysmonwait = false;
@ -440,8 +433,18 @@ runtime·starttheworld(void)
while(p1) { while(p1) {
p = p1; p = p1;
p1 = p1->link; p1 = p1->link;
add = false; if(p->m) {
mp = p->m;
p->m = nil;
if(mp->nextp)
runtime·throw("starttheworld: inconsistent mp->nextp");
mp->nextp = p;
runtime·notewakeup(&mp->park);
} else {
// Start M to run P. Do not start another M below.
newm(nil, p); newm(nil, p);
add = false;
}
} }
if(add) { if(add) {
@ -1154,6 +1157,8 @@ top:
} }
gp = runqget(m->p); gp = runqget(m->p);
if(gp && m->spinning)
runtime·throw("schedule: spinning with local work");
if(gp == nil) if(gp == nil)
gp = findrunnable(); gp = findrunnable();