Commit graph

144 commits

Author SHA1 Message Date
rsc
b63bb0fd00 Clean up lapic code.
One initialization function now, not three.
Use #defines instead of enums (consistent with other code, but sigh).

Still boots in Bochs in SMP mode.
2007-08-27 16:57:13 +00:00
rsc
1ccff18b24 fileincref -> filedup (consistent with idup) 2007-08-27 14:35:09 +00:00
rsc
efc12b8e61 Replace yield system call with sleep. 2007-08-27 13:34:35 +00:00
rsc
7bb73cdbc7 nits 2007-08-27 12:48:20 +00:00
rsc
766ba5cc06 first ever correct use of strncpy 2007-08-24 21:00:02 +00:00
rsc
07090dd705 Remove struct uinode.
Remove type arg to mknod (assume T_DEV).
2007-08-24 20:54:23 +00:00
rtm
902b13f5d6 simplify ide queuing
nits in comments
2007-08-24 19:32:36 +00:00
rsc
649bc99fe4 align, sort 2007-08-23 23:58:19 +00:00
rsc
eaea18cb9c PDF at http://am.lcs.mit.edu/~rsc/xv6.pdf
Various changes made while offline.

 + bwrite sector argument is redundant; use b->sector.
 + reformatting of files for nicer PDF page breaks
 + distinguish between locked, unlocked inodes in type signatures
 + change FD_FILE to FD_INODE
 + move userinit (nee proc0init) to proc.c
 + move ROOTDEV to param.h
 + always parenthesize sizeof argument
2007-08-22 06:01:32 +00:00
rsc
fbf9103952 remove namelen parameter 2007-08-21 19:58:55 +00:00
rsc
f32f3638f4 Various cleanup:
- Got rid of dummy proc[0].  Now proc[0] is init.
 - Added initcode.S to exec /init, so that /init is
   just a regular binary.
 - Moved exec out of sysfile to exec.c
 - Moved code dealing with fs guts (like struct inode)
   from sysfile.c to fs.c.  Code dealing with system call
   arguments stays in sysfile.c
 - Refactored directory routines in fs.c; should be simpler.
 - Changed iget to return *unlocked* inode structure.
   This solves the lookup-then-use race in namei
   without introducing deadlocks.
   It also enabled getting rid of the dummy proc[0].
2007-08-21 19:22:08 +00:00
rsc
e2a620da49 checkpoint - simpler namei interface 2007-08-20 19:37:15 +00:00
rsc
bcca6c6bde shuffle fs.c in bottom-up order 2007-08-20 18:23:52 +00:00
rsc
c65e499f3b help gcc 2007-08-08 10:27:04 +00:00
rsc
9ad44da676 unused 2007-08-08 09:44:23 +00:00
rsc
453c6a65a2 convert syscall dispatch to table 2007-08-08 09:41:21 +00:00
rsc
d80b06a1e0 iincref returns new ref 2007-08-08 09:30:42 +00:00
rsc
7e89fb90bd add safestrcpy 2007-08-08 08:37:22 +00:00
rsc
3689c7f5ce unnecessary struct jmpbuf 2006-09-08 15:31:18 +00:00
rsc
66d46d691d fix file names 2006-09-08 14:40:51 +00:00
rsc
41abfaa92e missing def 2006-09-07 16:54:23 +00:00
rsc
ab17e3198b debugging prints 2006-09-07 15:45:38 +00:00
rsc
19297caf0d fix ide, pit interfaces 2006-09-07 15:29:54 +00:00
rsc
224f6598c1 refactor syscall code 2006-09-07 14:13:26 +00:00
kaashoek
f70172129c run without lapic and ioapic, if they are not present
if no lapic available, use 8253pit for clock
now xv6 runs both on qemu (uniprocessor) and bochs (uniprocessor and MP)
2006-09-07 01:37:58 +00:00
rsc
d6b20251f0 fd.c -> file.c 2006-09-06 19:47:07 +00:00
rsc
50e514be98 fd_* => file_* 2006-09-06 18:43:45 +00:00
rsc
39593d2f1a struct fd -> struct file 2006-09-06 18:38:56 +00:00
rsc
2685309fb4 split syscall.c into sysfile.c and sysproc.c 2006-09-06 18:19:11 +00:00
rsc
9e9bcaf143 standardize various * conventions 2006-09-06 17:27:19 +00:00
rsc
03b6376f56 standardize on unnamed args in prototypes 2006-09-06 17:10:00 +00:00
rtm
2aa4c3bc29 complain if no disk 1
lots of cleanup
2006-08-30 18:55:06 +00:00
rtm
3b95801add i broke sbrk, fix it 2006-08-29 17:01:40 +00:00
rtm
2b19190c13 clean up stale error checks and panics
delete unused functions
a few comments
2006-08-29 14:45:45 +00:00
rtm
5051da6de3 inode addrs[NDIRECT] -> NADDRS
fix race in mknod / creat
use last component in dirent in mknod, not path
2006-08-25 01:11:30 +00:00
kaashoek
ea2909b6b5 user-level malloc (untested)
nit in sbrk
indirect block
fix dup to share fd struct
2006-08-24 02:44:41 +00:00
kaashoek
8b58e81077 i/o redirection in sh
better parsing of sh commands (copied from jos sh)
cat: read from 1 if no args
sbrk system call, but untested
getpid system call
moved locks in keyboard intr, but why do we get intr w. null characters from keyboard?
2006-08-23 01:09:24 +00:00
kaashoek
f18ab5c04e compiling, but untested dup 2006-08-20 03:33:01 +00:00
kaashoek
16083d4462 removed block system call
renumber system calls (run gmake clean!)
skeleton for dup system call
2006-08-20 03:08:54 +00:00
kaashoek
e958c538fa commented out code for cwd 2006-08-15 15:53:46 +00:00
rtm
211ff0c67e namei returns locked parent dir inode for create / unlink
don't hold fd table lock across idecref() (latter does block i/o)
idecref calls iput() in case last ref -> freeing inode
dir size is 512 * # blocks, so readi/writei &c work
unlink deletes dirent even if ip->nlink > 0
2006-08-13 12:22:44 +00:00
rtm
9e5970d596 link() 2006-08-13 02:12:44 +00:00
rtm
05e975511b zero out all of dirent.name when creating
don't increase length of directory
2006-08-12 22:44:26 +00:00
rtm
4357207237 fix getblk to actually lock the block
no more cons_put system calls
usertests tests two processes writing files
2006-08-12 11:38:57 +00:00
kaashoek
1f544842ce fstat
primitive ls
2006-08-12 04:33:50 +00:00
kaashoek
0633b9715e unlink,mknod,create with multi-component pathnames should work now
remove console init code from userfs
2006-08-12 01:25:45 +00:00
kaashoek
24437cd554 fix deadlock---iput(dp) asap
working unlink, but doesn't free dir blocks that become empty
remove out-of-date comment in ioapic
2006-08-11 18:18:38 +00:00
rtm
17a856577f init creates console, opens 0/1/2, runs sh
sh accepts 0-argument commands (like userfs)
reads from console
2006-08-11 13:55:18 +00:00
rtm
5be0039ce9 interrupts could be recursive since lapic_eoi() called before rti
so fast interrupts overflow the kernel stack
fix: cli() before lapic_eoi()
2006-08-10 22:08:14 +00:00
rtm
8a8be1b8c3 low-level keyboard input (not hooked up to /dev yet)
fix acquire() to cli() *before* incrementing nlock
make T_SYSCALL a trap gate, not an interrupt gate
sadly, various crashes if you hold down a keyboard key...
2006-08-10 02:07:10 +00:00
kaashoek
28d9ef04dd printf
convert userfs to use printf
bfree
ifree
writei
start on unlink
2006-08-10 01:28:57 +00:00
kaashoek
6fa5ffb56f devsw
checkpoint: write(fd,"hello\n",6) where fd is a console dev almost works
2006-08-09 16:04:04 +00:00
kaashoek
e8d11c2e84 mknod,ialloc,iupdate 2006-08-08 18:07:37 +00:00
kaashoek
104207726b bwrite 2006-08-07 01:38:46 +00:00
kaashoek
8ec6530fee generalize async read to support write too 2006-08-06 20:28:15 +00:00
kaashoek
366189214e nit 2006-08-04 18:23:23 +00:00
kaashoek
c8b29f6d03 better interrupt plan---this one appears to work
ioapic
2006-08-04 18:12:31 +00:00
rtm
32630628a9 open() 2006-07-29 09:35:02 +00:00
rtm
c59361f143 primitive exec 2006-07-27 21:10:00 +00:00
rtm
9d3fb67141 namei 2006-07-21 22:10:40 +00:00
rtm
11a9947f1a bread
iget
mkfs makes a file system image
put this in your .bochsrc:
ata0-slave: type=disk, mode=flat, path="fs.img", cylinders=1024, heads=1, spt=1
2006-07-21 13:18:04 +00:00
rtm
2927081628 uint32_t -> uint &c 2006-07-20 09:07:53 +00:00
rsc
0dd4253747 add ide_lock for sleep 2006-07-17 05:00:25 +00:00
rsc
e0966f459f no more cons_putc; real_cons_putc -> cons_putc 2006-07-17 01:53:43 +00:00
rsc
b5ee516575 add uint and standardize on typedefs instead of unsigned 2006-07-17 01:52:13 +00:00
rsc
c54c79267f nitpicks 2006-07-17 01:25:22 +00:00
rsc
ef2bd07ae4 standardize on not using foo_ prefix in struct foo 2006-07-16 15:41:47 +00:00
rsc
679a977cb2 remove acquire1 and release1 2006-07-16 15:38:13 +00:00
rsc
51716a869c Rename fd_reference to more suggestive fd_incref.
(Fd_reference sounds like it might just return the ref count.)
2006-07-16 01:49:03 +00:00
rsc
856e1fc1ad Attempt to clean up newproc somewhat.
Also remove all calls to memcpy in favor of
memmove, which has defined semantics when
the ranges overlap.  The fact that memcpy was
working in console.c to scroll the screen is not
guaranteed by all implementations.
2006-07-16 01:47:40 +00:00
rsc
65bd8e139a New scheduler.
Removed cli and sti stack in favor of tracking
number of locks held on each CPU and explicit
conditionals in spinlock.c.
2006-07-16 01:15:28 +00:00
rsc
643b122b4a move everything having to do with proc_table_lock into proc.c 2006-07-15 17:24:54 +00:00
rtm
46bbd72f3e no more recursive locks
wakeup1() assumes you hold proc_table_lock
sleep(chan, lock) provides atomic sleep-and-release to wait for condition
ugly code in swtch/scheduler to implement new sleep
fix lots of bugs in pipes, wait, and exit
fix bugs if timer interrupt goes off in schedule()
console locks per line, not per byte
2006-07-15 12:03:57 +00:00
kaashoek
f27a68a24a extract lapic code from mp.c 2006-07-12 17:00:54 +00:00
rtm
8148b6ee53 i think my cmpxchg use was wrong in acquire
nesting cli/sti: release shouldn't always enable interrupts
separate setup of lapic from starting of other cpus, so cpu() works earlier
flag to disable locking in console output
make locks work even when curproc==0
(still crashes in clock interrupt)
2006-07-12 11:15:38 +00:00
rtm
4e8f237be8 no more big kernel lock
succeeds at usertests.c pipe test
2006-07-12 01:48:35 +00:00
rtm
b548df152b pre-empt both user and kernel, in clock interrupt
usertest.c tests pre-emption
kill()
2006-07-11 17:39:45 +00:00
rsc
5ce9751cab Changes to allow use of native x86 ELF compilers, which on my
Linux 2.4 box using gcc 3.4.6 don't seem to follow the same
conventions as the i386-jos-elf-gcc compilers.
Can run make 'TOOLPREFIX=' or edit the Makefile.

curproc[cpu()] can now be NULL, indicating that no proc is running.
This seemed safer to me than having curproc[0] and curproc[1]
both pointing at proc[0] potentially.

The old implementation of swtch depended on the stack frame layout
used inside swtch being okay to return from on the other stack
(exactly the V6 you are not expected to understand this).
It also could be called in two contexts: at boot time, to schedule
the very first process, and later, on behalf of a process, to sleep
or schedule some other process.

I split this into two functions: scheduler and swtch.

The scheduler is now a separate never-returning function, invoked
by each cpu once set up.  The scheduler looks like:

	scheduler() {
		setjmp(cpu.context);

		pick proc to schedule
		blah blah blah

		longjmp(proc.context)
	}

The new swtch is intended to be called only when curproc[cpu()] is not NULL,
that is, only on behalf of a user proc.  It does:

	swtch() {
		if(setjmp(proc.context) == 0)
			longjmp(cpu.context)
	}

to save the current proc context and then jump over to the scheduler,
running on the cpu stack.

Similarly the system call stubs are now in assembly in usys.S to avoid
needing to know the details of stack frame layout used by the compiler.

Also various changes in the debugging prints.
2006-07-11 01:07:40 +00:00
kaashoek
7ea6c9d197 queue with disk requests 2006-07-10 19:06:48 +00:00
kaashoek
72ea69fbdf read the disk using interrupts 2006-07-10 13:08:37 +00:00
kaashoek
7837c71b32 disable all interrupts when acquiring lock
user program that makes a blocking system call
2006-07-06 21:47:22 +00:00
kaashoek
b22d898297 timer interrupts
disk interrupts (assuming bochs has a bug)
2006-07-05 20:00:14 +00:00
kaashoek
f7cea12b38 disable interrupts when holding kernel lock 2006-06-28 16:44:41 +00:00
kaashoek
bd303ed060 timer interrupts 2006-06-28 16:35:03 +00:00
rtm
c41f1de5d4 file descriptors
pipes
2006-06-27 14:35:53 +00:00
rtm
b61c2547b8 system call return values
initialize 2nd cpu's idt
2006-06-26 20:31:52 +00:00
rtm
bf3903612d system call arguments 2006-06-26 15:11:19 +00:00
rtm
df5cc91659 compile "user programs"
curproc array
2006-06-22 20:47:23 +00:00
kaashoek
21a88fd487 checkpoint. booting second processor. stack is messed up, but thanks to cliff
and plan 9 code, at least boots and gets into C code.
2006-06-22 01:28:57 +00:00
kaashoek
7baa34a421 start on MP; detect MP configuration 2006-06-21 01:53:07 +00:00
rtm
ae6e8aa730 checkpoint 2006-06-16 20:29:25 +00:00
rtm
be0a7eacda sleep, wakeup, wait, exit 2006-06-15 19:58:01 +00:00
rtm
a4c03dea09 primitive fork and exit system calls 2006-06-15 16:02:20 +00:00
rtm
55e95b16db import 2006-06-12 15:22:12 +00:00