2007-08-21 19:22:08 +00:00
|
|
|
#include "types.h"
|
|
|
|
#include "param.h"
|
2011-07-29 11:31:27 +00:00
|
|
|
#include "memlayout.h"
|
2019-05-31 16:43:20 +00:00
|
|
|
#include "riscv.h"
|
2019-07-02 13:14:47 +00:00
|
|
|
#include "spinlock.h"
|
2007-08-21 19:22:08 +00:00
|
|
|
#include "proc.h"
|
|
|
|
#include "defs.h"
|
|
|
|
#include "elf.h"
|
|
|
|
|
2019-05-31 16:43:20 +00:00
|
|
|
static int loadseg(pde_t *pgdir, uint64 addr, struct inode *ip, uint offset, uint sz);
|
|
|
|
|
2007-08-21 19:22:08 +00:00
|
|
|
int
|
|
|
|
exec(char *path, char **argv)
|
|
|
|
{
|
2010-09-27 20:14:33 +00:00
|
|
|
char *s, *last;
|
2011-02-20 02:17:55 +00:00
|
|
|
int i, off;
|
2019-06-04 10:51:01 +00:00
|
|
|
uint64 argc, sz, sp, ustack[MAXARG+1], stackbase;
|
2007-08-21 19:22:08 +00:00
|
|
|
struct elfhdr elf;
|
2011-01-11 18:01:13 +00:00
|
|
|
struct inode *ip;
|
2007-08-21 19:22:08 +00:00
|
|
|
struct proghdr ph;
|
2019-05-31 16:43:20 +00:00
|
|
|
pagetable_t pagetable = 0, oldpagetable;
|
2019-05-31 13:45:59 +00:00
|
|
|
struct proc *p = myproc();
|
2019-05-31 16:43:20 +00:00
|
|
|
|
2014-08-27 21:15:30 +00:00
|
|
|
begin_op();
|
2016-09-11 21:24:04 +00:00
|
|
|
|
2014-08-04 17:06:48 +00:00
|
|
|
if((ip = namei(path)) == 0){
|
2014-08-27 21:15:30 +00:00
|
|
|
end_op();
|
2007-08-21 19:22:08 +00:00
|
|
|
return -1;
|
2014-08-04 17:06:48 +00:00
|
|
|
}
|
2007-08-24 20:54:23 +00:00
|
|
|
ilock(ip);
|
2007-08-21 19:22:08 +00:00
|
|
|
|
2009-07-13 16:34:45 +00:00
|
|
|
// Check ELF header
|
2019-06-04 09:57:47 +00:00
|
|
|
if(readi(ip, 0, (uint64)&elf, 0, sizeof(elf)) != sizeof(elf))
|
2007-08-21 19:22:08 +00:00
|
|
|
goto bad;
|
|
|
|
if(elf.magic != ELF_MAGIC)
|
|
|
|
goto bad;
|
2009-07-13 16:34:45 +00:00
|
|
|
|
2019-05-31 16:43:20 +00:00
|
|
|
if((pagetable = proc_pagetable(p)) == 0)
|
2007-08-21 19:22:08 +00:00
|
|
|
goto bad;
|
|
|
|
|
2007-08-27 15:17:40 +00:00
|
|
|
// Load program into memory.
|
2011-01-11 18:01:13 +00:00
|
|
|
sz = 0;
|
2007-08-27 15:17:40 +00:00
|
|
|
for(i=0, off=elf.phoff; i<elf.phnum; i++, off+=sizeof(ph)){
|
2019-06-04 09:57:47 +00:00
|
|
|
if(readi(ip, 0, (uint64)&ph, off, sizeof(ph)) != sizeof(ph))
|
2007-08-27 15:17:40 +00:00
|
|
|
goto bad;
|
|
|
|
if(ph.type != ELF_PROG_LOAD)
|
|
|
|
continue;
|
2009-08-08 08:07:30 +00:00
|
|
|
if(ph.memsz < ph.filesz)
|
2007-08-27 15:17:40 +00:00
|
|
|
goto bad;
|
2015-12-19 15:04:52 +00:00
|
|
|
if(ph.vaddr + ph.memsz < ph.vaddr)
|
|
|
|
goto bad;
|
2019-05-31 16:43:20 +00:00
|
|
|
if((sz = uvmalloc(pagetable, sz, ph.vaddr + ph.memsz)) == 0)
|
2010-07-02 18:51:53 +00:00
|
|
|
goto bad;
|
2015-12-19 14:43:56 +00:00
|
|
|
if(ph.vaddr % PGSIZE != 0)
|
|
|
|
goto bad;
|
2019-05-31 16:43:20 +00:00
|
|
|
if(loadseg(pagetable, ph.vaddr, ip, ph.off, ph.filesz) < 0)
|
2007-08-27 15:17:40 +00:00
|
|
|
goto bad;
|
2007-08-21 19:22:08 +00:00
|
|
|
}
|
2007-08-27 15:17:40 +00:00
|
|
|
iunlockput(ip);
|
2014-08-27 21:15:30 +00:00
|
|
|
end_op();
|
2010-09-27 20:17:57 +00:00
|
|
|
ip = 0;
|
2010-07-02 18:51:53 +00:00
|
|
|
|
2019-07-02 13:14:47 +00:00
|
|
|
p = myproc();
|
|
|
|
uint64 oldsz = p->sz;
|
|
|
|
|
2011-09-01 17:25:34 +00:00
|
|
|
// Allocate two pages at the next page boundary.
|
2019-05-31 16:43:20 +00:00
|
|
|
// Use the second as the user stack.
|
2010-09-27 20:14:33 +00:00
|
|
|
sz = PGROUNDUP(sz);
|
2019-05-31 16:43:20 +00:00
|
|
|
if((sz = uvmalloc(pagetable, sz, sz + 2*PGSIZE)) == 0)
|
2010-07-02 18:51:53 +00:00
|
|
|
goto bad;
|
2019-07-24 19:28:37 +00:00
|
|
|
uvmclear(pagetable, sz-2*PGSIZE);
|
2011-09-01 17:25:34 +00:00
|
|
|
sp = sz;
|
2019-06-04 10:51:01 +00:00
|
|
|
stackbase = sp - PGSIZE;
|
2010-09-27 20:14:33 +00:00
|
|
|
|
2011-02-20 02:17:55 +00:00
|
|
|
// Push argument strings, prepare rest of stack in ustack.
|
|
|
|
for(argc = 0; argv[argc]; argc++) {
|
|
|
|
if(argc >= MAXARG)
|
|
|
|
goto bad;
|
2019-06-04 10:45:09 +00:00
|
|
|
sp -= strlen(argv[argc]) + 1;
|
|
|
|
sp -= sp % 16; // riscv sp must be 16-byte aligned
|
2019-06-04 10:51:01 +00:00
|
|
|
if(sp < stackbase)
|
|
|
|
goto bad;
|
2019-05-31 16:43:20 +00:00
|
|
|
if(copyout(pagetable, sp, argv[argc], strlen(argv[argc]) + 1) < 0)
|
2011-02-20 02:17:55 +00:00
|
|
|
goto bad;
|
2019-06-04 10:45:09 +00:00
|
|
|
ustack[argc] = sp;
|
2010-09-27 20:14:33 +00:00
|
|
|
}
|
2019-06-04 10:45:09 +00:00
|
|
|
ustack[argc] = 0;
|
2010-09-27 20:14:33 +00:00
|
|
|
|
2019-06-04 10:45:09 +00:00
|
|
|
// push the array of argv[] pointers.
|
|
|
|
sp -= (argc+1) * sizeof(uint64);
|
|
|
|
sp -= sp % 16;
|
2019-06-04 10:51:01 +00:00
|
|
|
if(sp < stackbase)
|
|
|
|
goto bad;
|
2019-06-04 10:45:09 +00:00
|
|
|
if(copyout(pagetable, sp, (char *)ustack, (argc+1)*sizeof(uint64)) < 0)
|
|
|
|
goto bad;
|
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 12:24:42 +00:00
|
|
|
|
2019-05-31 16:43:20 +00:00
|
|
|
// arguments to user main(argc, argv)
|
2019-06-04 10:45:09 +00:00
|
|
|
// argc is returned via the system call return
|
|
|
|
// value, which goes in a0.
|
2020-07-17 20:29:52 +00:00
|
|
|
p->trapframe->a1 = sp;
|
2010-09-27 20:17:57 +00:00
|
|
|
|
2007-08-27 15:17:40 +00:00
|
|
|
// Save program name for debugging.
|
2007-08-21 19:22:08 +00:00
|
|
|
for(last=s=path; *s; s++)
|
|
|
|
if(*s == '/')
|
|
|
|
last = s+1;
|
2019-05-31 13:45:59 +00:00
|
|
|
safestrcpy(p->name, last, sizeof(p->name));
|
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 12:24:42 +00:00
|
|
|
|
2010-07-02 18:51:53 +00:00
|
|
|
// Commit to the user image.
|
2019-05-31 16:43:20 +00:00
|
|
|
oldpagetable = p->pagetable;
|
|
|
|
p->pagetable = pagetable;
|
2019-05-31 13:45:59 +00:00
|
|
|
p->sz = sz;
|
2020-07-17 20:29:52 +00:00
|
|
|
p->trapframe->epc = elf.entry; // initial program counter = main
|
|
|
|
p->trapframe->sp = sp; // initial stack pointer
|
2019-05-31 16:43:20 +00:00
|
|
|
proc_freepagetable(oldpagetable, oldsz);
|
2019-10-03 19:02:19 +00:00
|
|
|
|
2019-06-04 10:45:09 +00:00
|
|
|
return argc; // this ends up in a0, the first argument to main(argc, argv)
|
2007-08-21 19:22:08 +00:00
|
|
|
|
|
|
|
bad:
|
2019-05-31 16:43:20 +00:00
|
|
|
if(pagetable)
|
|
|
|
proc_freepagetable(pagetable, sz);
|
2014-08-04 17:06:48 +00:00
|
|
|
if(ip){
|
2010-09-27 20:17:57 +00:00
|
|
|
iunlockput(ip);
|
2014-08-27 21:15:30 +00:00
|
|
|
end_op();
|
2014-08-04 17:06:48 +00:00
|
|
|
}
|
2007-08-21 19:22:08 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2019-05-31 16:43:20 +00:00
|
|
|
|
|
|
|
// Load a program segment into pagetable at virtual address va.
|
|
|
|
// va must be page-aligned
|
|
|
|
// and the pages from va to va+sz must already be mapped.
|
|
|
|
// Returns 0 on success, -1 on failure.
|
|
|
|
static int
|
|
|
|
loadseg(pagetable_t pagetable, uint64 va, struct inode *ip, uint offset, uint sz)
|
|
|
|
{
|
|
|
|
uint i, n;
|
|
|
|
uint64 pa;
|
|
|
|
|
|
|
|
if((va % PGSIZE) != 0)
|
|
|
|
panic("loadseg: va must be page aligned");
|
2019-06-04 09:57:47 +00:00
|
|
|
|
2019-05-31 16:43:20 +00:00
|
|
|
for(i = 0; i < sz; i += PGSIZE){
|
|
|
|
pa = walkaddr(pagetable, va + i);
|
|
|
|
if(pa == 0)
|
|
|
|
panic("loadseg: address should exist");
|
|
|
|
if(sz - i < PGSIZE)
|
|
|
|
n = sz - i;
|
|
|
|
else
|
|
|
|
n = PGSIZE;
|
2019-06-04 09:57:47 +00:00
|
|
|
if(readi(ip, 0, (uint64)pa, offset+i, n) != n)
|
2019-05-31 16:43:20 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2019-06-04 09:57:47 +00:00
|
|
|
|
2019-05-31 16:43:20 +00:00
|
|
|
return 0;
|
|
|
|
}
|