Skip to content

X
xv6-public
提交 abf847a0 创建 作者: Frans Kaashoek's avatar Frans Kaashoek
浏览文件
操作

Start of an experiment to remove the use of gs for cpu local variables.

上级 59cdd6c6
隐藏空白字符变更
内嵌 并排
正在显示 包含 145 行增加 和 123 行删除
console.c
浏览文件 @ abf847a0
...@@ -111,7 +111,7 @@ panic(char *s) ...@@ -111,7 +111,7 @@ panic(char *s)
cli(); cli();
cons.locking = 0; cons.locking = 0;
cprintf("cpu with apicid %d: panic: ", cpu->apicid); cprintf("cpu %d: panic: ", cpuid());
cprintf(s); cprintf(s);
cprintf("\n"); cprintf("\n");
getcallerpcs(&s, pcs); getcallerpcs(&s, pcs);
...@@ -242,7 +242,7 @@ consoleread(struct inode *ip, char *dst, int n) ...@@ -242,7 +242,7 @@ consoleread(struct inode *ip, char *dst, int n)
acquire(&cons.lock); acquire(&cons.lock);
while(n > 0){ while(n > 0){
while(input.r == input.w){ while(input.r == input.w){
if(proc->killed){ if(myproc()->killed){
release(&cons.lock); release(&cons.lock);
ilock(ip); ilock(ip);
return -1; return -1;
......
defs.h
浏览文件 @ abf847a0
...@@ -74,7 +74,7 @@ void kbdintr(void); ...@@ -74,7 +74,7 @@ void kbdintr(void);
// lapic.c // lapic.c
void cmostime(struct rtcdate *r); void cmostime(struct rtcdate *r);
int cpunum(void); int lapiccpunum(void);
extern volatile uint* lapic; extern volatile uint* lapic;
void lapiceoi(void); void lapiceoi(void);
void lapicinit(void); void lapicinit(void);
...@@ -103,6 +103,7 @@ int pipewrite(struct pipe*, char*, int); ...@@ -103,6 +103,7 @@ int pipewrite(struct pipe*, char*, int);
//PAGEBREAK: 16 //PAGEBREAK: 16
// proc.c // proc.c
int cpuid(void);
void exit(void); void exit(void);
int fork(void); int fork(void);
int growproc(int); int growproc(int);
...@@ -111,6 +112,7 @@ void pinit(void); ...@@ -111,6 +112,7 @@ void pinit(void);
void procdump(void); void procdump(void);
void scheduler(void) __attribute__((noreturn)); void scheduler(void) __attribute__((noreturn));
void sched(void); void sched(void);
void setproc(struct proc*);
void sleep(void*, struct spinlock*); void sleep(void*, struct spinlock*);
void userinit(void); void userinit(void);
int wait(void); int wait(void);
......
exec.c
浏览文件 @ abf847a0
...@@ -22,6 +22,7 @@ exec(char *path, char **argv) ...@@ -22,6 +22,7 @@ exec(char *path, char **argv)
if((ip = namei(path)) == 0){ if((ip = namei(path)) == 0){
end_op(); end_op();
cprintf("exec: fail\n");
return -1; return -1;
} }
ilock(ip); ilock(ip);
...@@ -89,15 +90,15 @@ exec(char *path, char **argv) ...@@ -89,15 +90,15 @@ exec(char *path, char **argv)
for(last=s=path; *s; s++) for(last=s=path; *s; s++)
if(*s == '/') if(*s == '/')
last = s+1; last = s+1;
safestrcpy(proc->name, last, sizeof(proc->name)); safestrcpy(myproc()->name, last, sizeof(myproc()->name));
// Commit to the user image. // Commit to the user image.
oldpgdir = proc->pgdir; oldpgdir = myproc()->pgdir;
proc->pgdir = pgdir; myproc()->pgdir = pgdir;
proc->sz = sz; myproc()->sz = sz;
proc->tf->eip = elf.entry; // main myproc()->tf->eip = elf.entry; // main
proc->tf->esp = sp; myproc()->tf->esp = sp;
switchuvm(proc); switchuvm(myproc());
freevm(oldpgdir); freevm(oldpgdir);
return 0; return 0;
......
fs.c
浏览文件 @ abf847a0
...@@ -169,7 +169,7 @@ iinit(int dev) ...@@ -169,7 +169,7 @@ iinit(int dev)
for(i = 0; i < NINODE; i++) { for(i = 0; i < NINODE; i++) {
initsleeplock(&icache.inode[i].lock, "inode"); initsleeplock(&icache.inode[i].lock, "inode");
} }
readsb(dev, &sb); readsb(dev, &sb);
cprintf("sb: size %d nblocks %d ninodes %d nlog %d logstart %d\ cprintf("sb: size %d nblocks %d ninodes %d nlog %d logstart %d\
inodestart %d bmap start %d\n", sb.size, sb.nblocks, inodestart %d bmap start %d\n", sb.size, sb.nblocks,
...@@ -615,7 +615,7 @@ namex(char *path, int nameiparent, char *name) ...@@ -615,7 +615,7 @@ namex(char *path, int nameiparent, char *name)
if(*path == '/') if(*path == '/')
ip = iget(ROOTDEV, ROOTINO); ip = iget(ROOTDEV, ROOTINO);
else else
ip = idup(proc->cwd); ip = idup(myproc()->cwd);
while((path = skipelem(path, name)) != 0){ while((path = skipelem(path, name)) != 0){
ilock(ip); ilock(ip);
......
ide.c
浏览文件 @ abf847a0
...@@ -108,9 +108,9 @@ ideintr(void) ...@@ -108,9 +108,9 @@ ideintr(void)
// First queued buffer is the active request. // First queued buffer is the active request.
acquire(&idelock); acquire(&idelock);
if((b = idequeue) == 0){ if((b = idequeue) == 0){
release(&idelock); release(&idelock);
// cprintf("spurious IDE interrupt\n");
return; return;
} }
idequeue = b->qnext; idequeue = b->qnext;
...@@ -164,5 +164,6 @@ iderw(struct buf *b) ...@@ -164,5 +164,6 @@ iderw(struct buf *b)
sleep(b, &idelock); sleep(b, &idelock);
} }
release(&idelock); release(&idelock);
} }
lapic.c
浏览文件 @ abf847a0
...@@ -99,11 +99,11 @@ lapicinit(void) ...@@ -99,11 +99,11 @@ lapicinit(void)
} }
int int
cpunum(void) lapiccpunum(void)
{ {
int apicid, i; int apicid, i;
// Cannot call cpu when interrupts are enabled: // Cannot call cpunum when interrupts are enabled:
// result not guaranteed to last long enough to be used! // result not guaranteed to last long enough to be used!
// Would prefer to panic but even printing is chancy here: // Would prefer to panic but even printing is chancy here:
// almost everything, including cprintf and panic, calls cpu, // almost everything, including cprintf and panic, calls cpu,
...@@ -111,7 +111,7 @@ cpunum(void) ...@@ -111,7 +111,7 @@ cpunum(void)
if(readeflags()&FL_IF){ if(readeflags()&FL_IF){
static int n; static int n;
if(n++ == 0) if(n++ == 0)
cprintf("cpu called from %x with interrupts enabled\n", cprintf("cpunum called from %x with interrupts enabled\n",
__builtin_return_address(0)); __builtin_return_address(0));
} }
......
main.c
浏览文件 @ abf847a0
...@@ -22,7 +22,6 @@ main(void) ...@@ -22,7 +22,6 @@ main(void)
mpinit(); // detect other processors mpinit(); // detect other processors
lapicinit(); // interrupt controller lapicinit(); // interrupt controller
seginit(); // segment descriptors seginit(); // segment descriptors
cprintf("\ncpu%d: starting xv6\n\n", cpunum());
picinit(); // another interrupt controller picinit(); // another interrupt controller
ioapicinit(); // another interrupt controller ioapicinit(); // another interrupt controller
consoleinit(); // console hardware consoleinit(); // console hardware
...@@ -31,7 +30,7 @@ main(void) ...@@ -31,7 +30,7 @@ main(void)
tvinit(); // trap vectors tvinit(); // trap vectors
binit(); // buffer cache binit(); // buffer cache
fileinit(); // file table fileinit(); // file table
ideinit(); // disk ideinit(); // disk
if(!ismp) if(!ismp)
timerinit(); // uniprocessor timer timerinit(); // uniprocessor timer
startothers(); // start other processors startothers(); // start other processors
...@@ -54,9 +53,9 @@ mpenter(void) ...@@ -54,9 +53,9 @@ mpenter(void)
static void static void
mpmain(void) mpmain(void)
{ {
cprintf("cpu%d: starting\n", cpunum()); cprintf("cpu%d: starting %d\n", cpuid(), lapiccpunum());
idtinit(); // load idt register idtinit(); // load idt register
xchg(&cpu->started, 1); // tell startothers() we're up xchg(&(mycpu()->started), 1); // tell startothers() we're up
scheduler(); // start running processes scheduler(); // start running processes
} }
...@@ -78,7 +77,7 @@ startothers(void) ...@@ -78,7 +77,7 @@ startothers(void)
memmove(code, _binary_entryother_start, (uint)_binary_entryother_size); memmove(code, _binary_entryother_start, (uint)_binary_entryother_size);
for(c = cpus; c < cpus+ncpu; c++){ for(c = cpus; c < cpus+ncpu; c++){
if(c == cpus+cpunum()) // We've started already. if(c == mycpu()) // We've started already.
continue; continue;
// Tell entryother.S what stack to use, where to enter, and what // Tell entryother.S what stack to use, where to enter, and what
......
pipe.c
浏览文件 @ abf847a0
...@@ -83,7 +83,7 @@ pipewrite(struct pipe *p, char *addr, int n) ...@@ -83,7 +83,7 @@ pipewrite(struct pipe *p, char *addr, int n)
acquire(&p->lock); acquire(&p->lock);
for(i = 0; i < n; i++){ for(i = 0; i < n; i++){
while(p->nwrite == p->nread + PIPESIZE){ //DOC: pipewrite-full while(p->nwrite == p->nread + PIPESIZE){ //DOC: pipewrite-full
if(p->readopen == 0 || proc->killed){ if(p->readopen == 0 || myproc()->killed){
release(&p->lock); release(&p->lock);
return -1; return -1;
} }
...@@ -104,7 +104,7 @@ piperead(struct pipe *p, char *addr, int n) ...@@ -104,7 +104,7 @@ piperead(struct pipe *p, char *addr, int n)
acquire(&p->lock); acquire(&p->lock);
while(p->nread == p->nwrite && p->writeopen){ //DOC: pipe-empty while(p->nread == p->nwrite && p->writeopen){ //DOC: pipe-empty
if(proc->killed){ if(myproc()->killed){
release(&p->lock); release(&p->lock);
return -1; return -1;
} }
......
proc.c
浏览文件 @ abf847a0
...@@ -26,6 +26,16 @@ pinit(void) ...@@ -26,6 +26,16 @@ pinit(void)
initlock(&ptable.lock, "ptable"); initlock(&ptable.lock, "ptable");
} }
int
cpuid() {
return mycpu()-cpus;
}
void
setproc(struct proc* p) {
mycpu()->proc = p;
}
//PAGEBREAK: 32 //PAGEBREAK: 32
// Look in the process table for an UNUSED proc. // Look in the process table for an UNUSED proc.
// If found, change state to EMBRYO and initialize // If found, change state to EMBRYO and initialize
...@@ -121,16 +131,16 @@ growproc(int n) ...@@ -121,16 +131,16 @@ growproc(int n)
{ {
uint sz; uint sz;
sz = proc->sz; sz = myproc()->sz;
if(n > 0){ if(n > 0){
if((sz = allocuvm(proc->pgdir, sz, sz + n)) == 0) if((sz = allocuvm(myproc()->pgdir, sz, sz + n)) == 0)
return -1; return -1;
} else if(n < 0){ } else if(n < 0){
if((sz = deallocuvm(proc->pgdir, sz, sz + n)) == 0) if((sz = deallocuvm(myproc()->pgdir, sz, sz + n)) == 0)
return -1; return -1;
} }
proc->sz = sz; myproc()->sz = sz;
switchuvm(proc); switchuvm(myproc());
return 0; return 0;
} }
...@@ -148,26 +158,26 @@ fork(void) ...@@ -148,26 +158,26 @@ fork(void)
return -1; return -1;
} }
// Copy process state from p. // Copy process state from proc.
if((np->pgdir = copyuvm(proc->pgdir, proc->sz)) == 0){ if((np->pgdir = copyuvm(myproc()->pgdir, myproc()->sz)) == 0){
kfree(np->kstack); kfree(np->kstack);
np->kstack = 0; np->kstack = 0;
np->state = UNUSED; np->state = UNUSED;
return -1; return -1;
} }
np->sz = proc->sz; np->sz = myproc()->sz;
np->parent = proc; np->parent = myproc();
*np->tf = *proc->tf; *np->tf = *myproc()->tf;
// Clear %eax so that fork returns 0 in the child. // Clear %eax so that fork returns 0 in the child.
np->tf->eax = 0; np->tf->eax = 0;
for(i = 0; i < NOFILE; i++) for(i = 0; i < NOFILE; i++)
if(proc->ofile[i]) if(myproc()->ofile[i])
np->ofile[i] = filedup(proc->ofile[i]); np->ofile[i] = filedup(myproc()->ofile[i]);
np->cwd = idup(proc->cwd); np->cwd = idup(myproc()->cwd);
safestrcpy(np->name, proc->name, sizeof(proc->name)); safestrcpy(np->name, myproc()->name, sizeof(myproc()->name));
pid = np->pid; pid = np->pid;
...@@ -189,30 +199,30 @@ exit(void) ...@@ -189,30 +199,30 @@ exit(void)
struct proc *p; struct proc *p;
int fd; int fd;
if(proc == initproc) if(myproc() == initproc)
panic("init exiting"); panic("init exiting");
// Close all open files. // Close all open files.
for(fd = 0; fd < NOFILE; fd++){ for(fd = 0; fd < NOFILE; fd++){
if(proc->ofile[fd]){ if(myproc()->ofile[fd]){
fileclose(proc->ofile[fd]); fileclose(myproc()->ofile[fd]);
proc->ofile[fd] = 0; myproc()->ofile[fd] = 0;
} }
} }
begin_op(); begin_op();
iput(proc->cwd); iput(myproc()->cwd);
end_op(); end_op();
proc->cwd = 0; myproc()->cwd = 0;
acquire(&ptable.lock); acquire(&ptable.lock);
// Parent might be sleeping in wait(). // Parent might be sleeping in wait().
wakeup1(proc->parent); wakeup1(myproc()->parent);
// Pass abandoned children to init. // Pass abandoned children to init.
for(p = ptable.proc; p < &ptable.proc[NPROC]; p++){ for(p = ptable.proc; p < &ptable.proc[NPROC]; p++){
if(p->parent == proc){ if(p->parent == myproc()){
p->parent = initproc; p->parent = initproc;
if(p->state == ZOMBIE) if(p->state == ZOMBIE)
wakeup1(initproc); wakeup1(initproc);
...@@ -220,7 +230,7 @@ exit(void) ...@@ -220,7 +230,7 @@ exit(void)
} }
// Jump into the scheduler, never to return. // Jump into the scheduler, never to return.
proc->state = ZOMBIE; myproc()->state = ZOMBIE;
sched(); sched();
panic("zombie exit"); panic("zombie exit");
} }
...@@ -238,7 +248,7 @@ wait(void) ...@@ -238,7 +248,7 @@ wait(void)
// Scan through table looking for exited children. // Scan through table looking for exited children.
havekids = 0; havekids = 0;
for(p = ptable.proc; p < &ptable.proc[NPROC]; p++){ for(p = ptable.proc; p < &ptable.proc[NPROC]; p++){
if(p->parent != proc) if(p->parent != myproc())
continue; continue;
havekids = 1; havekids = 1;
if(p->state == ZOMBIE){ if(p->state == ZOMBIE){
...@@ -258,13 +268,13 @@ wait(void) ...@@ -258,13 +268,13 @@ wait(void)
} }
// No point waiting if we don't have any children. // No point waiting if we don't have any children.
if(!havekids || proc->killed){ if(!havekids || myproc()->killed){
release(&ptable.lock); release(&ptable.lock);
return -1; return -1;
} }
// Wait for children to exit. (See wakeup1 call in proc_exit.) // Wait for children to exit. (See wakeup1 call in proc_exit.)
sleep(proc, &ptable.lock); //DOC: wait-sleep sleep(myproc(), &ptable.lock); //DOC: wait-sleep
} }
} }
...@@ -294,15 +304,15 @@ scheduler(void) ...@@ -294,15 +304,15 @@ scheduler(void)
// Switch to chosen process. It is the process's job // Switch to chosen process. It is the process's job
// to release ptable.lock and then reacquire it // to release ptable.lock and then reacquire it
// before jumping back to us. // before jumping back to us.
proc = p; setproc(p);
switchuvm(p); switchuvm(p);
p->state = RUNNING; p->state = RUNNING;
swtch(&cpu->scheduler, p->context); swtch(&(mycpu()->scheduler), p->context);
switchkvm(); switchkvm();
// Process is done running for now. // Process is done running for now.
// It should have changed its p->state before coming back. // It should have changed its p->state before coming back.
proc = 0; setproc(0);
} }
release(&ptable.lock); release(&ptable.lock);
...@@ -323,15 +333,15 @@ sched(void) ...@@ -323,15 +333,15 @@ sched(void)
if(!holding(&ptable.lock)) if(!holding(&ptable.lock))
panic("sched ptable.lock"); panic("sched ptable.lock");
if(cpu->ncli != 1) if(mycpu()->ncli != 1)
panic("sched locks"); panic("sched locks");
if(proc->state == RUNNING) if(myproc()->state == RUNNING)
panic("sched running"); panic("sched running");
if(readeflags()&FL_IF) if(readeflags()&FL_IF)
panic("sched interruptible"); panic("sched interruptible");
intena = cpu->intena; intena = mycpu()->intena;
swtch(&proc->context, cpu->scheduler); swtch(&myproc()->context, mycpu()->scheduler);
cpu->intena = intena; mycpu()->intena = intena;
} }
// Give up the CPU for one scheduling round. // Give up the CPU for one scheduling round.
...@@ -339,7 +349,7 @@ void ...@@ -339,7 +349,7 @@ void
yield(void) yield(void)
{ {
acquire(&ptable.lock); //DOC: yieldlock acquire(&ptable.lock); //DOC: yieldlock
proc->state = RUNNABLE; myproc()->state = RUNNABLE;
sched(); sched();
release(&ptable.lock); release(&ptable.lock);
} }
...@@ -370,7 +380,7 @@ forkret(void) ...@@ -370,7 +380,7 @@ forkret(void)
void void
sleep(void *chan, struct spinlock *lk) sleep(void *chan, struct spinlock *lk)
{ {
if(proc == 0) if(myproc() == 0)
panic("sleep"); panic("sleep");
if(lk == 0) if(lk == 0)
...@@ -386,14 +396,13 @@ sleep(void *chan, struct spinlock *lk) ...@@ -386,14 +396,13 @@ sleep(void *chan, struct spinlock *lk)
acquire(&ptable.lock); //DOC: sleeplock1 acquire(&ptable.lock); //DOC: sleeplock1
release(lk); release(lk);
} }
// Go to sleep. // Go to sleep.
proc->chan = chan; myproc()->chan = chan;
proc->state = SLEEPING; myproc()->state = SLEEPING;
sched(); sched();
// Tidy up. // Tidy up.
proc->chan = 0; myproc()->chan = 0;
// Reacquire original lock. // Reacquire original lock.
if(lk != &ptable.lock){ //DOC: sleeplock2 if(lk != &ptable.lock){ //DOC: sleeplock2
......
proc.h
浏览文件 @ abf847a0
...@@ -7,25 +7,36 @@ struct cpu { ...@@ -7,25 +7,36 @@ struct cpu {
volatile uint started; // Has the CPU started? volatile uint started; // Has the CPU started?
int ncli; // Depth of pushcli nesting. int ncli; // Depth of pushcli nesting.
int intena; // Were interrupts enabled before pushcli? int intena; // Were interrupts enabled before pushcli?
// Per-CPU variables, holding pointers to the current cpu and to the current
// Cpu-local storage variables; see below // process (see cpu() and proc() in proc.c)
struct cpu *cpu; struct cpu *cpu; // On cpu 0, cpu = &cpus[0]; on cpu 1, cpu=&cpus[1], etc.
struct proc *proc; // The currently-running process. struct proc *proc; // The currently-running process on this cpu
}; };
extern struct cpu cpus[NCPU]; extern struct cpu cpus[NCPU];
extern int ncpu; extern int ncpu;
// Per-CPU variables, holding pointers to the
// current cpu and to the current process.
// The asm suffix tells gcc to use "%gs:0" to refer to cpu // The asm suffix tells gcc to use "%gs:0" to refer to cpu
// and "%gs:4" to refer to proc. seginit sets up the // and "%gs:4" to refer to proc. seginit sets up the
// %gs segment register so that %gs refers to the memory // %gs segment register so that %gs refers to the memory
// holding those two variables in the local cpu's struct cpu. // holding those two variables in the local cpu's struct cpu.
// This is similar to how thread-local variables are implemented // This is similar to how thread-local variables are implemented
// in thread libraries such as Linux pthreads. // in thread libraries such as Linux pthreads.
extern struct cpu *cpu asm("%gs:0"); // &cpus[cpunum()]
extern struct proc *proc asm("%gs:4"); // cpus[cpunum()].proc static inline struct cpu*
mycpu(void) {
struct cpu *cpu;
asm("movl %%gs:0, %0" : "=r"(cpu));
return cpu;
}
static inline struct proc*
myproc(void) {
struct proc *proc;
asm("movl %%gs:4, %0" : "=r"(proc));
return proc;
}
//PAGEBREAK: 17 //PAGEBREAK: 17
// Saved registers for kernel context switches. // Saved registers for kernel context switches.
......
sleeplock.c
浏览文件 @ abf847a0
...@@ -27,7 +27,7 @@ acquiresleep(struct sleeplock *lk) ...@@ -27,7 +27,7 @@ acquiresleep(struct sleeplock *lk)
sleep(lk, &lk->lk); sleep(lk, &lk->lk);
} }
lk->locked = 1; lk->locked = 1;
lk->pid = proc->pid; lk->pid = myproc()->pid;
release(&lk->lk); release(&lk->lk);
} }
......
spinlock.c
浏览文件 @ abf847a0
...@@ -38,7 +38,7 @@ acquire(struct spinlock *lk) ...@@ -38,7 +38,7 @@ acquire(struct spinlock *lk)
__sync_synchronize(); __sync_synchronize();
// Record info about lock acquisition for debugging. // Record info about lock acquisition for debugging.
lk->cpu = cpu; lk->cpu = mycpu();
getcallerpcs(&lk, lk->pcs); getcallerpcs(&lk, lk->pcs);
} }
...@@ -89,7 +89,7 @@ getcallerpcs(void *v, uint pcs[]) ...@@ -89,7 +89,7 @@ getcallerpcs(void *v, uint pcs[])
int int
holding(struct spinlock *lock) holding(struct spinlock *lock)
{ {
return lock->locked && lock->cpu == cpu; return lock->locked && lock->cpu == mycpu();
} }
...@@ -104,9 +104,9 @@ pushcli(void) ...@@ -104,9 +104,9 @@ pushcli(void)
eflags = readeflags(); eflags = readeflags();
cli(); cli();
if(cpu->ncli == 0) if(mycpu()->ncli == 0)
cpu->intena = eflags & FL_IF; mycpu()->intena = eflags & FL_IF;
cpu->ncli += 1; mycpu()->ncli += 1;
} }
void void
...@@ -114,9 +114,9 @@ popcli(void) ...@@ -114,9 +114,9 @@ popcli(void)
{ {
if(readeflags()&FL_IF) if(readeflags()&FL_IF)
panic("popcli - interruptible"); panic("popcli - interruptible");
if(--cpu->ncli < 0) if(--mycpu()->ncli < 0)
panic("popcli"); panic("popcli");
if(cpu->ncli == 0 && cpu->intena) if(mycpu()->ncli == 0 && mycpu()->intena)
sti(); sti();
} }
syscall.c
浏览文件 @ abf847a0
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
int int
fetchint(uint addr, int *ip) fetchint(uint addr, int *ip)
{ {
if(addr >= proc->sz || addr+4 > proc->sz) if(addr >= myproc()->sz || addr+4 > myproc()->sz)
return -1; return -1;
*ip = *(int*)(addr); *ip = *(int*)(addr);
return 0; return 0;
...@@ -31,13 +31,14 @@ fetchstr(uint addr, char **pp) ...@@ -31,13 +31,14 @@ fetchstr(uint addr, char **pp)
{ {
char *s, *ep; char *s, *ep;
if(addr >= proc->sz) if(addr >= myproc()->sz)
return -1; return -1;
*pp = (char*)addr; *pp = (char*)addr;
ep = (char*)proc->sz; ep = (char*)myproc()->sz;
for(s = *pp; s < ep; s++) for(s = *pp; s < ep; s++){
if(*s == 0) if(*s == 0)
return s - *pp; return s - *pp;
}
return -1; return -1;
} }
...@@ -45,7 +46,7 @@ fetchstr(uint addr, char **pp) ...@@ -45,7 +46,7 @@ fetchstr(uint addr, char **pp)
int int
argint(int n, int *ip) argint(int n, int *ip)
{ {
return fetchint(proc->tf->esp + 4 + 4*n, ip); return fetchint((myproc()->tf->esp) + 4 + 4*n, ip);
} }
// Fetch the nth word-sized system call argument as a pointer // Fetch the nth word-sized system call argument as a pointer
...@@ -58,7 +59,7 @@ argptr(int n, char **pp, int size) ...@@ -58,7 +59,7 @@ argptr(int n, char **pp, int size)
if(argint(n, &i) < 0) if(argint(n, &i) < 0)
return -1; return -1;
if(size < 0 || (uint)i >= proc->sz || (uint)i+size > proc->sz) if(size < 0 || (uint)i >= myproc()->sz || (uint)i+size > myproc()->sz)
return -1; return -1;
*pp = (char*)i; *pp = (char*)i;
return 0; return 0;
...@@ -128,12 +129,12 @@ syscall(void) ...@@ -128,12 +129,12 @@ syscall(void)
{ {
int num; int num;
num = proc->tf->eax; num = myproc()->tf->eax;
if(num > 0 && num < NELEM(syscalls) && syscalls[num]) { if(num > 0 && num < NELEM(syscalls) && syscalls[num]) {
proc->tf->eax = syscalls[num](); myproc()->tf->eax = syscalls[num]();
} else { } else {
cprintf("%d %s: unknown sys call %d\n", cprintf("%d %s: unknown sys call %d\n",
proc->pid, proc->name, num); myproc()->pid, myproc()->name, num);
proc->tf->eax = -1; myproc()->tf->eax = -1;
} }
} }
sysfile.c
浏览文件 @ abf847a0
...@@ -26,7 +26,7 @@ argfd(int n, int *pfd, struct file **pf) ...@@ -26,7 +26,7 @@ argfd(int n, int *pfd, struct file **pf)
if(argint(n, &fd) < 0) if(argint(n, &fd) < 0)
return -1; return -1;
if(fd < 0 || fd >= NOFILE || (f=proc->ofile[fd]) == 0) if(fd < 0 || fd >= NOFILE || (f=myproc()->ofile[fd]) == 0)
return -1; return -1;
if(pfd) if(pfd)
*pfd = fd; *pfd = fd;
...@@ -43,8 +43,8 @@ fdalloc(struct file *f) ...@@ -43,8 +43,8 @@ fdalloc(struct file *f)
int fd; int fd;
for(fd = 0; fd < NOFILE; fd++){ for(fd = 0; fd < NOFILE; fd++){
if(proc->ofile[fd] == 0){ if(myproc()->ofile[fd] == 0){
proc->ofile[fd] = f; myproc()->ofile[fd] = f;
return fd; return fd;
} }
} }
...@@ -97,7 +97,7 @@ sys_close(void) ...@@ -97,7 +97,7 @@ sys_close(void)
if(argfd(0, &fd, &f) < 0) if(argfd(0, &fd, &f) < 0)
return -1; return -1;
proc->ofile[fd] = 0; myproc()->ofile[fd] = 0;
fileclose(f); fileclose(f);
return 0; return 0;
} }
...@@ -386,9 +386,9 @@ sys_chdir(void) ...@@ -386,9 +386,9 @@ sys_chdir(void)
return -1; return -1;
} }
iunlock(ip); iunlock(ip);
iput(proc->cwd); iput(myproc()->cwd);
end_op(); end_op();
proc->cwd = ip; myproc()->cwd = ip;
return 0; return 0;
} }
...@@ -432,7 +432,7 @@ sys_pipe(void) ...@@ -432,7 +432,7 @@ sys_pipe(void)
fd0 = -1; fd0 = -1;
if((fd0 = fdalloc(rf)) < 0 || (fd1 = fdalloc(wf)) < 0){ if((fd0 = fdalloc(rf)) < 0 || (fd1 = fdalloc(wf)) < 0){
if(fd0 >= 0) if(fd0 >= 0)
proc->ofile[fd0] = 0; myproc()->ofile[fd0] = 0;
fileclose(rf); fileclose(rf);
fileclose(wf); fileclose(wf);
return -1; return -1;
......
sysproc.c
浏览文件 @ abf847a0
...@@ -39,7 +39,7 @@ sys_kill(void) ...@@ -39,7 +39,7 @@ sys_kill(void)
int int
sys_getpid(void) sys_getpid(void)
{ {
return proc->pid; return myproc()->pid;
} }
int int
...@@ -50,7 +50,7 @@ sys_sbrk(void) ...@@ -50,7 +50,7 @@ sys_sbrk(void)
if(argint(0, &n) < 0) if(argint(0, &n) < 0)
return -1; return -1;
addr = proc->sz; addr = myproc()->sz;
if(growproc(n) < 0) if(growproc(n) < 0)
return -1; return -1;
return addr; return addr;
...@@ -67,7 +67,7 @@ sys_sleep(void) ...@@ -67,7 +67,7 @@ sys_sleep(void)
acquire(&tickslock); acquire(&tickslock);
ticks0 = ticks; ticks0 = ticks;
while(ticks - ticks0 < n){ while(ticks - ticks0 < n){
if(proc->killed){ if(myproc()->killed){
release(&tickslock); release(&tickslock);
return -1; return -1;
} }
......
trap.c
浏览文件 @ abf847a0
...@@ -37,18 +37,18 @@ void ...@@ -37,18 +37,18 @@ void
trap(struct trapframe *tf) trap(struct trapframe *tf)
{ {
if(tf->trapno == T_SYSCALL){ if(tf->trapno == T_SYSCALL){
if(proc->killed) if(myproc()->killed)
exit(); exit();
proc->tf = tf; myproc()->tf = tf;
syscall(); syscall();
if(proc->killed) if(myproc()->killed)
exit(); exit();
return; return;
} }
switch(tf->trapno){ switch(tf->trapno){
case T_IRQ0 + IRQ_TIMER: case T_IRQ0 + IRQ_TIMER:
if(cpunum() == 0){ if(cpuid() == 0){
acquire(&tickslock); acquire(&tickslock);
ticks++; ticks++;
wakeup(&ticks); wakeup(&ticks);
...@@ -74,38 +74,38 @@ trap(struct trapframe *tf) ...@@ -74,38 +74,38 @@ trap(struct trapframe *tf)
case T_IRQ0 + 7: case T_IRQ0 + 7:
case T_IRQ0 + IRQ_SPURIOUS: case T_IRQ0 + IRQ_SPURIOUS:
cprintf("cpu%d: spurious interrupt at %x:%x\n", cprintf("cpu%d: spurious interrupt at %x:%x\n",
cpunum(), tf->cs, tf->eip); cpuid(), tf->cs, tf->eip);
lapiceoi(); lapiceoi();
break; break;
//PAGEBREAK: 13 //PAGEBREAK: 13
default: default:
if(proc == 0 || (tf->cs&3) == 0){ if(myproc() == 0 || (tf->cs&3) == 0){
// In kernel, it must be our mistake. // In kernel, it must be our mistake.
cprintf("unexpected trap %d from cpu %d eip %x (cr2=0x%x)\n", cprintf("unexpected trap %d from cpu %d eip %x (cr2=0x%x)\n",
tf->trapno, cpunum(), tf->eip, rcr2()); tf->trapno, cpuid(), tf->eip, rcr2());
panic("trap"); panic("trap");
} }
// In user space, assume process misbehaved. // In user space, assume process misbehaved.
cprintf("pid %d %s: trap %d err %d on cpu %d " cprintf("pid %d %s: trap %d err %d on cpu %d "
"eip 0x%x addr 0x%x--kill proc\n", "eip 0x%x addr 0x%x--kill proc\n",
proc->pid, proc->name, tf->trapno, tf->err, cpunum(), tf->eip, myproc()->pid, myproc()->name, tf->trapno, tf->err, cpuid(), tf->eip,
rcr2()); rcr2());
proc->killed = 1; myproc()->killed = 1;
} }
// Force process exit if it has been killed and is in user space. // Force process exit if it has been killed and is in user space.
// (If it is still executing in the kernel, let it keep running // (If it is still executing in the kernel, let it keep running
// until it gets to the regular system call return.) // until it gets to the regular system call return.)
if(proc && proc->killed && (tf->cs&3) == DPL_USER) if(myproc() && myproc()->killed && (tf->cs&3) == DPL_USER)
exit(); exit();
// Force process to give up CPU on clock tick. // Force process to give up CPU on clock tick.
// If interrupts were on while locks held, would need to check nlock. // If interrupts were on while locks held, would need to check nlock.
if(proc && proc->state == RUNNING && tf->trapno == T_IRQ0+IRQ_TIMER) if(myproc() && myproc()->state == RUNNING && tf->trapno == T_IRQ0+IRQ_TIMER)
yield(); yield();
// Check if the process has been killed since we yielded // Check if the process has been killed since we yielded
if(proc && proc->killed && (tf->cs&3) == DPL_USER) if(myproc() && myproc()->killed && (tf->cs&3) == DPL_USER)
exit(); exit();
} }
vm.c
浏览文件 @ abf847a0
...@@ -21,21 +21,19 @@ seginit(void) ...@@ -21,21 +21,19 @@ seginit(void)
// Cannot share a CODE descriptor for both kernel and user // Cannot share a CODE descriptor for both kernel and user
// because it would have to have DPL_USR, but the CPU forbids // because it would have to have DPL_USR, but the CPU forbids
// an interrupt from CPL=0 to DPL=3. // an interrupt from CPL=0 to DPL=3.
c = &cpus[cpunum()]; c = &cpus[lapiccpunum()];
c->gdt[SEG_KCODE] = SEG(STA_X|STA_R, 0, 0xffffffff, 0); c->gdt[SEG_KCODE] = SEG(STA_X|STA_R, 0, 0xffffffff, 0);
c->gdt[SEG_KDATA] = SEG(STA_W, 0, 0xffffffff, 0); c->gdt[SEG_KDATA] = SEG(STA_W, 0, 0xffffffff, 0);
c->gdt[SEG_UCODE] = SEG(STA_X|STA_R, 0, 0xffffffff, DPL_USER); c->gdt[SEG_UCODE] = SEG(STA_X|STA_R, 0, 0xffffffff, DPL_USER);
c->gdt[SEG_UDATA] = SEG(STA_W, 0, 0xffffffff, DPL_USER); c->gdt[SEG_UDATA] = SEG(STA_W, 0, 0xffffffff, DPL_USER);
c->cpu = c;
// Map cpu and proc -- these are private per cpu. // Map cpu and proc -- these are private per cpu.
c->gdt[SEG_KCPU] = SEG(STA_W, &c->cpu, 8, 0); c->gdt[SEG_KCPU] = SEG(STA_W, &c->cpu, 4, 0);
lgdt(c->gdt, sizeof(c->gdt)); lgdt(c->gdt, sizeof(c->gdt));
loadgs(SEG_KCPU << 3); loadgs(SEG_KCPU << 3);
// Initialize cpu-local storage. // Initialize cpu-local storage.
cpu = c; // setcpu(c);
proc = 0; setproc(0);
} }
// Return the address of the PTE in page table pgdir // Return the address of the PTE in page table pgdir
...@@ -171,13 +169,13 @@ switchuvm(struct proc *p) ...@@ -171,13 +169,13 @@ switchuvm(struct proc *p)
panic("switchuvm: no pgdir"); panic("switchuvm: no pgdir");
pushcli(); pushcli();
cpu->gdt[SEG_TSS] = SEG16(STS_T32A, &cpu->ts, sizeof(cpu->ts)-1, 0); mycpu()->gdt[SEG_TSS] = SEG16(STS_T32A, &mycpu()->ts, sizeof(mycpu()->ts)-1, 0);
cpu->gdt[SEG_TSS].s = 0; mycpu()->gdt[SEG_TSS].s = 0;
cpu->ts.ss0 = SEG_KDATA << 3; mycpu()->ts.ss0 = SEG_KDATA << 3;
cpu->ts.esp0 = (uint)p->kstack + KSTACKSIZE; mycpu()->ts.esp0 = (uint)p->kstack + KSTACKSIZE;
// setting IOPL=0 in eflags *and* iomb beyond the tss segment limit // setting IOPL=0 in eflags *and* iomb beyond the tss segment limit
// forbids I/O instructions (e.g., inb and outb) from user space // forbids I/O instructions (e.g., inb and outb) from user space
cpu->ts.iomb = (ushort) 0xFFFF; mycpu()->ts.iomb = (ushort) 0xFFFF;
ltr(SEG_TSS << 3); ltr(SEG_TSS << 3);
lcr3(V2P(p->pgdir)); // switch to process's address space lcr3(V2P(p->pgdir)); // switch to process's address space
popcli(); popcli();
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论