sanchayanmaity/xv6-cs450
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more regular kmap[] and description

Browse source
This commit is contained in:
Robert Morris 2011-09-13 12:28:45 -04:00
parent 90a81b3228
commit 7e7cb106d0
3 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
entry.S
View file

@ -36,7 +36,7 @@ multiboot_header:
.globl _start .globl _start
_start = V2P_WO(entry) _start = V2P_WO(entry)
# Entering xv6 on boot processor. Machine is mostly set up. # Entering xv6 on boot processor, with paging off.
.globl entry .globl entry
entry: entry:
# Turn on page size extension for 4Mbyte pages # Turn on page size extension for 4Mbyte pages

8
memlayout.h
View file

@ -10,13 +10,13 @@
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
static inline uint v2p(void *a) { return (uint) a - KERNBASE; } static inline uint v2p(void *a) { return ((uint) (a)) - KERNBASE; }
static inline void *p2v(uint a) { return (void *) a + KERNBASE; } static inline void *p2v(uint a) { return (void *) ((a) + KERNBASE); }
#endif #endif
#define V2P(a) ((uint) a - KERNBASE) #define V2P(a) (((uint) (a)) - KERNBASE)
#define P2V(a) ((void *) a + KERNBASE) #define P2V(a) (((void *) (a)) + KERNBASE)
#define V2P_WO(x) ((x) - KERNBASE) // same as V2P, but without casts #define V2P_WO(x) ((x) - KERNBASE) // same as V2P, but without casts
#define P2V_WO(x) ((x) + KERNBASE) // same as V2P, but without casts #define P2V_WO(x) ((x) + KERNBASE) // same as V2P, but without casts

41
vm.c
View file

@ -90,36 +90,39 @@ mappages(pde_t *pgdir, void *va, uint size, uint pa,
return 0; return 0;
} }
// The mappings from logical to virtual are one to one (i.e., // There is one page table per process, plus one that's used when
// segmentation doesn't do anything). There is one page table per // a CPU is not running any process (kpgdir). The kernel uses the
// process, plus one that's used when a CPU is not running any process // current process's page table during system calls and interrupts;
// (kpgdir). A user process uses the same page table as the kernel; the // page protection bits prevent user code from using the kernel's
// page protection bits prevent it from accessing kernel memory. // mappings.
// //
// setupkvm() and exec() set up every page table like this: // setupkvm() and exec() set up every page table like this:
// 0..KERNBASE: user memory (text+data+stack+heap), mapped to some free //
// phys memory // 0..KERNBASE: user memory (text+data+stack+heap), mapped to
// phys memory allocated by the kernel
// KERNBASE..KERNBASE+EXTMEM: mapped to 0..EXTMEM (for I/O space) // KERNBASE..KERNBASE+EXTMEM: mapped to 0..EXTMEM (for I/O space)
// KERNBASE+EXTMEM..KERNBASE+end: mapped to EXTMEM..end kernel, // KERNBASE+EXTMEM..data: mapped to EXTMEM..V2P(data)
// w. no write permission // for the kernel's instructions and r/o data
// KERNBASE+end..KERBASE+PHYSTOP: mapped to end..PHYSTOP, // data..KERNBASE+PHYSTOP: mapped to V2P(data)..PHYSTOP,
// rw data + free memory // rw data + free physical memory
// 0xfe000000..0: mapped direct (devices such as ioapic) // 0xfe000000..0: mapped direct (devices such as ioapic)
// //
// The kernel allocates memory for its heap and for user memory // The kernel allocates physical memory for its heap and for user memory
// between KERNBASE+end and the end of physical memory (PHYSTOP). // between V2P(end) and the end of physical memory (PHYSTOP)
// The user program sits in the bottom of the address space, and the // (directly addressable from end..P2V(PHYSTOP)).
// kernel at the top at KERNBASE.
// This table defines the kernel's mappings, which are present in
// every process's page table.
static struct kmap { static struct kmap {
void *virt; void *virt;
uint phys_start; uint phys_start;
uint phys_end; uint phys_end;
int perm; int perm;
} kmap[] = { } kmap[] = {
{ P2V(0), 0, 1024*1024, PTE_W}, // I/O space { (void*) KERNBASE, 0, EXTMEM, PTE_W}, // I/O space
{ (void*)KERNLINK, V2P(KERNLINK), V2P(data), 0}, // kernel text+rodata { (void*) KERNLINK, V2P(KERNLINK), V2P(data), 0}, // kernel text+rodata
{ data, V2P(data), PHYSTOP, PTE_W}, // kernel data, memory { (void*) data, V2P(data), PHYSTOP, PTE_W}, // kernel data, memory
{ (void*)DEVSPACE, DEVSPACE, 0, PTE_W}, // more devices { (void*) DEVSPACE, DEVSPACE, 0, PTE_W}, // more devices
}; };
// Set up kernel part of a page table. // Set up kernel part of a page table.