2006-06-12 17:22:12 +02:00
|
|
|
#include "types.h"
|
2007-08-28 01:26:33 +02:00
|
|
|
#include "defs.h"
|
|
|
|
#include "param.h"
|
2011-07-29 13:31:27 +02:00
|
|
|
#include "memlayout.h"
|
2006-06-12 17:22:12 +02:00
|
|
|
#include "mmu.h"
|
|
|
|
#include "x86.h"
|
2006-06-22 22:47:23 +02:00
|
|
|
#include "proc.h"
|
2006-07-12 03:48:35 +02:00
|
|
|
#include "spinlock.h"
|
|
|
|
|
2009-05-31 07:12:21 +02:00
|
|
|
struct {
|
|
|
|
struct spinlock lock;
|
|
|
|
struct proc proc[NPROC];
|
|
|
|
} ptable;
|
2006-06-12 17:22:12 +02:00
|
|
|
|
2007-08-23 16:35:28 +02:00
|
|
|
static struct proc *initproc;
|
|
|
|
|
2007-08-22 08:01:32 +02:00
|
|
|
int nextpid = 1;
|
2006-07-16 03:15:28 +02:00
|
|
|
extern void forkret(void);
|
2018-09-29 14:30:50 +02:00
|
|
|
|
|
|
|
// we can return two ways out of the kernel and
|
|
|
|
// for new processes we can choose either way
|
Checkpoint port of xv6 to x86-64. Passed usertests on 2 processors a few times.
The x86-64 doesn't just add two levels to page tables to support 64 bit
addresses, but is a different processor. For example, calling conventions,
system calls, and segmentation are different from 32-bit x86. Segmentation is
basically gone, but gs/fs in combination with MSRs can be used to hold a
per-core pointer. In general, x86-64 is more straightforward than 32-bit
x86. The port uses code from sv6 and the xv6 "rsc-amd64" branch.
A summary of the changes is as follows:
- Booting: switch to grub instead of xv6's bootloader (pass -kernel to qemu),
because xv6's boot loader doesn't understand 64bit ELF files. And, we don't
care anymore about booting.
- Makefile: use -m64 instead of -m32 flag for gcc, delete boot loader, xv6.img,
bochs, and memfs. For now dont' use -O2, since usertests with -O2 is bigger than
MAXFILE!
- Update gdb.tmpl to be for i386 or x86-64
- Console/printf: use stdarg.h and treat 64-bit addresses different from ints
(32-bit)
- Update elfhdr to be 64 bit
- entry.S/entryother.S: add code to switch to 64-bit mode: build a simple page
table in 32-bit mode before switching to 64-bit mode, share code for entering
boot processor and APs, and tweak boot gdt. The boot gdt is the gdt that the
kernel proper also uses. (In 64-bit mode, the gdt/segmentation and task state
mostly disappear.)
- exec.c: fix passing argv (64-bit now instead of 32-bit).
- initcode.c: use syscall instead of int.
- kernel.ld: load kernel very high, in top terabyte. 64 bits is a lot of
address space!
- proc.c: initial return is through new syscall path instead of trapret.
- proc.h: update struct cpu to have some scratch space since syscall saves less
state than int, update struct context to reflect x86-64 calling conventions.
- swtch: simplify for x86-64 calling conventions.
- syscall: add fetcharg to handle x86-64 calling convetions (6 arguments are
passed through registers), and fetchaddr to read a 64-bit value from user space.
- sysfile: update to handle pointers from user space (e.g., sys_exec), which are
64 bits.
- trap.c: no special trap vector for sys calls, because x86-64 has a different
plan for system calls.
- trapasm: one plan for syscalls and one plan for traps (interrupt and
exceptions). On x86-64, the kernel is responsible for switching user/kernel
stacks. To do, xv6 keeps some scratch space in the cpu structure, and uses MSR
GS_KERN_BASE to point to the core's cpu structure (using swapgs).
- types.h: add uint64, and change pde_t to uint64
- usertests: exit() when fork fails, which helped in tracking down one of the
bugs in the switch from 32-bit to 64-bit
- vectors: update to make them 64 bits
- vm.c: use bootgdt in kernel too, program MSRs for syscalls and core-local
state (for swapgs), walk 4 levels in walkpgdir, add DEVSPACETOP, use task
segment to set kernel stack for interrupts (but simpler than in 32-bit mode),
add an extra argument to freevm (size of user part of address space) to avoid
checking all entries till KERNBASE (there are MANY TB before the top 1TB).
- x86: update trapframe to have 64-bit entries, which is what the processor
pushes on syscalls and traps. simplify lgdt and lidt, using struct desctr,
which needs the gcc directives packed and aligned.
TODO:
- use int32 instead of int?
- simplify curproc(). xv6 has per-cpu state again, but this time it must have it.
- avoid repetition in walkpgdir
- fix validateint() in usertests.c
- fix bugs (e.g., observed one a case of entering kernel with invalid gs or proc
2018-09-23 14:24:42 +02:00
|
|
|
extern void sysexit(void);
|
2018-09-29 14:30:50 +02:00
|
|
|
extern void trapret(void);
|
2006-06-12 17:22:12 +02:00
|
|
|
|
2010-09-02 20:30:06 +02:00
|
|
|
static void wakeup1(void *chan);
|
|
|
|
|
2006-08-11 00:08:14 +02:00
|
|
|
void
|
|
|
|
pinit(void)
|
|
|
|
{
|
2009-05-31 07:12:21 +02:00
|
|
|
initlock(&ptable.lock, "ptable");
|
2006-08-11 00:08:14 +02:00
|
|
|
}
|
|
|
|
|
2017-02-02 00:04:13 +01:00
|
|
|
// Must be called with interrupts disabled
|
2017-01-31 23:47:16 +01:00
|
|
|
int
|
|
|
|
cpuid() {
|
|
|
|
return mycpu()-cpus;
|
|
|
|
}
|
|
|
|
|
2017-08-29 20:11:59 +02:00
|
|
|
// Must be called with interrupts disabled to avoid the caller being
|
|
|
|
// rescheduled between reading lapicid and running through the loop.
|
2017-02-02 00:04:13 +01:00
|
|
|
struct cpu*
|
|
|
|
mycpu(void)
|
|
|
|
{
|
2017-02-02 02:36:41 +01:00
|
|
|
int apicid, i;
|
|
|
|
|
2017-02-02 01:21:43 +01:00
|
|
|
if(readeflags()&FL_IF)
|
|
|
|
panic("mycpu called with interrupts enabled\n");
|
2017-02-02 02:36:41 +01:00
|
|
|
|
|
|
|
apicid = lapicid();
|
|
|
|
// APIC IDs are not guaranteed to be contiguous. Maybe we should have
|
|
|
|
// a reverse map, or reserve a register to store &cpus[i].
|
|
|
|
for (i = 0; i < ncpu; ++i) {
|
|
|
|
if (cpus[i].apicid == apicid)
|
|
|
|
return &cpus[i];
|
|
|
|
}
|
|
|
|
panic("unknown apicid\n");
|
2017-02-02 00:04:13 +01:00
|
|
|
}
|
|
|
|
|
2017-02-01 02:21:14 +01:00
|
|
|
// Disable interrupts so that we are not rescheduled
|
|
|
|
// while reading proc from the cpu structure
|
|
|
|
struct proc*
|
|
|
|
myproc(void) {
|
|
|
|
struct cpu *c;
|
|
|
|
struct proc *p;
|
|
|
|
pushcli();
|
|
|
|
c = mycpu();
|
|
|
|
p = c->proc;
|
|
|
|
popcli();
|
|
|
|
return p;
|
2017-01-31 23:47:16 +01:00
|
|
|
}
|
|
|
|
|
2009-09-03 09:46:15 +02:00
|
|
|
//PAGEBREAK: 32
|
2007-08-22 08:01:32 +02:00
|
|
|
// Look in the process table for an UNUSED proc.
|
2010-09-13 21:34:44 +02:00
|
|
|
// If found, change state to EMBRYO and initialize
|
|
|
|
// state required to run in the kernel.
|
2007-08-22 08:01:32 +02:00
|
|
|
// Otherwise return 0.
|
|
|
|
static struct proc*
|
|
|
|
allocproc(void)
|
2006-06-12 17:22:12 +02:00
|
|
|
{
|
2007-08-22 08:01:32 +02:00
|
|
|
struct proc *p;
|
2009-07-12 04:28:29 +02:00
|
|
|
char *sp;
|
2006-06-12 17:22:12 +02:00
|
|
|
|
2016-09-15 18:12:05 +02:00
|
|
|
acquire(&ptable.lock);
|
|
|
|
|
2009-07-12 04:28:29 +02:00
|
|
|
for(p = ptable.proc; p < &ptable.proc[NPROC]; p++)
|
|
|
|
if(p->state == UNUSED)
|
2009-05-31 02:28:45 +02:00
|
|
|
goto found;
|
2016-09-15 18:12:05 +02:00
|
|
|
|
|
|
|
release(&ptable.lock);
|
2007-08-22 08:01:32 +02:00
|
|
|
return 0;
|
2009-05-31 02:28:45 +02:00
|
|
|
|
|
|
|
found:
|
2009-07-12 04:28:29 +02:00
|
|
|
p->state = EMBRYO;
|
|
|
|
p->pid = nextpid++;
|
2009-05-31 02:28:45 +02:00
|
|
|
|
2016-09-15 18:12:05 +02:00
|
|
|
release(&ptable.lock);
|
|
|
|
|
2011-09-01 18:02:49 +02:00
|
|
|
// Allocate kernel stack.
|
2010-08-31 18:54:47 +02:00
|
|
|
if((p->kstack = kalloc()) == 0){
|
2009-05-31 02:28:45 +02:00
|
|
|
p->state = UNUSED;
|
|
|
|
return 0;
|
|
|
|
}
|
2009-07-12 04:28:29 +02:00
|
|
|
sp = p->kstack + KSTACKSIZE;
|
2016-08-25 15:13:00 +02:00
|
|
|
|
2009-07-12 04:28:29 +02:00
|
|
|
// Leave room for trap frame.
|
|
|
|
sp -= sizeof *p->tf;
|
2018-09-29 14:30:50 +02:00
|
|
|
|
|
|
|
if ((uint64) sp % 16)
|
|
|
|
panic("misaligned sp");
|
|
|
|
|
2009-07-12 04:28:29 +02:00
|
|
|
p->tf = (struct trapframe*)sp;
|
2016-08-25 15:13:00 +02:00
|
|
|
|
2009-07-12 04:28:29 +02:00
|
|
|
// Set up new context to start executing at forkret,
|
2010-09-13 21:34:44 +02:00
|
|
|
// which returns to trapret.
|
Checkpoint port of xv6 to x86-64. Passed usertests on 2 processors a few times.
The x86-64 doesn't just add two levels to page tables to support 64 bit
addresses, but is a different processor. For example, calling conventions,
system calls, and segmentation are different from 32-bit x86. Segmentation is
basically gone, but gs/fs in combination with MSRs can be used to hold a
per-core pointer. In general, x86-64 is more straightforward than 32-bit
x86. The port uses code from sv6 and the xv6 "rsc-amd64" branch.
A summary of the changes is as follows:
- Booting: switch to grub instead of xv6's bootloader (pass -kernel to qemu),
because xv6's boot loader doesn't understand 64bit ELF files. And, we don't
care anymore about booting.
- Makefile: use -m64 instead of -m32 flag for gcc, delete boot loader, xv6.img,
bochs, and memfs. For now dont' use -O2, since usertests with -O2 is bigger than
MAXFILE!
- Update gdb.tmpl to be for i386 or x86-64
- Console/printf: use stdarg.h and treat 64-bit addresses different from ints
(32-bit)
- Update elfhdr to be 64 bit
- entry.S/entryother.S: add code to switch to 64-bit mode: build a simple page
table in 32-bit mode before switching to 64-bit mode, share code for entering
boot processor and APs, and tweak boot gdt. The boot gdt is the gdt that the
kernel proper also uses. (In 64-bit mode, the gdt/segmentation and task state
mostly disappear.)
- exec.c: fix passing argv (64-bit now instead of 32-bit).
- initcode.c: use syscall instead of int.
- kernel.ld: load kernel very high, in top terabyte. 64 bits is a lot of
address space!
- proc.c: initial return is through new syscall path instead of trapret.
- proc.h: update struct cpu to have some scratch space since syscall saves less
state than int, update struct context to reflect x86-64 calling conventions.
- swtch: simplify for x86-64 calling conventions.
- syscall: add fetcharg to handle x86-64 calling convetions (6 arguments are
passed through registers), and fetchaddr to read a 64-bit value from user space.
- sysfile: update to handle pointers from user space (e.g., sys_exec), which are
64 bits.
- trap.c: no special trap vector for sys calls, because x86-64 has a different
plan for system calls.
- trapasm: one plan for syscalls and one plan for traps (interrupt and
exceptions). On x86-64, the kernel is responsible for switching user/kernel
stacks. To do, xv6 keeps some scratch space in the cpu structure, and uses MSR
GS_KERN_BASE to point to the core's cpu structure (using swapgs).
- types.h: add uint64, and change pde_t to uint64
- usertests: exit() when fork fails, which helped in tracking down one of the
bugs in the switch from 32-bit to 64-bit
- vectors: update to make them 64 bits
- vm.c: use bootgdt in kernel too, program MSRs for syscalls and core-local
state (for swapgs), walk 4 levels in walkpgdir, add DEVSPACETOP, use task
segment to set kernel stack for interrupts (but simpler than in 32-bit mode),
add an extra argument to freevm (size of user part of address space) to avoid
checking all entries till KERNBASE (there are MANY TB before the top 1TB).
- x86: update trapframe to have 64-bit entries, which is what the processor
pushes on syscalls and traps. simplify lgdt and lidt, using struct desctr,
which needs the gcc directives packed and aligned.
TODO:
- use int32 instead of int?
- simplify curproc(). xv6 has per-cpu state again, but this time it must have it.
- avoid repetition in walkpgdir
- fix validateint() in usertests.c
- fix bugs (e.g., observed one a case of entering kernel with invalid gs or proc
2018-09-23 14:24:42 +02:00
|
|
|
sp -= sizeof(uint64);
|
|
|
|
*(uint64*)sp = (uint64)sysexit;
|
2009-07-12 04:28:29 +02:00
|
|
|
|
|
|
|
sp -= sizeof *p->context;
|
|
|
|
p->context = (struct context*)sp;
|
|
|
|
memset(p->context, 0, sizeof *p->context);
|
2018-10-04 00:13:51 +02:00
|
|
|
p->context->rip = (uint64)forkret;
|
2010-09-13 21:34:44 +02:00
|
|
|
|
2009-05-31 02:28:45 +02:00
|
|
|
return p;
|
2006-06-12 17:22:12 +02:00
|
|
|
}
|
|
|
|
|
2009-09-03 09:46:15 +02:00
|
|
|
//PAGEBREAK: 32
|
2009-08-08 10:07:30 +02:00
|
|
|
// Set up first user process.
|
|
|
|
void
|
|
|
|
userinit(void)
|
|
|
|
{
|
|
|
|
struct proc *p;
|
|
|
|
extern char _binary_initcode_start[], _binary_initcode_size[];
|
2016-08-25 15:13:00 +02:00
|
|
|
|
2009-08-08 10:07:30 +02:00
|
|
|
p = allocproc();
|
2016-09-08 20:22:38 +02:00
|
|
|
|
2009-08-08 10:07:30 +02:00
|
|
|
initproc = p;
|
2012-08-23 02:19:37 +02:00
|
|
|
if((p->pgdir = setupkvm()) == 0)
|
2010-07-02 20:51:53 +02:00
|
|
|
panic("userinit: out of memory?");
|
Checkpoint port of xv6 to x86-64. Passed usertests on 2 processors a few times.
The x86-64 doesn't just add two levels to page tables to support 64 bit
addresses, but is a different processor. For example, calling conventions,
system calls, and segmentation are different from 32-bit x86. Segmentation is
basically gone, but gs/fs in combination with MSRs can be used to hold a
per-core pointer. In general, x86-64 is more straightforward than 32-bit
x86. The port uses code from sv6 and the xv6 "rsc-amd64" branch.
A summary of the changes is as follows:
- Booting: switch to grub instead of xv6's bootloader (pass -kernel to qemu),
because xv6's boot loader doesn't understand 64bit ELF files. And, we don't
care anymore about booting.
- Makefile: use -m64 instead of -m32 flag for gcc, delete boot loader, xv6.img,
bochs, and memfs. For now dont' use -O2, since usertests with -O2 is bigger than
MAXFILE!
- Update gdb.tmpl to be for i386 or x86-64
- Console/printf: use stdarg.h and treat 64-bit addresses different from ints
(32-bit)
- Update elfhdr to be 64 bit
- entry.S/entryother.S: add code to switch to 64-bit mode: build a simple page
table in 32-bit mode before switching to 64-bit mode, share code for entering
boot processor and APs, and tweak boot gdt. The boot gdt is the gdt that the
kernel proper also uses. (In 64-bit mode, the gdt/segmentation and task state
mostly disappear.)
- exec.c: fix passing argv (64-bit now instead of 32-bit).
- initcode.c: use syscall instead of int.
- kernel.ld: load kernel very high, in top terabyte. 64 bits is a lot of
address space!
- proc.c: initial return is through new syscall path instead of trapret.
- proc.h: update struct cpu to have some scratch space since syscall saves less
state than int, update struct context to reflect x86-64 calling conventions.
- swtch: simplify for x86-64 calling conventions.
- syscall: add fetcharg to handle x86-64 calling convetions (6 arguments are
passed through registers), and fetchaddr to read a 64-bit value from user space.
- sysfile: update to handle pointers from user space (e.g., sys_exec), which are
64 bits.
- trap.c: no special trap vector for sys calls, because x86-64 has a different
plan for system calls.
- trapasm: one plan for syscalls and one plan for traps (interrupt and
exceptions). On x86-64, the kernel is responsible for switching user/kernel
stacks. To do, xv6 keeps some scratch space in the cpu structure, and uses MSR
GS_KERN_BASE to point to the core's cpu structure (using swapgs).
- types.h: add uint64, and change pde_t to uint64
- usertests: exit() when fork fails, which helped in tracking down one of the
bugs in the switch from 32-bit to 64-bit
- vectors: update to make them 64 bits
- vm.c: use bootgdt in kernel too, program MSRs for syscalls and core-local
state (for swapgs), walk 4 levels in walkpgdir, add DEVSPACETOP, use task
segment to set kernel stack for interrupts (but simpler than in 32-bit mode),
add an extra argument to freevm (size of user part of address space) to avoid
checking all entries till KERNBASE (there are MANY TB before the top 1TB).
- x86: update trapframe to have 64-bit entries, which is what the processor
pushes on syscalls and traps. simplify lgdt and lidt, using struct desctr,
which needs the gcc directives packed and aligned.
TODO:
- use int32 instead of int?
- simplify curproc(). xv6 has per-cpu state again, but this time it must have it.
- avoid repetition in walkpgdir
- fix validateint() in usertests.c
- fix bugs (e.g., observed one a case of entering kernel with invalid gs or proc
2018-09-23 14:24:42 +02:00
|
|
|
inituvm(p->pgdir, _binary_initcode_start, (uint64)_binary_initcode_size);
|
2010-09-02 21:37:05 +02:00
|
|
|
p->sz = PGSIZE;
|
2009-08-08 10:07:30 +02:00
|
|
|
memset(p->tf, 0, sizeof(*p->tf));
|
2018-10-04 02:14:36 +02:00
|
|
|
p->tf->cs = SEG_UCODE | DPL_USER;
|
|
|
|
p->tf->ss = SEG_UDATA | DPL_USER;
|
Checkpoint port of xv6 to x86-64. Passed usertests on 2 processors a few times.
The x86-64 doesn't just add two levels to page tables to support 64 bit
addresses, but is a different processor. For example, calling conventions,
system calls, and segmentation are different from 32-bit x86. Segmentation is
basically gone, but gs/fs in combination with MSRs can be used to hold a
per-core pointer. In general, x86-64 is more straightforward than 32-bit
x86. The port uses code from sv6 and the xv6 "rsc-amd64" branch.
A summary of the changes is as follows:
- Booting: switch to grub instead of xv6's bootloader (pass -kernel to qemu),
because xv6's boot loader doesn't understand 64bit ELF files. And, we don't
care anymore about booting.
- Makefile: use -m64 instead of -m32 flag for gcc, delete boot loader, xv6.img,
bochs, and memfs. For now dont' use -O2, since usertests with -O2 is bigger than
MAXFILE!
- Update gdb.tmpl to be for i386 or x86-64
- Console/printf: use stdarg.h and treat 64-bit addresses different from ints
(32-bit)
- Update elfhdr to be 64 bit
- entry.S/entryother.S: add code to switch to 64-bit mode: build a simple page
table in 32-bit mode before switching to 64-bit mode, share code for entering
boot processor and APs, and tweak boot gdt. The boot gdt is the gdt that the
kernel proper also uses. (In 64-bit mode, the gdt/segmentation and task state
mostly disappear.)
- exec.c: fix passing argv (64-bit now instead of 32-bit).
- initcode.c: use syscall instead of int.
- kernel.ld: load kernel very high, in top terabyte. 64 bits is a lot of
address space!
- proc.c: initial return is through new syscall path instead of trapret.
- proc.h: update struct cpu to have some scratch space since syscall saves less
state than int, update struct context to reflect x86-64 calling conventions.
- swtch: simplify for x86-64 calling conventions.
- syscall: add fetcharg to handle x86-64 calling convetions (6 arguments are
passed through registers), and fetchaddr to read a 64-bit value from user space.
- sysfile: update to handle pointers from user space (e.g., sys_exec), which are
64 bits.
- trap.c: no special trap vector for sys calls, because x86-64 has a different
plan for system calls.
- trapasm: one plan for syscalls and one plan for traps (interrupt and
exceptions). On x86-64, the kernel is responsible for switching user/kernel
stacks. To do, xv6 keeps some scratch space in the cpu structure, and uses MSR
GS_KERN_BASE to point to the core's cpu structure (using swapgs).
- types.h: add uint64, and change pde_t to uint64
- usertests: exit() when fork fails, which helped in tracking down one of the
bugs in the switch from 32-bit to 64-bit
- vectors: update to make them 64 bits
- vm.c: use bootgdt in kernel too, program MSRs for syscalls and core-local
state (for swapgs), walk 4 levels in walkpgdir, add DEVSPACETOP, use task
segment to set kernel stack for interrupts (but simpler than in 32-bit mode),
add an extra argument to freevm (size of user part of address space) to avoid
checking all entries till KERNBASE (there are MANY TB before the top 1TB).
- x86: update trapframe to have 64-bit entries, which is what the processor
pushes on syscalls and traps. simplify lgdt and lidt, using struct desctr,
which needs the gcc directives packed and aligned.
TODO:
- use int32 instead of int?
- simplify curproc(). xv6 has per-cpu state again, but this time it must have it.
- avoid repetition in walkpgdir
- fix validateint() in usertests.c
- fix bugs (e.g., observed one a case of entering kernel with invalid gs or proc
2018-09-23 14:24:42 +02:00
|
|
|
p->tf->r11 = FL_IF;
|
|
|
|
p->tf->rsp = PGSIZE;
|
|
|
|
p->tf->rcx = 0; // beginning of initcode.S
|
2009-08-08 10:07:30 +02:00
|
|
|
|
|
|
|
safestrcpy(p->name, "initcode", sizeof(p->name));
|
|
|
|
p->cwd = namei("/");
|
|
|
|
|
2016-09-08 20:22:38 +02:00
|
|
|
// this assignment to p->state lets other cores
|
|
|
|
// run this process. the acquire forces the above
|
|
|
|
// writes to be visible, and the lock is also needed
|
|
|
|
// because the assignment might not be atomic.
|
|
|
|
acquire(&ptable.lock);
|
|
|
|
|
2009-08-08 10:07:30 +02:00
|
|
|
p->state = RUNNABLE;
|
2016-08-13 09:44:13 +02:00
|
|
|
|
|
|
|
release(&ptable.lock);
|
2009-08-08 10:07:30 +02:00
|
|
|
}
|
|
|
|
|
2006-09-08 16:26:51 +02:00
|
|
|
// Grow current process's memory by n bytes.
|
2009-05-31 02:28:45 +02:00
|
|
|
// Return 0 on success, -1 on failure.
|
2006-09-08 16:26:51 +02:00
|
|
|
int
|
|
|
|
growproc(int n)
|
|
|
|
{
|
2011-01-11 19:01:13 +01:00
|
|
|
uint sz;
|
2017-02-01 02:21:14 +01:00
|
|
|
struct proc *curproc = myproc();
|
2016-08-25 15:13:00 +02:00
|
|
|
|
2017-02-01 02:21:14 +01:00
|
|
|
sz = curproc->sz;
|
2010-08-10 23:08:41 +02:00
|
|
|
if(n > 0){
|
2017-02-01 02:21:14 +01:00
|
|
|
if((sz = allocuvm(curproc->pgdir, sz, sz + n)) == 0)
|
2010-08-10 23:08:41 +02:00
|
|
|
return -1;
|
|
|
|
} else if(n < 0){
|
2017-02-01 02:21:14 +01:00
|
|
|
if((sz = deallocuvm(curproc->pgdir, sz, sz + n)) == 0)
|
2010-08-10 23:08:41 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2017-02-01 02:21:14 +01:00
|
|
|
curproc->sz = sz;
|
|
|
|
switchuvm(curproc);
|
2009-05-31 02:28:45 +02:00
|
|
|
return 0;
|
2006-09-08 16:26:51 +02:00
|
|
|
}
|
|
|
|
|
2006-07-16 03:47:40 +02:00
|
|
|
// Create a new process copying p as the parent.
|
2007-08-22 08:01:32 +02:00
|
|
|
// Sets up stack to return as if from system call.
|
|
|
|
// Caller must set state of returned proc to RUNNABLE.
|
2009-05-31 02:38:51 +02:00
|
|
|
int
|
|
|
|
fork(void)
|
2006-06-12 17:22:12 +02:00
|
|
|
{
|
2009-05-31 02:38:51 +02:00
|
|
|
int i, pid;
|
2006-06-12 17:22:12 +02:00
|
|
|
struct proc *np;
|
2017-02-01 02:21:14 +01:00
|
|
|
struct proc *curproc = myproc();
|
2006-06-12 17:22:12 +02:00
|
|
|
|
2006-07-16 03:47:40 +02:00
|
|
|
// Allocate process.
|
2016-08-13 09:44:13 +02:00
|
|
|
if((np = allocproc()) == 0){
|
2009-05-31 02:38:51 +02:00
|
|
|
return -1;
|
2016-08-13 09:44:13 +02:00
|
|
|
}
|
2006-07-12 03:48:35 +02:00
|
|
|
|
2017-01-31 23:47:16 +01:00
|
|
|
// Copy process state from proc.
|
2017-02-01 02:21:14 +01:00
|
|
|
if((np->pgdir = copyuvm(curproc->pgdir, curproc->sz)) == 0){
|
2010-08-31 18:54:47 +02:00
|
|
|
kfree(np->kstack);
|
2009-05-31 02:28:45 +02:00
|
|
|
np->kstack = 0;
|
2006-07-12 03:48:35 +02:00
|
|
|
np->state = UNUSED;
|
2009-05-31 02:38:51 +02:00
|
|
|
return -1;
|
2006-06-12 17:22:12 +02:00
|
|
|
}
|
2017-02-01 02:21:14 +01:00
|
|
|
np->sz = curproc->sz;
|
|
|
|
np->parent = curproc;
|
|
|
|
*np->tf = *curproc->tf;
|
2006-09-06 19:27:19 +02:00
|
|
|
|
2009-05-31 02:38:51 +02:00
|
|
|
// Clear %eax so that fork returns 0 in the child.
|
Checkpoint port of xv6 to x86-64. Passed usertests on 2 processors a few times.
The x86-64 doesn't just add two levels to page tables to support 64 bit
addresses, but is a different processor. For example, calling conventions,
system calls, and segmentation are different from 32-bit x86. Segmentation is
basically gone, but gs/fs in combination with MSRs can be used to hold a
per-core pointer. In general, x86-64 is more straightforward than 32-bit
x86. The port uses code from sv6 and the xv6 "rsc-amd64" branch.
A summary of the changes is as follows:
- Booting: switch to grub instead of xv6's bootloader (pass -kernel to qemu),
because xv6's boot loader doesn't understand 64bit ELF files. And, we don't
care anymore about booting.
- Makefile: use -m64 instead of -m32 flag for gcc, delete boot loader, xv6.img,
bochs, and memfs. For now dont' use -O2, since usertests with -O2 is bigger than
MAXFILE!
- Update gdb.tmpl to be for i386 or x86-64
- Console/printf: use stdarg.h and treat 64-bit addresses different from ints
(32-bit)
- Update elfhdr to be 64 bit
- entry.S/entryother.S: add code to switch to 64-bit mode: build a simple page
table in 32-bit mode before switching to 64-bit mode, share code for entering
boot processor and APs, and tweak boot gdt. The boot gdt is the gdt that the
kernel proper also uses. (In 64-bit mode, the gdt/segmentation and task state
mostly disappear.)
- exec.c: fix passing argv (64-bit now instead of 32-bit).
- initcode.c: use syscall instead of int.
- kernel.ld: load kernel very high, in top terabyte. 64 bits is a lot of
address space!
- proc.c: initial return is through new syscall path instead of trapret.
- proc.h: update struct cpu to have some scratch space since syscall saves less
state than int, update struct context to reflect x86-64 calling conventions.
- swtch: simplify for x86-64 calling conventions.
- syscall: add fetcharg to handle x86-64 calling convetions (6 arguments are
passed through registers), and fetchaddr to read a 64-bit value from user space.
- sysfile: update to handle pointers from user space (e.g., sys_exec), which are
64 bits.
- trap.c: no special trap vector for sys calls, because x86-64 has a different
plan for system calls.
- trapasm: one plan for syscalls and one plan for traps (interrupt and
exceptions). On x86-64, the kernel is responsible for switching user/kernel
stacks. To do, xv6 keeps some scratch space in the cpu structure, and uses MSR
GS_KERN_BASE to point to the core's cpu structure (using swapgs).
- types.h: add uint64, and change pde_t to uint64
- usertests: exit() when fork fails, which helped in tracking down one of the
bugs in the switch from 32-bit to 64-bit
- vectors: update to make them 64 bits
- vm.c: use bootgdt in kernel too, program MSRs for syscalls and core-local
state (for swapgs), walk 4 levels in walkpgdir, add DEVSPACETOP, use task
segment to set kernel stack for interrupts (but simpler than in 32-bit mode),
add an extra argument to freevm (size of user part of address space) to avoid
checking all entries till KERNBASE (there are MANY TB before the top 1TB).
- x86: update trapframe to have 64-bit entries, which is what the processor
pushes on syscalls and traps. simplify lgdt and lidt, using struct desctr,
which needs the gcc directives packed and aligned.
TODO:
- use int32 instead of int?
- simplify curproc(). xv6 has per-cpu state again, but this time it must have it.
- avoid repetition in walkpgdir
- fix validateint() in usertests.c
- fix bugs (e.g., observed one a case of entering kernel with invalid gs or proc
2018-09-23 14:24:42 +02:00
|
|
|
np->tf->rax = 0;
|
2007-08-21 21:22:08 +02:00
|
|
|
|
2009-05-31 02:38:51 +02:00
|
|
|
for(i = 0; i < NOFILE; i++)
|
2017-02-01 02:21:14 +01:00
|
|
|
if(curproc->ofile[i])
|
|
|
|
np->ofile[i] = filedup(curproc->ofile[i]);
|
|
|
|
np->cwd = idup(curproc->cwd);
|
2014-08-04 12:13:49 +02:00
|
|
|
|
2017-02-01 02:21:14 +01:00
|
|
|
safestrcpy(np->name, curproc->name, sizeof(curproc->name));
|
2016-08-25 15:13:00 +02:00
|
|
|
|
2009-05-31 02:38:51 +02:00
|
|
|
pid = np->pid;
|
2014-08-04 12:13:49 +02:00
|
|
|
|
2016-09-08 20:22:38 +02:00
|
|
|
acquire(&ptable.lock);
|
|
|
|
|
2009-05-31 02:38:51 +02:00
|
|
|
np->state = RUNNABLE;
|
2016-08-13 09:44:13 +02:00
|
|
|
|
2014-08-04 12:13:49 +02:00
|
|
|
release(&ptable.lock);
|
2016-08-25 15:13:00 +02:00
|
|
|
|
2009-05-31 02:38:51 +02:00
|
|
|
return pid;
|
2006-06-12 17:22:12 +02:00
|
|
|
}
|
|
|
|
|
2010-09-02 10:15:17 +02:00
|
|
|
// Exit the current process. Does not return.
|
|
|
|
// An exited process remains in the zombie state
|
|
|
|
// until its parent calls wait() to find out it exited.
|
|
|
|
void
|
|
|
|
exit(void)
|
|
|
|
{
|
2017-02-01 02:21:14 +01:00
|
|
|
struct proc *curproc = myproc();
|
2010-09-02 10:15:17 +02:00
|
|
|
struct proc *p;
|
|
|
|
int fd;
|
|
|
|
|
2017-02-01 02:21:14 +01:00
|
|
|
if(curproc == initproc)
|
2010-09-02 10:15:17 +02:00
|
|
|
panic("init exiting");
|
|
|
|
|
|
|
|
// Close all open files.
|
|
|
|
for(fd = 0; fd < NOFILE; fd++){
|
2017-02-01 02:21:14 +01:00
|
|
|
if(curproc->ofile[fd]){
|
|
|
|
fileclose(curproc->ofile[fd]);
|
|
|
|
curproc->ofile[fd] = 0;
|
2010-09-02 10:15:17 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-27 23:15:30 +02:00
|
|
|
begin_op();
|
2017-02-01 02:21:14 +01:00
|
|
|
iput(curproc->cwd);
|
2014-08-27 23:15:30 +02:00
|
|
|
end_op();
|
2017-02-01 02:21:14 +01:00
|
|
|
curproc->cwd = 0;
|
2010-09-02 10:15:17 +02:00
|
|
|
|
|
|
|
acquire(&ptable.lock);
|
|
|
|
|
|
|
|
// Parent might be sleeping in wait().
|
2017-02-01 02:21:14 +01:00
|
|
|
wakeup1(curproc->parent);
|
2010-09-02 10:15:17 +02:00
|
|
|
|
|
|
|
// Pass abandoned children to init.
|
|
|
|
for(p = ptable.proc; p < &ptable.proc[NPROC]; p++){
|
2017-02-01 02:21:14 +01:00
|
|
|
if(p->parent == curproc){
|
2010-09-02 10:15:17 +02:00
|
|
|
p->parent = initproc;
|
|
|
|
if(p->state == ZOMBIE)
|
|
|
|
wakeup1(initproc);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Jump into the scheduler, never to return.
|
2017-02-01 02:21:14 +01:00
|
|
|
curproc->state = ZOMBIE;
|
2010-09-02 10:15:17 +02:00
|
|
|
sched();
|
|
|
|
panic("zombie exit");
|
|
|
|
}
|
|
|
|
|
|
|
|
// Wait for a child process to exit and return its pid.
|
|
|
|
// Return -1 if this process has no children.
|
|
|
|
int
|
|
|
|
wait(void)
|
|
|
|
{
|
|
|
|
struct proc *p;
|
|
|
|
int havekids, pid;
|
2017-02-01 02:21:14 +01:00
|
|
|
struct proc *curproc = myproc();
|
|
|
|
|
2010-09-02 10:15:17 +02:00
|
|
|
acquire(&ptable.lock);
|
|
|
|
for(;;){
|
2016-09-08 20:22:38 +02:00
|
|
|
// Scan through table looking for exited children.
|
2010-09-02 10:15:17 +02:00
|
|
|
havekids = 0;
|
|
|
|
for(p = ptable.proc; p < &ptable.proc[NPROC]; p++){
|
2017-02-01 02:21:14 +01:00
|
|
|
if(p->parent != curproc)
|
2010-09-02 10:15:17 +02:00
|
|
|
continue;
|
|
|
|
havekids = 1;
|
|
|
|
if(p->state == ZOMBIE){
|
|
|
|
// Found one.
|
|
|
|
pid = p->pid;
|
|
|
|
kfree(p->kstack);
|
|
|
|
p->kstack = 0;
|
Checkpoint port of xv6 to x86-64. Passed usertests on 2 processors a few times.
The x86-64 doesn't just add two levels to page tables to support 64 bit
addresses, but is a different processor. For example, calling conventions,
system calls, and segmentation are different from 32-bit x86. Segmentation is
basically gone, but gs/fs in combination with MSRs can be used to hold a
per-core pointer. In general, x86-64 is more straightforward than 32-bit
x86. The port uses code from sv6 and the xv6 "rsc-amd64" branch.
A summary of the changes is as follows:
- Booting: switch to grub instead of xv6's bootloader (pass -kernel to qemu),
because xv6's boot loader doesn't understand 64bit ELF files. And, we don't
care anymore about booting.
- Makefile: use -m64 instead of -m32 flag for gcc, delete boot loader, xv6.img,
bochs, and memfs. For now dont' use -O2, since usertests with -O2 is bigger than
MAXFILE!
- Update gdb.tmpl to be for i386 or x86-64
- Console/printf: use stdarg.h and treat 64-bit addresses different from ints
(32-bit)
- Update elfhdr to be 64 bit
- entry.S/entryother.S: add code to switch to 64-bit mode: build a simple page
table in 32-bit mode before switching to 64-bit mode, share code for entering
boot processor and APs, and tweak boot gdt. The boot gdt is the gdt that the
kernel proper also uses. (In 64-bit mode, the gdt/segmentation and task state
mostly disappear.)
- exec.c: fix passing argv (64-bit now instead of 32-bit).
- initcode.c: use syscall instead of int.
- kernel.ld: load kernel very high, in top terabyte. 64 bits is a lot of
address space!
- proc.c: initial return is through new syscall path instead of trapret.
- proc.h: update struct cpu to have some scratch space since syscall saves less
state than int, update struct context to reflect x86-64 calling conventions.
- swtch: simplify for x86-64 calling conventions.
- syscall: add fetcharg to handle x86-64 calling convetions (6 arguments are
passed through registers), and fetchaddr to read a 64-bit value from user space.
- sysfile: update to handle pointers from user space (e.g., sys_exec), which are
64 bits.
- trap.c: no special trap vector for sys calls, because x86-64 has a different
plan for system calls.
- trapasm: one plan for syscalls and one plan for traps (interrupt and
exceptions). On x86-64, the kernel is responsible for switching user/kernel
stacks. To do, xv6 keeps some scratch space in the cpu structure, and uses MSR
GS_KERN_BASE to point to the core's cpu structure (using swapgs).
- types.h: add uint64, and change pde_t to uint64
- usertests: exit() when fork fails, which helped in tracking down one of the
bugs in the switch from 32-bit to 64-bit
- vectors: update to make them 64 bits
- vm.c: use bootgdt in kernel too, program MSRs for syscalls and core-local
state (for swapgs), walk 4 levels in walkpgdir, add DEVSPACETOP, use task
segment to set kernel stack for interrupts (but simpler than in 32-bit mode),
add an extra argument to freevm (size of user part of address space) to avoid
checking all entries till KERNBASE (there are MANY TB before the top 1TB).
- x86: update trapframe to have 64-bit entries, which is what the processor
pushes on syscalls and traps. simplify lgdt and lidt, using struct desctr,
which needs the gcc directives packed and aligned.
TODO:
- use int32 instead of int?
- simplify curproc(). xv6 has per-cpu state again, but this time it must have it.
- avoid repetition in walkpgdir
- fix validateint() in usertests.c
- fix bugs (e.g., observed one a case of entering kernel with invalid gs or proc
2018-09-23 14:24:42 +02:00
|
|
|
freevm(p->pgdir, p->sz);
|
|
|
|
p->pid = 0;
|
2010-09-02 10:15:17 +02:00
|
|
|
p->parent = 0;
|
|
|
|
p->name[0] = 0;
|
|
|
|
p->killed = 0;
|
2016-08-13 09:44:13 +02:00
|
|
|
p->state = UNUSED;
|
2010-09-02 10:15:17 +02:00
|
|
|
release(&ptable.lock);
|
|
|
|
return pid;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// No point waiting if we don't have any children.
|
2017-02-01 02:21:14 +01:00
|
|
|
if(!havekids || curproc->killed){
|
2010-09-02 10:15:17 +02:00
|
|
|
release(&ptable.lock);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Wait for children to exit. (See wakeup1 call in proc_exit.)
|
2017-02-01 02:21:14 +01:00
|
|
|
sleep(curproc, &ptable.lock); //DOC: wait-sleep
|
2010-09-02 10:15:17 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-09-07 16:12:30 +02:00
|
|
|
//PAGEBREAK: 42
|
2006-09-06 19:27:19 +02:00
|
|
|
// Per-CPU process scheduler.
|
2006-07-16 03:15:28 +02:00
|
|
|
// Each CPU calls scheduler() after setting itself up.
|
|
|
|
// Scheduler never returns. It loops, doing:
|
|
|
|
// - choose a process to run
|
2007-08-30 19:39:56 +02:00
|
|
|
// - swtch to start running that process
|
|
|
|
// - eventually that process transfers control
|
|
|
|
// via swtch back to the scheduler.
|
2006-06-12 17:22:12 +02:00
|
|
|
void
|
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 03:07:40 +02:00
|
|
|
scheduler(void)
|
2006-06-12 17:22:12 +02:00
|
|
|
{
|
2006-07-16 03:15:28 +02:00
|
|
|
struct proc *p;
|
2017-02-01 02:21:14 +01:00
|
|
|
struct cpu *c = mycpu();
|
2018-09-29 14:30:50 +02:00
|
|
|
|
2017-02-02 00:04:13 +01:00
|
|
|
c->proc = 0;
|
2006-07-16 03:15:28 +02:00
|
|
|
for(;;){
|
2009-07-12 04:28:29 +02:00
|
|
|
// Enable interrupts on this processor.
|
2007-09-27 23:25:37 +02:00
|
|
|
sti();
|
2018-09-29 14:30:50 +02:00
|
|
|
|
2006-07-16 03:15:28 +02:00
|
|
|
// Loop over process table looking for process to run.
|
2009-05-31 07:12:21 +02:00
|
|
|
acquire(&ptable.lock);
|
|
|
|
for(p = ptable.proc; p < &ptable.proc[NPROC]; p++){
|
2006-07-16 03:15:28 +02:00
|
|
|
if(p->state != RUNNABLE)
|
|
|
|
continue;
|
2006-09-06 19:27:19 +02:00
|
|
|
|
|
|
|
// Switch to chosen process. It is the process's job
|
2009-05-31 07:12:21 +02:00
|
|
|
// to release ptable.lock and then reacquire it
|
2006-07-16 03:15:28 +02:00
|
|
|
// before jumping back to us.
|
2017-02-01 02:21:14 +01:00
|
|
|
c->proc = p;
|
2010-08-06 17:12:18 +02:00
|
|
|
switchuvm(p);
|
2006-07-16 03:15:28 +02:00
|
|
|
p->state = RUNNING;
|
2017-02-02 00:04:13 +01:00
|
|
|
|
|
|
|
swtch(&(c->scheduler), p->context);
|
2010-08-06 17:12:18 +02:00
|
|
|
switchkvm();
|
2006-09-06 19:27:19 +02:00
|
|
|
|
|
|
|
// Process is done running for now.
|
2006-07-16 03:15:28 +02:00
|
|
|
// It should have changed its p->state before coming back.
|
2017-02-01 02:21:14 +01:00
|
|
|
c->proc = 0;
|
2006-07-12 03:48:35 +02:00
|
|
|
}
|
2009-05-31 07:12:21 +02:00
|
|
|
release(&ptable.lock);
|
2007-09-27 23:25:37 +02:00
|
|
|
|
2006-06-12 17:22:12 +02:00
|
|
|
}
|
2006-07-16 03:15:28 +02:00
|
|
|
}
|
2006-06-12 17:22:12 +02:00
|
|
|
|
2009-07-12 04:28:29 +02:00
|
|
|
// Enter scheduler. Must hold only ptable.lock
|
2016-09-02 11:40:54 +02:00
|
|
|
// and have changed proc->state. Saves and restores
|
|
|
|
// intena because intena is a property of this
|
|
|
|
// kernel thread, not this CPU. It should
|
|
|
|
// be proc->intena and proc->ncli, but that would
|
|
|
|
// break in the few places where a lock is held but
|
|
|
|
// there's no process.
|
2006-07-16 03:15:28 +02:00
|
|
|
void
|
|
|
|
sched(void)
|
|
|
|
{
|
2008-10-15 07:01:39 +02:00
|
|
|
int intena;
|
2017-02-01 02:21:14 +01:00
|
|
|
struct proc *p = myproc();
|
2008-10-15 07:01:39 +02:00
|
|
|
|
2009-05-31 07:12:21 +02:00
|
|
|
if(!holding(&ptable.lock))
|
|
|
|
panic("sched ptable.lock");
|
2017-01-31 23:47:16 +01:00
|
|
|
if(mycpu()->ncli != 1)
|
2006-09-07 18:54:00 +02:00
|
|
|
panic("sched locks");
|
2017-02-01 02:21:14 +01:00
|
|
|
if(p->state == RUNNING)
|
2009-07-12 04:28:29 +02:00
|
|
|
panic("sched running");
|
|
|
|
if(readeflags()&FL_IF)
|
|
|
|
panic("sched interruptible");
|
2017-01-31 23:47:16 +01:00
|
|
|
intena = mycpu()->intena;
|
2017-02-02 00:04:13 +01:00
|
|
|
swtch(&p->context, mycpu()->scheduler);
|
2017-01-31 23:47:16 +01:00
|
|
|
mycpu()->intena = intena;
|
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 03:07:40 +02:00
|
|
|
}
|
|
|
|
|
2006-07-16 03:15:28 +02:00
|
|
|
// Give up the CPU for one scheduling round.
|
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 03:07:40 +02:00
|
|
|
void
|
2006-07-16 03:47:40 +02:00
|
|
|
yield(void)
|
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 03:07:40 +02:00
|
|
|
{
|
2009-07-12 04:28:29 +02:00
|
|
|
acquire(&ptable.lock); //DOC: yieldlock
|
2017-01-31 23:47:16 +01:00
|
|
|
myproc()->state = RUNNABLE;
|
2006-07-16 03:15:28 +02:00
|
|
|
sched();
|
2009-05-31 07:12:21 +02:00
|
|
|
release(&ptable.lock);
|
2006-06-12 17:22:12 +02:00
|
|
|
}
|
2006-06-15 21:58:01 +02:00
|
|
|
|
2006-08-29 23:35:30 +02:00
|
|
|
// A fork child's very first scheduling by scheduler()
|
2007-08-30 19:39:56 +02:00
|
|
|
// will swtch here. "Return" to user space.
|
2006-07-16 03:47:40 +02:00
|
|
|
void
|
|
|
|
forkret(void)
|
|
|
|
{
|
2011-08-23 02:05:15 +02:00
|
|
|
static int first = 1;
|
2009-05-31 07:12:21 +02:00
|
|
|
// Still holding ptable.lock from scheduler.
|
|
|
|
release(&ptable.lock);
|
2011-08-23 02:05:15 +02:00
|
|
|
|
|
|
|
if (first) {
|
2011-08-23 02:07:18 +02:00
|
|
|
// Some initialization functions must be run in the context
|
2016-08-25 15:13:00 +02:00
|
|
|
// of a regular process (e.g., they call sleep), and thus cannot
|
2011-08-23 02:07:18 +02:00
|
|
|
// be run from main().
|
2011-08-23 02:05:15 +02:00
|
|
|
first = 0;
|
2015-06-27 18:39:13 +02:00
|
|
|
iinit(ROOTDEV);
|
|
|
|
initlog(ROOTDEV);
|
2011-08-23 02:05:15 +02:00
|
|
|
}
|
Checkpoint port of xv6 to x86-64. Passed usertests on 2 processors a few times.
The x86-64 doesn't just add two levels to page tables to support 64 bit
addresses, but is a different processor. For example, calling conventions,
system calls, and segmentation are different from 32-bit x86. Segmentation is
basically gone, but gs/fs in combination with MSRs can be used to hold a
per-core pointer. In general, x86-64 is more straightforward than 32-bit
x86. The port uses code from sv6 and the xv6 "rsc-amd64" branch.
A summary of the changes is as follows:
- Booting: switch to grub instead of xv6's bootloader (pass -kernel to qemu),
because xv6's boot loader doesn't understand 64bit ELF files. And, we don't
care anymore about booting.
- Makefile: use -m64 instead of -m32 flag for gcc, delete boot loader, xv6.img,
bochs, and memfs. For now dont' use -O2, since usertests with -O2 is bigger than
MAXFILE!
- Update gdb.tmpl to be for i386 or x86-64
- Console/printf: use stdarg.h and treat 64-bit addresses different from ints
(32-bit)
- Update elfhdr to be 64 bit
- entry.S/entryother.S: add code to switch to 64-bit mode: build a simple page
table in 32-bit mode before switching to 64-bit mode, share code for entering
boot processor and APs, and tweak boot gdt. The boot gdt is the gdt that the
kernel proper also uses. (In 64-bit mode, the gdt/segmentation and task state
mostly disappear.)
- exec.c: fix passing argv (64-bit now instead of 32-bit).
- initcode.c: use syscall instead of int.
- kernel.ld: load kernel very high, in top terabyte. 64 bits is a lot of
address space!
- proc.c: initial return is through new syscall path instead of trapret.
- proc.h: update struct cpu to have some scratch space since syscall saves less
state than int, update struct context to reflect x86-64 calling conventions.
- swtch: simplify for x86-64 calling conventions.
- syscall: add fetcharg to handle x86-64 calling convetions (6 arguments are
passed through registers), and fetchaddr to read a 64-bit value from user space.
- sysfile: update to handle pointers from user space (e.g., sys_exec), which are
64 bits.
- trap.c: no special trap vector for sys calls, because x86-64 has a different
plan for system calls.
- trapasm: one plan for syscalls and one plan for traps (interrupt and
exceptions). On x86-64, the kernel is responsible for switching user/kernel
stacks. To do, xv6 keeps some scratch space in the cpu structure, and uses MSR
GS_KERN_BASE to point to the core's cpu structure (using swapgs).
- types.h: add uint64, and change pde_t to uint64
- usertests: exit() when fork fails, which helped in tracking down one of the
bugs in the switch from 32-bit to 64-bit
- vectors: update to make them 64 bits
- vm.c: use bootgdt in kernel too, program MSRs for syscalls and core-local
state (for swapgs), walk 4 levels in walkpgdir, add DEVSPACETOP, use task
segment to set kernel stack for interrupts (but simpler than in 32-bit mode),
add an extra argument to freevm (size of user part of address space) to avoid
checking all entries till KERNBASE (there are MANY TB before the top 1TB).
- x86: update trapframe to have 64-bit entries, which is what the processor
pushes on syscalls and traps. simplify lgdt and lidt, using struct desctr,
which needs the gcc directives packed and aligned.
TODO:
- use int32 instead of int?
- simplify curproc(). xv6 has per-cpu state again, but this time it must have it.
- avoid repetition in walkpgdir
- fix validateint() in usertests.c
- fix bugs (e.g., observed one a case of entering kernel with invalid gs or proc
2018-09-23 14:24:42 +02:00
|
|
|
|
2009-07-12 04:28:29 +02:00
|
|
|
// Return to "caller", actually trapret (see allocproc).
|
2006-07-16 03:47:40 +02:00
|
|
|
}
|
|
|
|
|
2006-07-16 03:15:28 +02:00
|
|
|
// Atomically release lock and sleep on chan.
|
2009-08-31 08:02:08 +02:00
|
|
|
// Reacquires lock when awakened.
|
2006-06-15 21:58:01 +02:00
|
|
|
void
|
2006-07-16 03:15:28 +02:00
|
|
|
sleep(void *chan, struct spinlock *lk)
|
2006-06-15 21:58:01 +02:00
|
|
|
{
|
2017-02-01 02:21:14 +01:00
|
|
|
struct proc *p = myproc();
|
|
|
|
|
|
|
|
if(p == 0)
|
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 03:07:40 +02:00
|
|
|
panic("sleep");
|
2006-07-15 14:03:57 +02:00
|
|
|
|
2006-07-17 07:00:25 +02:00
|
|
|
if(lk == 0)
|
|
|
|
panic("sleep without lk");
|
|
|
|
|
2009-05-31 07:12:21 +02:00
|
|
|
// Must acquire ptable.lock in order to
|
2006-07-16 03:15:28 +02:00
|
|
|
// change p->state and then call sched.
|
2009-05-31 07:12:21 +02:00
|
|
|
// Once we hold ptable.lock, we can be
|
2006-07-16 03:15:28 +02:00
|
|
|
// guaranteed that we won't miss any wakeup
|
2009-05-31 07:12:21 +02:00
|
|
|
// (wakeup runs with ptable.lock locked),
|
2006-07-16 03:15:28 +02:00
|
|
|
// so it's okay to release lk.
|
2009-07-13 03:33:37 +02:00
|
|
|
if(lk != &ptable.lock){ //DOC: sleeplock0
|
|
|
|
acquire(&ptable.lock); //DOC: sleeplock1
|
2006-07-16 03:15:28 +02:00
|
|
|
release(lk);
|
|
|
|
}
|
|
|
|
// Go to sleep.
|
2017-02-01 02:21:14 +01:00
|
|
|
p->chan = chan;
|
|
|
|
p->state = SLEEPING;
|
|
|
|
|
2006-07-16 03:15:28 +02:00
|
|
|
sched();
|
2006-07-15 14:03:57 +02:00
|
|
|
|
2006-07-16 03:15:28 +02:00
|
|
|
// Tidy up.
|
2017-02-01 02:21:14 +01:00
|
|
|
p->chan = 0;
|
2006-07-16 03:15:28 +02:00
|
|
|
|
|
|
|
// Reacquire original lock.
|
2009-07-13 03:33:37 +02:00
|
|
|
if(lk != &ptable.lock){ //DOC: sleeplock2
|
2009-05-31 07:12:21 +02:00
|
|
|
release(&ptable.lock);
|
2006-07-16 03:15:28 +02:00
|
|
|
acquire(lk);
|
|
|
|
}
|
2006-06-15 21:58:01 +02:00
|
|
|
}
|
|
|
|
|
2007-08-22 08:01:32 +02:00
|
|
|
//PAGEBREAK!
|
2006-07-16 03:15:28 +02:00
|
|
|
// Wake up all processes sleeping on chan.
|
2009-05-31 07:12:21 +02:00
|
|
|
// The ptable lock must be held.
|
2007-08-24 22:22:55 +02:00
|
|
|
static void
|
2006-07-15 14:03:57 +02:00
|
|
|
wakeup1(void *chan)
|
2006-06-15 21:58:01 +02:00
|
|
|
{
|
|
|
|
struct proc *p;
|
|
|
|
|
2009-05-31 07:13:51 +02:00
|
|
|
for(p = ptable.proc; p < &ptable.proc[NPROC]; p++)
|
2006-07-16 03:15:28 +02:00
|
|
|
if(p->state == SLEEPING && p->chan == chan)
|
2006-06-15 21:58:01 +02:00
|
|
|
p->state = RUNNABLE;
|
2006-07-15 14:03:57 +02:00
|
|
|
}
|
|
|
|
|
2006-07-16 03:15:28 +02:00
|
|
|
// Wake up all processes sleeping on chan.
|
2006-07-15 14:03:57 +02:00
|
|
|
void
|
|
|
|
wakeup(void *chan)
|
|
|
|
{
|
2009-05-31 07:12:21 +02:00
|
|
|
acquire(&ptable.lock);
|
2006-07-15 14:03:57 +02:00
|
|
|
wakeup1(chan);
|
2009-05-31 07:12:21 +02:00
|
|
|
release(&ptable.lock);
|
2006-06-15 21:58:01 +02:00
|
|
|
}
|
2006-07-11 19:39:45 +02:00
|
|
|
|
2006-07-16 03:15:28 +02:00
|
|
|
// Kill the process with the given pid.
|
2009-08-31 08:02:08 +02:00
|
|
|
// Process won't exit until it returns
|
2006-07-16 03:15:28 +02:00
|
|
|
// to user space (see trap in trap.c).
|
|
|
|
int
|
2007-08-28 21:14:43 +02:00
|
|
|
kill(int pid)
|
2006-07-11 19:39:45 +02:00
|
|
|
{
|
2006-07-16 03:15:28 +02:00
|
|
|
struct proc *p;
|
|
|
|
|
2009-05-31 07:12:21 +02:00
|
|
|
acquire(&ptable.lock);
|
|
|
|
for(p = ptable.proc; p < &ptable.proc[NPROC]; p++){
|
2006-07-16 03:15:28 +02:00
|
|
|
if(p->pid == pid){
|
|
|
|
p->killed = 1;
|
|
|
|
// Wake process from sleep if necessary.
|
|
|
|
if(p->state == SLEEPING)
|
|
|
|
p->state = RUNNABLE;
|
2009-05-31 07:12:21 +02:00
|
|
|
release(&ptable.lock);
|
2006-07-16 03:15:28 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2009-05-31 07:12:21 +02:00
|
|
|
release(&ptable.lock);
|
2006-07-16 03:15:28 +02:00
|
|
|
return -1;
|
2006-07-11 19:39:45 +02:00
|
|
|
}
|
|
|
|
|
2011-02-20 03:17:55 +01:00
|
|
|
//PAGEBREAK: 36
|
|
|
|
// Print a process listing to console. For debugging.
|
|
|
|
// Runs when user types ^P on console.
|
|
|
|
// No lock to avoid wedging a stuck machine further.
|
|
|
|
void
|
|
|
|
procdump(void)
|
|
|
|
{
|
|
|
|
static char *states[] = {
|
|
|
|
[UNUSED] "unused",
|
|
|
|
[EMBRYO] "embryo",
|
|
|
|
[SLEEPING] "sleep ",
|
|
|
|
[RUNNABLE] "runble",
|
|
|
|
[RUNNING] "run ",
|
|
|
|
[ZOMBIE] "zombie"
|
|
|
|
};
|
|
|
|
int i;
|
|
|
|
struct proc *p;
|
|
|
|
char *state;
|
Checkpoint port of xv6 to x86-64. Passed usertests on 2 processors a few times.
The x86-64 doesn't just add two levels to page tables to support 64 bit
addresses, but is a different processor. For example, calling conventions,
system calls, and segmentation are different from 32-bit x86. Segmentation is
basically gone, but gs/fs in combination with MSRs can be used to hold a
per-core pointer. In general, x86-64 is more straightforward than 32-bit
x86. The port uses code from sv6 and the xv6 "rsc-amd64" branch.
A summary of the changes is as follows:
- Booting: switch to grub instead of xv6's bootloader (pass -kernel to qemu),
because xv6's boot loader doesn't understand 64bit ELF files. And, we don't
care anymore about booting.
- Makefile: use -m64 instead of -m32 flag for gcc, delete boot loader, xv6.img,
bochs, and memfs. For now dont' use -O2, since usertests with -O2 is bigger than
MAXFILE!
- Update gdb.tmpl to be for i386 or x86-64
- Console/printf: use stdarg.h and treat 64-bit addresses different from ints
(32-bit)
- Update elfhdr to be 64 bit
- entry.S/entryother.S: add code to switch to 64-bit mode: build a simple page
table in 32-bit mode before switching to 64-bit mode, share code for entering
boot processor and APs, and tweak boot gdt. The boot gdt is the gdt that the
kernel proper also uses. (In 64-bit mode, the gdt/segmentation and task state
mostly disappear.)
- exec.c: fix passing argv (64-bit now instead of 32-bit).
- initcode.c: use syscall instead of int.
- kernel.ld: load kernel very high, in top terabyte. 64 bits is a lot of
address space!
- proc.c: initial return is through new syscall path instead of trapret.
- proc.h: update struct cpu to have some scratch space since syscall saves less
state than int, update struct context to reflect x86-64 calling conventions.
- swtch: simplify for x86-64 calling conventions.
- syscall: add fetcharg to handle x86-64 calling convetions (6 arguments are
passed through registers), and fetchaddr to read a 64-bit value from user space.
- sysfile: update to handle pointers from user space (e.g., sys_exec), which are
64 bits.
- trap.c: no special trap vector for sys calls, because x86-64 has a different
plan for system calls.
- trapasm: one plan for syscalls and one plan for traps (interrupt and
exceptions). On x86-64, the kernel is responsible for switching user/kernel
stacks. To do, xv6 keeps some scratch space in the cpu structure, and uses MSR
GS_KERN_BASE to point to the core's cpu structure (using swapgs).
- types.h: add uint64, and change pde_t to uint64
- usertests: exit() when fork fails, which helped in tracking down one of the
bugs in the switch from 32-bit to 64-bit
- vectors: update to make them 64 bits
- vm.c: use bootgdt in kernel too, program MSRs for syscalls and core-local
state (for swapgs), walk 4 levels in walkpgdir, add DEVSPACETOP, use task
segment to set kernel stack for interrupts (but simpler than in 32-bit mode),
add an extra argument to freevm (size of user part of address space) to avoid
checking all entries till KERNBASE (there are MANY TB before the top 1TB).
- x86: update trapframe to have 64-bit entries, which is what the processor
pushes on syscalls and traps. simplify lgdt and lidt, using struct desctr,
which needs the gcc directives packed and aligned.
TODO:
- use int32 instead of int?
- simplify curproc(). xv6 has per-cpu state again, but this time it must have it.
- avoid repetition in walkpgdir
- fix validateint() in usertests.c
- fix bugs (e.g., observed one a case of entering kernel with invalid gs or proc
2018-09-23 14:24:42 +02:00
|
|
|
uint64 pc[10];
|
2016-08-25 15:13:00 +02:00
|
|
|
|
2011-02-20 03:17:55 +01:00
|
|
|
for(p = ptable.proc; p < &ptable.proc[NPROC]; p++){
|
|
|
|
if(p->state == UNUSED)
|
|
|
|
continue;
|
|
|
|
if(p->state >= 0 && p->state < NELEM(states) && states[p->state])
|
|
|
|
state = states[p->state];
|
|
|
|
else
|
|
|
|
state = "???";
|
|
|
|
cprintf("%d %s %s", p->pid, state, p->name);
|
|
|
|
if(p->state == SLEEPING){
|
2018-10-04 00:13:51 +02:00
|
|
|
getcallerpcs((uint64*)p->context->rbp+2, pc);
|
2011-02-20 03:17:55 +01:00
|
|
|
for(i=0; i<10 && pc[i] != 0; i++)
|
|
|
|
cprintf(" %p", pc[i]);
|
|
|
|
}
|
|
|
|
cprintf("\n");
|
|
|
|
}
|
|
|
|
}
|