Commit graph

512 commits

Author SHA1 Message Date
rtm
2ce40d7088 be clear what the root i-number is 2008-10-08 18:57:13 +00:00
rtm
be38c8413e document lock->locked=0 vs xchg(&lock->locked, 0) 2008-09-28 10:53:54 +00:00
kolya
0159c8bb94 trap 9 does not push ec: fix from Greg Price <price@mit.edu> 2008-09-24 18:20:56 +00:00
kolya
c7317d4dc7 always save and restore %fs, %gs to ensure old segment entries are never
accessible to user from the hidden CPU segment registers.
2008-09-24 01:48:31 +00:00
rtm
adcd16c3f7 restore std toolprefix 2008-09-11 10:22:01 +00:00
rtm
4651d04ad1 omit *.d from tar file 2008-09-11 10:20:40 +00:00
kaashoek
e9ae6f5cbe add copyright notice 2008-09-09 11:42:44 +00:00
kolya
f68317533e make bochsrc work for bochs 2.2.6 2008-09-03 14:10:47 +00:00
kolya
35a6cf84ec make pdf, ps, tarball 2008-09-03 14:05:52 +00:00
kaashoek
e87dca5cc5 nits in index.txt
add slides for shell, x86 intro, x86 virtual memory  (deleted JOS from slides)
2008-09-03 12:29:44 +00:00
rsc
f53494c28e DO NOT MAIL: xv6 web pages 2008-09-03 04:50:04 +00:00
rtm
ee3f75f229 simplify growproc 2008-08-28 17:57:47 +00:00
rtm
98754d687e avoid a bug w/ exit() 2008-08-28 00:53:24 +00:00
rtm
56082468ea the old explanation of AP startup might have been correct, but
I understand this one.
2008-08-28 00:52:05 +00:00
kolya
02cc595f28 clean up circular buffers, so pipe can queue 512 bytes rather than 511 2008-08-22 00:26:22 +00:00
kolya
5c5470a2fa fix obvious printf nits after reading through code 2008-08-21 23:24:02 +00:00
rsc
1808b2f1b3 now rev2 2008-08-20 18:00:35 +00:00
rsc
150785a1fd add nice font 2008-08-20 18:00:24 +00:00
rsc
9b62657ecd formatting updates 2008-08-20 18:00:13 +00:00
rsc
5b7f8cbe7c bochs faster 2008-08-20 17:59:29 +00:00
rsc
174729fc55 xv6: latest (as of January 2008) 2008-08-20 17:46:32 +00:00
rsc
eadbd55af2 oops - wrong bit (vic zandy) 2007-12-20 18:27:07 +00:00
rsc
c2258bf4d2 fork minibug 2007-11-28 20:47:22 +00:00
rsc
4f06ae0d42 More complete lapic startup (thanks Silas) 2007-11-28 20:47:10 +00:00
rsc
a6c4711a38 bda[0xE] is a 16-bit segment number,
not a real address.  So shift 4.

Reported by Silas.

Jim McKie says this code only matters
on ancient EISA MP systems.
2007-11-28 20:17:04 +00:00
rtm
fd6b029401 proc_wait -> wait 2007-10-20 18:25:38 +00:00
rsc
949352af66 Model verifying that wakeup really
can be called after release without
causing deadlock.
2007-10-12 04:21:04 +00:00
rsc
943fd378a1 Incorporate new understanding of/with Intel SMP spec.
Dropped cmpxchg in favor of xchg, to match lecture notes.

Use xchg to release lock, for future protection and to
keep gcc from acting clever.
2007-10-01 20:43:15 +00:00
rsc
9fd9f80431 Re: why cpuid() in locking code?
rtm wrote:
> Why does acquire() call cpuid()? Why does release() call cpuid()?

The cpuid in acquire is redundant with the cmpxchg, as you said.
I have removed the cpuid from acquire.

The cpuid in release is actually doing something important,
but not on the hardware.  It keeps gcc from reordering the
lock->locked assignment above the other two during optimization.
(Not that current gcc -O2 would choose to do that, but it is allowed to.)
I have replaced the cpuid in release with a "gcc barrier" that
keeps gcc from moving things around but has no hardware effect.

On a related note, I don't think the cpuid in mpmain is necessary,
for the same reason that the cpuid wasn't needed in release.

As to the question of whether

  acquire();
  x = protected;
  release();

might read protected after release(), I still haven't convinced
myself whether it can.  I'll put the cpuid back into release if
we determine that it can.

Russ
2007-09-30 14:30:04 +00:00
rsc
c840f3ecdc tricks 2007-09-30 14:20:47 +00:00
rsc
af7366c945 interrupts during system calls
"It just works."
2007-09-27 21:37:45 +00:00
rsc
ab08960f64 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.
2007-09-27 21:25:37 +00:00
rsc
f97f0d2b3d cleaner 2007-09-27 21:02:03 +00:00
rsc
c95bde8163 yank out stack overflow checking ugliness 2007-09-27 20:38:53 +00:00
rsc
4f74de0edc okay, that was long enough - revert 2007-09-27 20:32:45 +00:00
rsc
ce2e751555 test: store curproc at top of stack
I don't actually think this is worthwhile, but I figured
I would check it in before reverting it, so that it can
be in the revision history.

Pros:
  * curproc doesn't need to turn on/off interrupts
  * scheduler doesn't have to edit curproc anymore

Cons:
  * it's ugly
  * all the stack computation is more complicated.
  * it doesn't actually simplify anything but curproc,
    and even curproc is harder to follow.
2007-09-27 20:29:50 +00:00
rsc
aefc13f8ba nit 2007-09-27 20:25:32 +00:00
rsc
3807c1f20b rename splhi/spllo to pushcli/popcli 2007-09-27 20:09:40 +00:00
rsc
39c3fb1b15 overkill: use segments to catch stack overflow (delete before next year) 2007-09-27 19:39:10 +00:00
rsc
8c8b748a2f now spllo is okay 2007-09-27 19:35:25 +00:00
rsc
b5dcebdbeb better lapic writes, suggested by cliff 2007-09-27 19:33:46 +00:00
rsc
4721271961 use larger, allocated cpu stacks 2007-09-27 19:32:43 +00:00
rsc
0fe118f3f6 don't call it ss - that's the stack segment 2007-09-27 16:47:50 +00:00
rsc
c8919e6537 kernel SMP interruptibility fixes.
Last year, right before I sent xv6 to the printer, I changed the
SETGATE calls so that interrupts would be disabled on entry to
interrupt handlers, and I added the nlock++ / nlock-- in trap()
so that interrupts would stay disabled while the hw handlers
(but not the syscall handler) did their work.  I did this because
the kernel was otherwise causing Bochs to triple-fault in SMP
mode, and time was short.

Robert observed yesterday that something was keeping the SMP
preemption user test from working.  It turned out that when I
simplified the lapic code I swapped the order of two register
writes that I didn't realize were order dependent.  I fixed that
and then since I had everything paged in kept going and tried
to figure out why you can't leave interrupts on during interrupt
handlers.  There are a few issues.

First, there must be some way to keep interrupts from "stacking
up" and overflowing the stack.  Keeping interrupts off the whole
time solves this problem -- even if the clock tick handler runs
long enough that the next clock tick is waiting when it finishes,
keeping interrupts off means that the handler runs all the way
through the "iret" before the next handler begins.  This is not
really a problem unless you are putting too many prints in trap
-- if the OS is doing its job right, the handlers should run
quickly and not stack up.

Second, if xv6 had page faults, then it would be important to
keep interrupts disabled between the start of the interrupt and
the time that cr2 was read, to avoid a scenario like:

   p1 page faults [cr2 set to faulting address]
   p1 starts executing trapasm.S
   clock interrupt, p1 preempted, p2 starts executing
   p2 page faults [cr2 set to another faulting address]
   p2 starts, finishes fault handler
   p1 rescheduled, reads cr2, sees wrong fault address

Alternately p1 could be rescheduled on the other cpu, in which
case it would still see the wrong cr2.  That said, I think cr2
is the only interrupt state that isn't pushed onto the interrupt
stack atomically at fault time, and xv6 doesn't care.  (This isn't
entirely hypothetical -- I debugged this problem on Plan 9.)

Third, and this is the big one, it is not safe to call cpu()
unless interrupts are disabled.  If interrupts are enabled then
there is no guarantee that, between the time cpu() looks up the
cpu id and the time that it the result gets used, the process
has not been rescheduled to the other cpu.  For example, the
very commonly-used expression curproc[cpu()] (aka the macro cp)
can end up referring to the wrong proc: the code stores the
result of cpu() in %eax, gets rescheduled to the other cpu at
just the wrong instant, and then reads curproc[%eax].

We use curproc[cpu()] to get the current process a LOT.  In that
particular case, if we arranged for the current curproc entry
to be addressed by %fs:0 and just use a different %fs on each
CPU, then we could safely get at curproc even with interrupts
disabled, since the read of %fs would be atomic with the read
of %fs:0.  Alternately, we could have a curproc() function that
disables interrupts while computing curproc[cpu()].  I've done
that last one.

Even in the current kernel, with interrupts off on entry to trap,
interrupts are enabled inside release if there are no locks held.
Also, the scheduler's idle loop must be interruptible at times
so that the clock and disk interrupts (which might make processes
runnable) can be handled.

In addition to the rampant use of curproc[cpu()], this little
snippet from acquire is wrong on smp:

  if(cpus[cpu()].nlock == 0)
    cli();
  cpus[cpu()].nlock++;

because if interrupts are off then we might call cpu(), get
rescheduled to a different cpu, look at cpus[oldcpu].nlock, and
wrongly decide not to disable interrupts on the new cpu.  The
fix is to always call cli().  But this is wrong too:

  if(holding(lock))
    panic("acquire");
  cli();
  cpus[cpu()].nlock++;

because holding looks at cpu().  The fix is:

  cli();
  if(holding(lock))
    panic("acquire");
  cpus[cpu()].nlock++;

I've done that, and I changed cpu() to complain the first time
it gets called with interrupts disabled.  (It gets called too
much to complain every time.)

I added new functions splhi and spllo that are like acquire and
release but without the locking:

  void
  splhi(void)
  {
    cli();
    cpus[cpu()].nsplhi++;
  }

  void
  spllo(void)
  {
    if(--cpus[cpu()].nsplhi == 0)
      sti();
  }

and I've used those to protect other sections of code that refer
to cpu() when interrupts would otherwise be disabled (basically
just curproc and setupsegs).  I also use them in acquire/release
and got rid of nlock.

I'm not thrilled with the names, but I think the concept -- a
counted cli/sti -- is sound.  Having them also replaces the
nlock++/nlock-- in trap.c and main.c, which is nice.


Final note: it's still not safe to enable interrupts in
the middle of trap() between lapic_eoi and returning
to user space.  I don't understand why, but we get a
fault on pop %es because 0x10 is a bad segment
descriptor (!) and then the fault faults trying to go into
a new interrupt because 0x8 is a bad segment descriptor too!
Triple fault.  I haven't debugged this yet.
2007-09-27 12:58:42 +00:00
rsc
75506c6655 use console lock 2007-09-27 12:29:25 +00:00
rsc
d522571068 make slow bigdir last test 2007-09-27 12:29:06 +00:00
rsc
ad12b487b5 changes since two days ago:
drop , address=0xf0000 from romimage line.
newer bochs has a 128k bios that it loads elsewhere.
so let bochs decide where the romimage goes.

change cpu quantum to 1 (default is 5, max is 16)
in an attempt to provoke more races.  only provokes
them slightly more frequently, may not be worth
the slowdown.
2007-09-27 11:27:04 +00:00
rsc
b30ab3f5af use standard bios location 2007-09-27 05:14:25 +00:00
rsc
666f58c711 believe it or not, this was working
the macro expansion of "char *cp;" turned into
char *(curproc[cpu()]);  which declares a dynamically
sized array of char* called curproc.

so then &cp == &(curproc[cpu()]) was actually a
stack variable as "expected".  it was one past the
end of the array, but the implicit alloca allocated
more than was necessary.

do not tell me that making cp a #define was a bad idea.
there are worse problems to fix.  more on that later.
2007-09-27 05:13:10 +00:00
rsc
90d975e9c8 comment bochs nonsense 2007-09-26 23:32:47 +00:00