diff options
author | rsc <rsc> | 2007-09-27 21:25:37 +0000 |
---|---|---|
committer | rsc <rsc> | 2007-09-27 21:25:37 +0000 |
commit | ab08960f6402f5c7cbb7b6e81694a60b6abed4c8 (patch) | |
tree | 156a197126bdfb99bb5081b7fe78ee3e8528aa5b /main.c | |
parent | f97f0d2b3d3afbad3ef154b047f1b0408fd7288b (diff) | |
download | xv6-labs-ab08960f6402f5c7cbb7b6e81694a60b6abed4c8.tar.gz xv6-labs-ab08960f6402f5c7cbb7b6e81694a60b6abed4c8.tar.bz2 xv6-labs-ab08960f6402f5c7cbb7b6e81694a60b6abed4c8.zip |
Final word on the locking fiasco?
Change pushcli / popcli so that they can never turn on
interrupts unexpectedly. That is, if interrupts are on,
then pushcli(); popcli(); turns them off and back on, but
if they are off to begin with, then pushcli(); popcli(); is
a no-op.
I think our fundamental mistake was having a primitive
(release and then popcli nee spllo) that could turn
interrupts on at unexpected moments instead of being
explicit about when we want to start allowing interrupts.
With the new semantics, all the manual fiddling of ncli
to force interrupts off in certain sections goes away.
In return, we must explicitly mark the places where
we want to enable interrupts unconditionally, by calling sti().
There is only one: inside the scheduler loop.
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 25 |
1 files changed, 8 insertions, 17 deletions
@@ -12,19 +12,13 @@ static void mpmain(void) __attribute__((noreturn)); int main(void) { - int bcpu, i; extern char edata[], end[]; // clear BSS memset(edata, 0, end - edata); - // pushcli() every processor during bootstrap. - for(i=0; i<NCPU; i++) - cpus[i].ncli = 1; // no interrupts during bootstrap - mp_init(); // collect info about this machine - bcpu = mp_bcpu(); - lapic_init(bcpu); + lapic_init(mp_bcpu()); cprintf("\ncpu%d: starting xv6\n\n", cpu()); pinit(); // process table @@ -38,19 +32,15 @@ main(void) console_init(); // I/O devices & their interrupts ide_init(); // disk if(!ismp) - timer_init(); // uniprocessor timer + timer_init(); // uniprocessor timer userinit(); // first user process + bootothers(); // start other processors - // Allocate scheduler stacks and boot the other CPUs. - for(i=0; i<ncpu; i++) - cpus[i].stack = kalloc(KSTACKSIZE); - bootothers(); - - // Switch to our scheduler stack and continue with mpmain. - asm volatile("movl %0, %%esp" : : "r" (cpus[bcpu].stack+KSTACKSIZE)); + // Finish setting up this processor in mpmain. mpmain(); } +// Bootstrap processor gets here after setting up the hardware. // Additional processors start here. static void mpmain(void) @@ -62,7 +52,6 @@ mpmain(void) setupsegs(0); cpuid(0, 0, 0, 0, 0); // memory barrier cpus[cpu()].booted = 1; - popcli(); scheduler(); } @@ -73,6 +62,7 @@ bootothers(void) extern uchar _binary_bootother_start[], _binary_bootother_size[]; uchar *code; struct cpu *c; + char *stack; // Write bootstrap code to unused memory at 0x7000. code = (uchar*)0x7000; @@ -83,7 +73,8 @@ bootothers(void) continue; // Fill in %esp, %eip and start code on cpu. - *(void**)(code-4) = c->stack + KSTACKSIZE; + stack = kalloc(KSTACKSIZE); + *(void**)(code-4) = stack + KSTACKSIZE; *(void**)(code-8) = mpmain; lapic_startap(c->apicid, (uint)code); |