X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=solutions%2Fp3.patch;h=773a7126009b26ec5caa17ef76675b18a68cc758;hb=977edaf97eb505eb0f752e2357817539b20d90b5;hp=89fead0684cbacd78397b1d541a6dd25a7aa3725;hpb=4d4f7cdae7c29fc7dfcecc16c6a683dd512532cf;p=pintos-anon diff --git a/solutions/p3.patch b/solutions/p3.patch index 89fead0..773a712 100644 --- a/solutions/p3.patch +++ b/solutions/p3.patch @@ -1,20 +1,22 @@ +Index: src/Makefile.build diff -u src/Makefile.build~ src/Makefile.build ---- src/Makefile.build~ 2005-06-02 17:24:02.000000000 -0700 -+++ src/Makefile.build 2005-06-08 14:10:54.000000000 -0700 +--- src/Makefile.build~ 2005-06-18 20:20:47.000000000 -0700 ++++ src/Makefile.build 2006-05-16 13:44:56.000000000 -0700 @@ -53,7 +53,9 @@ userprog_SRC += userprog/gdt.c # GDT in userprog_SRC += userprog/tss.c # TSS management. # No virtual memory code yet. --#vm_SRC = vm/filename.c # Some file. +-#vm_SRC = vm/file.c # Some file. +vm_SRC = vm/page.c +vm_SRC += vm/frame.c +vm_SRC += vm/swap.c # Filesystem code. filesys_SRC = filesys/filesys.c # Filesystem core. +Index: src/devices/timer.c diff -u src/devices/timer.c~ src/devices/timer.c ---- src/devices/timer.c~ 2005-05-24 15:52:43.000000000 -0700 -+++ src/devices/timer.c 2005-06-08 14:10:54.000000000 -0700 +--- src/devices/timer.c~ 2005-07-06 13:45:36.000000000 -0700 ++++ src/devices/timer.c 2006-05-16 13:44:56.000000000 -0700 @@ -23,6 +23,9 @@ static volatile int64_t ticks; Initialized by timer_calibrate(). */ static unsigned loops_per_tick; @@ -91,9 +93,10 @@ diff -u src/devices/timer.c~ src/devices/timer.c } /* Returns true if LOOPS iterations waits for more than one timer +Index: src/threads/init.c diff -u src/threads/init.c~ src/threads/init.c ---- src/threads/init.c~ 2005-06-02 15:43:44.000000000 -0700 -+++ src/threads/init.c 2005-06-08 14:10:54.000000000 -0700 +--- src/threads/init.c~ 2006-04-25 11:35:56.000000000 -0700 ++++ src/threads/init.c 2006-05-16 13:44:56.000000000 -0700 @@ -33,6 +33,8 @@ #include "filesys/filesys.h" #include "filesys/fsutil.h" @@ -103,7 +106,7 @@ diff -u src/threads/init.c~ src/threads/init.c /* Amount of physical memory, in 4 kB pages. */ size_t ram_pages; -@@ -131,6 +133,9 @@ main (void) +@@ -124,6 +126,9 @@ main (void) filesys_init (format_filesys); #endif @@ -113,10 +116,11 @@ diff -u src/threads/init.c~ src/threads/init.c printf ("Boot complete.\n"); /* Run actions specified on kernel command line. */ +Index: src/threads/interrupt.c diff -u src/threads/interrupt.c~ src/threads/interrupt.c ---- src/threads/interrupt.c~ 2005-01-21 13:43:16.000000000 -0800 -+++ src/threads/interrupt.c 2005-06-08 14:10:54.000000000 -0700 -@@ -331,6 +331,8 @@ intr_handler (struct intr_frame *frame) +--- src/threads/interrupt.c~ 2006-04-25 11:35:56.000000000 -0700 ++++ src/threads/interrupt.c 2006-05-16 13:44:56.000000000 -0700 +@@ -354,6 +354,8 @@ intr_handler (struct intr_frame *frame) in_external_intr = true; yield_on_return = false; } @@ -125,11 +129,12 @@ diff -u src/threads/interrupt.c~ src/threads/interrupt.c /* Invoke the interrupt's handler. If there is no handler, invoke the unexpected interrupt +Index: src/threads/thread.c diff -u src/threads/thread.c~ src/threads/thread.c ---- src/threads/thread.c~ 2005-06-02 14:35:12.000000000 -0700 -+++ src/threads/thread.c 2005-06-08 14:10:54.000000000 -0700 +--- src/threads/thread.c~ 2006-04-25 11:35:57.000000000 -0700 ++++ src/threads/thread.c 2006-05-16 13:44:56.000000000 -0700 @@ -13,6 +13,7 @@ - #include "threads/synch.h" + #include "threads/vaddr.h" #ifdef USERPROG #include "userprog/process.h" +#include "userprog/syscall.h" @@ -157,7 +162,7 @@ diff -u src/threads/thread.c~ src/threads/thread.c } /* Starts preemptive thread scheduling by enabling interrupts. -@@ -157,8 +158,8 @@ thread_create (const char *name, int pri +@@ -159,8 +160,8 @@ thread_create (const char *name, int pri return TID_ERROR; /* Initialize thread. */ @@ -168,7 +173,7 @@ diff -u src/threads/thread.c~ src/threads/thread.c /* Stack frame for kernel_thread(). */ kf = alloc_frame (t, sizeof *kf); -@@ -251,16 +252,19 @@ thread_tid (void) +@@ -253,16 +254,19 @@ thread_tid (void) void thread_exit (void) { @@ -190,7 +195,7 @@ diff -u src/threads/thread.c~ src/threads/thread.c schedule (); NOT_REACHED (); } -@@ -389,17 +393,28 @@ is_thread (struct thread *t) +@@ -406,17 +410,28 @@ is_thread (struct thread *t) /* Does basic initialization of T as a blocked thread named NAME. */ static void @@ -220,9 +225,10 @@ diff -u src/threads/thread.c~ src/threads/thread.c t->magic = THREAD_MAGIC; } +Index: src/threads/thread.h diff -u src/threads/thread.h~ src/threads/thread.h ---- src/threads/thread.h~ 2005-06-02 14:32:36.000000000 -0700 -+++ src/threads/thread.h 2005-06-08 14:10:54.000000000 -0700 +--- src/threads/thread.h~ 2006-04-13 13:53:34.000000000 -0700 ++++ src/threads/thread.h 2006-05-16 13:44:56.000000000 -0700 @@ -2,8 +2,10 @@ #define THREADS_THREAD_H @@ -285,10 +291,11 @@ diff -u src/threads/thread.h~ src/threads/thread.h + void thread_init (void); void thread_start (void); - void thread_tick (void); + +Index: src/userprog/exception.c diff -u src/userprog/exception.c~ src/userprog/exception.c ---- src/userprog/exception.c~ 2005-01-01 18:09:59.000000000 -0800 -+++ src/userprog/exception.c 2005-06-08 14:10:54.000000000 -0700 +--- src/userprog/exception.c~ 2006-01-29 13:32:56.000000000 -0800 ++++ src/userprog/exception.c 2006-05-16 13:44:56.000000000 -0700 @@ -4,6 +4,7 @@ #include "userprog/gdt.h" #include "threads/interrupt.h" @@ -297,7 +304,7 @@ diff -u src/userprog/exception.c~ src/userprog/exception.c /* Number of page faults processed. */ static long long page_fault_cnt; -@@ -150,9 +151,14 @@ page_fault (struct intr_frame *f) +@@ -148,9 +149,14 @@ page_fault (struct intr_frame *f) write = (f->error_code & PF_W) != 0; user = (f->error_code & PF_U) != 0; @@ -315,19 +322,20 @@ diff -u src/userprog/exception.c~ src/userprog/exception.c printf ("Page fault at %p: %s error %s page in %s context.\n", fault_addr, not_present ? "not present" : "rights violation", +Index: src/userprog/pagedir.c diff -u src/userprog/pagedir.c~ src/userprog/pagedir.c ---- src/userprog/pagedir.c~ 2005-05-20 15:44:13.000000000 -0700 -+++ src/userprog/pagedir.c 2005-06-08 14:10:54.000000000 -0700 -@@ -34,15 +34,7 @@ pagedir_destroy (uint32_t *pd) +--- src/userprog/pagedir.c~ 2006-04-25 11:35:58.000000000 -0700 ++++ src/userprog/pagedir.c 2006-05-16 13:44:56.000000000 -0700 +@@ -35,15 +35,7 @@ pagedir_destroy (uint32_t *pd) ASSERT (pd != base_page_dir); for (pde = pd; pde < pd + pd_no (PHYS_BASE); pde++) - if (*pde & PG_P) + if (*pde & PTE_P) - { - uint32_t *pt = pde_get_pt (*pde); - uint32_t *pte; - - for (pte = pt; pte < pt + PGSIZE / sizeof *pte; pte++) -- if (*pte & PG_P) +- if (*pte & PTE_P) - palloc_free_page (pte_get_page (*pte)); - palloc_free_page (pt); - } @@ -335,16 +343,18 @@ diff -u src/userprog/pagedir.c~ src/userprog/pagedir.c palloc_free_page (pd); } +Index: src/userprog/process.c diff -u src/userprog/process.c~ src/userprog/process.c ---- src/userprog/process.c~ 2005-05-26 13:19:48.000000000 -0700 -+++ src/userprog/process.c 2005-06-08 14:13:25.000000000 -0700 -@@ -14,11 +14,25 @@ +--- src/userprog/process.c~ 2006-04-25 11:35:58.000000000 -0700 ++++ src/userprog/process.c 2006-05-16 13:44:56.000000000 -0700 +@@ -14,12 +14,26 @@ + #include "threads/flags.h" #include "threads/init.h" #include "threads/interrupt.h" - #include "threads/mmu.h" +#include "threads/malloc.h" #include "threads/palloc.h" #include "threads/thread.h" + #include "threads/vaddr.h" +#include "vm/page.h" +#include "vm/frame.h" @@ -357,17 +367,17 @@ diff -u src/userprog/process.c~ src/userprog/process.c + thread. */ +struct exec_info + { -+ const char *filename; /* Program to load. */ ++ const char *file_name; /* Program to load. */ + struct semaphore load_done; /* "Up"ed when loading complete. */ + struct wait_status *wait_status; /* Child process. */ + bool success; /* Program successfully loaded? */ + }; /* Starts a new thread running a user program loaded from - FILENAME. The new thread may be scheduled (and may even exit) -@@ -27,29 +41,37 @@ static bool load (const char *cmdline, v + FILE_NAME. The new thread may be scheduled (and may even exit) +@@ -28,29 +42,37 @@ static bool load (const char *cmdline, v tid_t - process_execute (const char *filename) + process_execute (const char *file_name) { - char *fn_copy; + struct exec_info exec; @@ -375,21 +385,21 @@ diff -u src/userprog/process.c~ src/userprog/process.c + char *save_ptr; tid_t tid; -- /* Make a copy of FILENAME. +- /* Make a copy of FILE_NAME. - Otherwise there's a race between the caller and load(). */ - fn_copy = palloc_get_page (0); - if (fn_copy == NULL) - return TID_ERROR; -- strlcpy (fn_copy, filename, PGSIZE); +- strlcpy (fn_copy, file_name, PGSIZE); + /* Initialize exec_info. */ -+ exec.filename = filename; ++ exec.file_name = file_name; + sema_init (&exec.load_done, 0); - /* Create a new thread to execute FILENAME. */ -- tid = thread_create (filename, PRI_DEFAULT, execute_thread, fn_copy); + /* Create a new thread to execute FILE_NAME. */ +- tid = thread_create (file_name, PRI_DEFAULT, execute_thread, fn_copy); - if (tid == TID_ERROR) - palloc_free_page (fn_copy); -+ strlcpy (thread_name, filename, sizeof thread_name); ++ strlcpy (thread_name, file_name, sizeof thread_name); + strtok_r (thread_name, " ", &save_ptr); + tid = thread_create (thread_name, PRI_DEFAULT, execute_thread, &exec); + if (tid != TID_ERROR) @@ -407,23 +417,21 @@ diff -u src/userprog/process.c~ src/userprog/process.c /* A thread function that loads a user process and starts it running. */ static void --execute_thread (void *filename_) +-execute_thread (void *file_name_) +execute_thread (void *exec_) { -- char *filename = filename_; +- char *file_name = file_name_; + struct exec_info *exec = exec_; struct intr_frame if_; bool success; -@@ -58,10 +80,28 @@ execute_thread (void *filename_) +@@ -59,10 +81,28 @@ execute_thread (void *file_name_) if_.gs = if_.fs = if_.es = if_.ds = if_.ss = SEL_UDSEG; if_.cs = SEL_UCSEG; if_.eflags = FLAG_IF | FLAG_MBS; -- success = load (filename, &if_.eip, &if_.esp); -+ success = load (exec->filename, &if_.eip, &if_.esp); - -- /* If load failed, quit. */ -- palloc_free_page (filename); +- success = load (file_name, &if_.eip, &if_.esp); ++ success = load (exec->file_name, &if_.eip, &if_.esp); ++ + /* Allocate wait_status. */ + if (success) + { @@ -431,7 +439,9 @@ diff -u src/userprog/process.c~ src/userprog/process.c + = malloc (sizeof *exec->wait_status); + success = exec->wait_status != NULL; + } -+ + +- /* If load failed, quit. */ +- palloc_free_page (file_name); + /* Initialize wait_status. */ + if (success) + { @@ -447,7 +457,7 @@ diff -u src/userprog/process.c~ src/userprog/process.c if (!success) thread_exit (); -@@ -75,18 +115,47 @@ execute_thread (void *filename_) +@@ -76,18 +116,47 @@ execute_thread (void *file_name_) NOT_REACHED (); } @@ -500,7 +510,7 @@ diff -u src/userprog/process.c~ src/userprog/process.c return -1; } -@@ -95,8 +164,35 @@ void +@@ -96,8 +165,35 @@ void process_exit (void) { struct thread *cur = thread_current (); @@ -536,24 +546,24 @@ diff -u src/userprog/process.c~ src/userprog/process.c /* Destroy the current process's page directory and switch back to the kernel-only page directory. */ pd = cur->pagedir; -@@ -193,7 +289,7 @@ struct Elf32_Phdr +@@ -194,7 +290,7 @@ struct Elf32_Phdr + #define PF_W 2 /* Writable. */ #define PF_R 4 /* Readable. */ - static bool load_segment (struct file *, const struct Elf32_Phdr *); -static bool setup_stack (void **esp); +static bool setup_stack (const char *cmd_line, void **esp); - - /* Loads an ELF executable from FILENAME into the current thread. - Stores the executable's entry point into *EIP -@@ -209,13 +305,15 @@ static bool setup_stack (void **esp); + static bool validate_segment (const struct Elf32_Phdr *, struct file *); + static bool load_segment (struct file *file, off_t ofs, uint8_t *upage, + uint32_t read_bytes, uint32_t zero_bytes, +@@ -205,13 +301,15 @@ static bool load_segment (struct file *f and its initial stack pointer into *ESP. Returns true if successful, false otherwise. */ bool --load (const char *filename, void (**eip) (void), void **esp) +-load (const char *file_name, void (**eip) (void), void **esp) +load (const char *cmd_line, void (**eip) (void), void **esp) { struct thread *t = thread_current (); -+ char filename[NAME_MAX + 2]; ++ char file_name[NAME_MAX + 2]; struct Elf32_Ehdr ehdr; struct file *file = NULL; off_t file_ofs; @@ -562,7 +572,7 @@ diff -u src/userprog/process.c~ src/userprog/process.c int i; /* Allocate and activate page directory. */ -@@ -224,13 +322,28 @@ load (const char *filename, void (**eip) +@@ -220,13 +318,28 @@ load (const char *file_name, void (**eip) goto done; process_activate (); @@ -572,27 +582,27 @@ diff -u src/userprog/process.c~ src/userprog/process.c + goto done; + hash_init (t->pages, page_hash, page_less, NULL); + -+ /* Extract filename from command line. */ ++ /* Extract file_name from command line. */ + while (*cmd_line == ' ') + cmd_line++; -+ strlcpy (filename, cmd_line, sizeof filename); -+ cp = strchr (filename, ' '); ++ strlcpy (file_name, cmd_line, sizeof file_name); ++ cp = strchr (file_name, ' '); + if (cp != NULL) + *cp = '\0'; + /* Open executable file. */ -- file = filesys_open (filename); -+ t->bin_file = file = filesys_open (filename); +- file = filesys_open (file_name); ++ t->bin_file = file = filesys_open (file_name); if (file == NULL) { - printf ("load: %s: open failed\n", filename); + printf ("load: %s: open failed\n", file_name); goto done; } + file_deny_write (t->bin_file); /* Read and verify executable header. */ if (file_read (file, &ehdr, sizeof ehdr) != sizeof ehdr -@@ -284,7 +397,7 @@ load (const char *filename, void (**eip) +@@ -301,7 +414,7 @@ load (const char *file_name, void (**eip) } /* Set up stack. */ @@ -601,7 +611,7 @@ diff -u src/userprog/process.c~ src/userprog/process.c goto done; /* Start address. */ -@@ -294,14 +407,11 @@ load (const char *filename, void (**eip) +@@ -311,14 +424,11 @@ load (const char *file_name, void (**eip) done: /* We arrive here whether the load is successful or not. */ @@ -611,103 +621,73 @@ diff -u src/userprog/process.c~ src/userprog/process.c /* load() helpers. */ --static bool install_page (void *upage, void *kpage); +-static bool install_page (void *upage, void *kpage, bool writable); - - /* Loads the segment described by PHDR from FILE into user - address space. Return true if successful, false otherwise. */ + /* Checks whether PHDR describes a valid, loadable segment in + FILE and returns true if so, false otherwise. */ static bool -@@ -309,6 +419,7 @@ load_segment (struct file *file, const s - { - void *start, *end; /* Page-rounded segment start and end. */ - uint8_t *upage; /* Iterator from start to end. */ -+ off_t file_offset; /* Offset into file. */ - off_t filesz_left; /* Bytes left of file data (as opposed to - zero-initialized bytes). */ +@@ -387,79 +497,127 @@ load_segment (struct file *file, off_t o + ASSERT (pg_ofs (upage) == 0); + ASSERT (ofs % PGSIZE == 0); -@@ -316,7 +427,7 @@ load_segment (struct file *file, const s - commented out. You'll want to use it when implementing VM - to decide whether to page the segment from its executable or - from swap. */ -- //bool read_only = (phdr->p_flags & PF_W) == 0; -+ bool read_only = (phdr->p_flags & PF_W) == 0; - - ASSERT (file != NULL); - ASSERT (phdr != NULL); -@@ -360,73 +471,129 @@ load_segment (struct file *file, const s - return false; - } - -- /* Load the segment page-by-page into memory. */ -+ /* Add the segment page-by-page to the hash table. */ - filesz_left = phdr->p_filesz + (phdr->p_vaddr & PGMASK); -- file_seek (file, ROUND_DOWN (phdr->p_offset, PGSIZE)); -+ file_offset = ROUND_DOWN (phdr->p_offset, PGSIZE); - for (upage = start; upage < (uint8_t *) end; upage += PGSIZE) +- file_seek (file, ofs); + while (read_bytes > 0 || zero_bytes > 0) { -- /* We want to read min(PGSIZE, filesz_left) bytes from the -- file into the page and zero the rest. */ -- size_t read_bytes = filesz_left >= PGSIZE ? PGSIZE : filesz_left; -- size_t zero_bytes = PGSIZE - read_bytes; +- /* Calculate how to fill this page. +- We will read PAGE_READ_BYTES bytes from FILE +- and zero the final PAGE_ZERO_BYTES bytes. */ + size_t page_read_bytes = read_bytes < PGSIZE ? read_bytes : PGSIZE; + size_t page_zero_bytes = PGSIZE - page_read_bytes; +- +- /* Get a page of memory. */ - uint8_t *kpage = palloc_get_page (PAL_USER); - if (kpage == NULL) -+ struct page *p = page_allocate (upage, read_only); ++ struct page *p = page_allocate (upage, !writable); + if (p == NULL) return false; - -- /* Do the reading and zeroing. */ -- if (file_read (file, kpage, read_bytes) != (int) read_bytes) +- +- /* Load this page. */ +- if (file_read (file, kpage, page_read_bytes) != (int) page_read_bytes) - { - palloc_free_page (kpage); - return false; - } -- memset (kpage + read_bytes, 0, zero_bytes); -- filesz_left -= read_bytes; +- memset (kpage + page_read_bytes, 0, page_zero_bytes); - - /* Add the page to the process's address space. */ -- if (!install_page (upage, kpage)) -+ if (filesz_left > 0) +- if (!install_page (upage, kpage, writable)) ++ if (page_read_bytes > 0) { - palloc_free_page (kpage); - return false; -+ size_t file_bytes = filesz_left >= PGSIZE ? PGSIZE : filesz_left; + p->file = file; -+ p->file_offset = file_offset; -+ p->file_bytes = file_bytes; -+ filesz_left -= file_bytes; -+ file_offset += file_bytes; ++ p->file_offset = ofs; ++ p->file_bytes = page_read_bytes; } +- +- /* Advance. */ + read_bytes -= page_read_bytes; + zero_bytes -= page_zero_bytes; ++ ofs += page_read_bytes; + upage += PGSIZE; } - return true; } -/* Create a minimal stack by mapping a zeroed page at the top of - user virtual memory. */ --static bool --setup_stack (void **esp) +/* Reverse the order of the ARGC pointers to char in ARGV. */ +static void +reverse (int argc, char **argv) - { -- uint8_t *kpage; -- bool success = false; -- -- kpage = palloc_get_page (PAL_USER | PAL_ZERO); -- if (kpage != NULL) ++{ + for (; argc > 1; argc -= 2, argv++) - { -- success = install_page (((uint8_t *) PHYS_BASE) - PGSIZE, kpage); -- if (success) -- *esp = PHYS_BASE; -- else -- palloc_free_page (kpage); ++ { + char *tmp = argv[0]; + argv[0] = argv[argc - 1]; + argv[argc - 1] = tmp; - } ++ } +} + -- return success; +/* Pushes the SIZE bytes in BUF onto the stack in KPAGE, whose + page-relative stack pointer is *OFS, and then adjusts *OFS + appropriately. The bytes pushed are rounded to a 32-bit @@ -725,25 +705,19 @@ diff -u src/userprog/process.c~ src/userprog/process.c + *ofs -= padsize; + memcpy (kpage + *ofs + (padsize - size), buf, size); + return kpage + *ofs + (padsize - size); - } - --/* Adds a mapping from user virtual address UPAGE to kernel -- virtual address KPAGE to the page table. -- UPAGE must not already be mapped. -- KPAGE should probably be a page obtained from the user pool -- with palloc_get_page(). -- Returns true on success, false if UPAGE is already mapped or -- if memory allocation fails. */ ++} ++ +/* Sets up command line arguments in KPAGE, which will be mapped + to UPAGE in user space. The command line arguments are taken + from CMD_LINE, separated by spaces. Sets *ESP to the initial + stack pointer for the process. */ static bool --install_page (void *upage, void *kpage) +-setup_stack (void **esp) +init_cmd_line (uint8_t *kpage, uint8_t *upage, const char *cmd_line, + void **esp) { -- struct thread *t = thread_current (); +- uint8_t *kpage; +- bool success = false; + size_t ofs = PGSIZE; + char *const null = NULL; + char *cmd_line_copy; @@ -758,18 +732,26 @@ diff -u src/userprog/process.c~ src/userprog/process.c + + if (push (kpage, &ofs, &null, sizeof null) == NULL) + return false; -+ + +- kpage = palloc_get_page (PAL_USER | PAL_ZERO); +- if (kpage != NULL) + /* Parse command line into arguments + and push them in reverse order. */ + argc = 0; + for (karg = strtok_r (cmd_line_copy, " ", &saveptr); karg != NULL; + karg = strtok_r (NULL, " ", &saveptr)) -+ { + { +- success = install_page (((uint8_t *) PHYS_BASE) - PGSIZE, kpage, true); +- if (success) +- *esp = PHYS_BASE; +- else +- palloc_free_page (kpage); + void *uarg = upage + (karg - (char *) kpage); + if (push (kpage, &ofs, &uarg, sizeof uarg) == NULL) + return false; + argc++; -+ } + } +- return success; + + /* Reverse the order of the command line arguments. */ + argv = (char **) (upage + ofs); @@ -784,18 +766,30 @@ diff -u src/userprog/process.c~ src/userprog/process.c + /* Set initial stack pointer. */ + *esp = upage + ofs; + return true; -+} + } -- /* Verify that there's not already a page at that virtual -- address, then map our page there. */ -- return (pagedir_get_page (t->pagedir, upage) == NULL -- && pagedir_set_page (t->pagedir, upage, kpage, true)); +-/* Adds a mapping from user virtual address UPAGE to kernel +- virtual address KPAGE to the page table. +- If WRITABLE is true, the user process may modify the page; +- otherwise, it is read-only. +- UPAGE must not already be mapped. +- KPAGE should probably be a page obtained from the user pool +- with palloc_get_page(). +- Returns true on success, false if UPAGE is already mapped or +- if memory allocation fails. */ +/* Create a minimal stack for T by mapping a page at the + top of user virtual memory. Fills in the page using CMD_LINE + and sets *ESP to the stack pointer. */ -+static bool + static bool +-install_page (void *upage, void *kpage, bool writable) +setup_stack (const char *cmd_line, void **esp) -+{ + { +- struct thread *t = thread_current (); +- +- /* Verify that there's not already a page at that virtual +- address, then map our page there. */ +- return (pagedir_get_page (t->pagedir, upage) == NULL +- && pagedir_set_page (t->pagedir, upage, kpage, writable)); + struct page *page = page_allocate (((uint8_t *) PHYS_BASE) - PGSIZE, false); + if (page != NULL) + { @@ -812,10 +806,11 @@ diff -u src/userprog/process.c~ src/userprog/process.c + } + return false; } +Index: src/userprog/syscall.c diff -u src/userprog/syscall.c~ src/userprog/syscall.c ---- src/userprog/syscall.c~ 2004-09-26 14:15:17.000000000 -0700 -+++ src/userprog/syscall.c 2005-06-08 14:10:54.000000000 -0700 -@@ -1,20 +1,557 @@ +--- src/userprog/syscall.c~ 2005-06-18 20:21:21.000000000 -0700 ++++ src/userprog/syscall.c 2006-05-16 14:17:02.000000000 -0700 +@@ -1,20 +1,598 @@ #include "userprog/syscall.h" #include +#include @@ -829,10 +824,10 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c +#include "threads/init.h" #include "threads/interrupt.h" +#include "threads/malloc.h" -+#include "threads/mmu.h" +#include "threads/palloc.h" #include "threads/thread.h" - ++#include "threads/vaddr.h" +#include "vm/page.h" + + @@ -853,13 +848,15 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c +static int sys_munmap (int mapping); + static void syscall_handler (struct intr_frame *); -- +static void copy_in (void *, const void *, size_t); + ++static struct lock fs_lock; + void syscall_init (void) { intr_register_int (0x30, 3, INTR_ON, syscall_handler, "syscall"); ++ lock_init (&fs_lock); } + +/* System call handler. */ @@ -894,11 +891,11 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c + {2, (syscall_function *) sys_mmap}, + {1, (syscall_function *) sys_munmap}, + }; - ++ + const struct syscall *sc; + unsigned call_nr; + int args[3]; -+ + + /* Get the system call. */ + copy_in (&call_nr, f->esp, sizeof call_nr); + if (call_nr >= sizeof syscall_table / sizeof *syscall_table) @@ -990,8 +987,7 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c +/* Halt system call. */ +static int +sys_halt (void) - { -- printf ("system call!\n"); ++{ + power_off (); +} + @@ -1000,7 +996,7 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c +sys_exit (int exit_code) +{ + thread_current ()->exit_code = exit_code; - thread_exit (); ++ thread_exit (); + NOT_REACHED (); +} + @@ -1010,8 +1006,10 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c +{ + tid_t tid; + char *kfile = copy_in_string (ufile); -+ ++ ++ lock_acquire (&fs_lock); + tid = process_execute (kfile); ++ lock_release (&fs_lock); + + palloc_free_page (kfile); + @@ -1030,7 +1028,12 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c +sys_create (const char *ufile, unsigned initial_size) +{ + char *kfile = copy_in_string (ufile); -+ bool ok = filesys_create (kfile, initial_size); ++ bool ok; ++ ++ lock_acquire (&fs_lock); ++ ok = filesys_create (kfile, initial_size); ++ lock_release (&fs_lock); ++ + palloc_free_page (kfile); + + return ok; @@ -1041,7 +1044,12 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c +sys_remove (const char *ufile) +{ + char *kfile = copy_in_string (ufile); -+ bool ok = filesys_remove (kfile); ++ bool ok; ++ ++ lock_acquire (&fs_lock); ++ ok = filesys_remove (kfile); ++ lock_release (&fs_lock); ++ + palloc_free_page (kfile); + + return ok; @@ -1066,6 +1074,7 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c + fd = malloc (sizeof *fd); + if (fd != NULL) + { ++ lock_acquire (&fs_lock); + fd->file = filesys_open (kfile); + if (fd->file != NULL) + { @@ -1075,6 +1084,7 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c + } + else + free (fd); ++ lock_release (&fs_lock); + } + + palloc_free_page (kfile); @@ -1109,7 +1119,9 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c + struct file_descriptor *fd = lookup_fd (handle); + int size; + ++ lock_acquire (&fs_lock); + size = file_length (fd->file); ++ lock_release (&fs_lock); + + return size; +} @@ -1117,15 +1129,13 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c +/* Read system call. */ +static int +sys_read (int handle, void *udst_, unsigned size) -+{ + { +- printf ("system call!\n"); + uint8_t *udst = udst_; + struct file_descriptor *fd; + int bytes_read = 0; + -+ /* Look up file descriptor. */ -+ if (handle != STDIN_FILENO) -+ fd = lookup_fd (handle); -+ ++ fd = lookup_fd (handle); + while (size > 0) + { + /* How much to read into this page? */ @@ -1133,37 +1143,44 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c + size_t read_amt = size < page_left ? size : page_left; + off_t retval; + -+ /* Check that touching this page is okay. */ -+ if (!page_lock (udst, true)) -+ thread_exit (); -+ + /* Read from file into page. */ + if (handle != STDIN_FILENO) + { ++ if (!page_lock (udst, true)) ++ thread_exit (); ++ lock_acquire (&fs_lock); + retval = file_read (fd->file, udst, read_amt); -+ if (retval < 0) -+ { -+ if (bytes_read == 0) -+ bytes_read = -1; -+ break; -+ } -+ bytes_read += retval; ++ lock_release (&fs_lock); ++ page_unlock (udst); + } + else + { + size_t i; + + for (i = 0; i < read_amt; i++) -+ udst[i] = kbd_getc (); ++ { ++ char c = kbd_getc (); ++ if (!page_lock (udst, true)) ++ thread_exit (); ++ udst[i] = c; ++ page_unlock (udst); ++ } + bytes_read = read_amt; + } -+ -+ /* Release page. */ -+ page_unlock (udst); -+ -+ /* If it was a short read we're done. */ -+ if (retval != (off_t) read_amt) -+ break; ++ ++ /* Check success. */ ++ if (retval < 0) ++ { ++ if (bytes_read == 0) ++ bytes_read = -1; ++ break; ++ } ++ bytes_read += retval; ++ if (retval != (off_t) read_amt) ++ { ++ /* Short read, so we're done. */ ++ break; ++ } + + /* Advance. */ + udst += retval; @@ -1192,20 +1209,18 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c + size_t write_amt = size < page_left ? size : page_left; + off_t retval; + -+ /* Check that we can touch this user page. */ ++ /* Write from page into file. */ + if (!page_lock (usrc, false)) + thread_exit (); -+ -+ /* Do the write. */ ++ lock_acquire (&fs_lock); + if (handle == STDOUT_FILENO) + { -+ putbuf (usrc, write_amt); ++ putbuf ((char *) usrc, write_amt); + retval = write_amt; + } + else + retval = file_write (fd->file, usrc, write_amt); -+ -+ /* Release user page. */ ++ lock_release (&fs_lock); + page_unlock (usrc); + + /* Handle return value. */ @@ -1233,8 +1248,13 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c +static int +sys_seek (int handle, unsigned position) +{ ++ struct file_descriptor *fd = lookup_fd (handle); ++ ++ lock_acquire (&fs_lock); + if ((off_t) position >= 0) -+ file_seek (lookup_fd (handle)->file, position); ++ file_seek (fd->file, position); ++ lock_release (&fs_lock); ++ + return 0; +} + @@ -1242,7 +1262,14 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c +static int +sys_tell (int handle) +{ -+ return file_tell (lookup_fd (handle)->file); ++ struct file_descriptor *fd = lookup_fd (handle); ++ unsigned position; ++ ++ lock_acquire (&fs_lock); ++ position = file_tell (fd->file); ++ lock_release (&fs_lock); ++ ++ return position; +} + +/* Close system call. */ @@ -1250,7 +1277,9 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c +sys_close (int handle) +{ + struct file_descriptor *fd = lookup_fd (handle); ++ lock_acquire (&fs_lock); + file_close (fd->file); ++ lock_release (&fs_lock); + list_remove (&fd->elem); + free (fd); + return 0; @@ -1283,8 +1312,8 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c + return m; + } + -+ thread_exit (); -+} + thread_exit (); + } + +/* Remove mapping M from the virtual address space, + writing back any pages that have changed. */ @@ -1314,7 +1343,9 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c + return -1; + + m->handle = thread_current ()->next_handle++; ++ lock_acquire (&fs_lock); + m->file = file_reopen (fd->file); ++ lock_release (&fs_lock); + if (m->file == NULL) + { + free (m); @@ -1325,7 +1356,9 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c + list_push_front (&thread_current ()->mappings, &m->elem); + + offset = 0; ++ lock_acquire (&fs_lock); + length = file_length (m->file); ++ lock_release (&fs_lock); + while (length > 0) + { + struct page *p = page_allocate ((uint8_t *) addr + offset, false); @@ -1365,7 +1398,9 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c + { + struct file_descriptor *fd = list_entry (e, struct file_descriptor, elem); + next = list_next (e); ++ lock_acquire (&fs_lock); + file_close (fd->file); ++ lock_release (&fs_lock); + free (fd); + } + @@ -1376,10 +1411,11 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c + next = list_next (e); + unmap (m); + } - } ++} +Index: src/userprog/syscall.h diff -u src/userprog/syscall.h~ src/userprog/syscall.h --- src/userprog/syscall.h~ 2004-09-05 22:38:45.000000000 -0700 -+++ src/userprog/syscall.h 2005-06-08 14:10:54.000000000 -0700 ++++ src/userprog/syscall.h 2006-05-16 13:44:56.000000000 -0700 @@ -2,5 +2,6 @@ #define USERPROG_SYSCALL_H @@ -1387,9 +1423,10 @@ diff -u src/userprog/syscall.h~ src/userprog/syscall.h +void syscall_exit (void); #endif /* userprog/syscall.h */ +Index: src/vm/frame.c diff -u src/vm/frame.c~ src/vm/frame.c --- src/vm/frame.c~ 1969-12-31 16:00:00.000000000 -0800 -+++ src/vm/frame.c 2005-06-08 14:10:54.000000000 -0700 ++++ src/vm/frame.c 2006-05-16 13:44:56.000000000 -0700 @@ -0,0 +1,162 @@ +#include "vm/frame.h" +#include @@ -1397,9 +1434,9 @@ diff -u src/vm/frame.c~ src/vm/frame.c +#include "devices/timer.h" +#include "threads/init.h" +#include "threads/malloc.h" -+#include "threads/mmu.h" +#include "threads/palloc.h" +#include "threads/synch.h" ++#include "threads/vaddr.h" + +static struct frame *frames; +static size_t frame_cnt; @@ -1553,9 +1590,10 @@ diff -u src/vm/frame.c~ src/vm/frame.c + ASSERT (lock_held_by_current_thread (&f->lock)); + lock_release (&f->lock); +} +Index: src/vm/frame.h diff -u src/vm/frame.h~ src/vm/frame.h --- src/vm/frame.h~ 1969-12-31 16:00:00.000000000 -0800 -+++ src/vm/frame.h 2005-06-08 14:10:54.000000000 -0700 ++++ src/vm/frame.h 2006-05-16 13:44:56.000000000 -0700 @@ -0,0 +1,23 @@ +#ifndef VM_FRAME_H +#define VM_FRAME_H @@ -1580,9 +1618,10 @@ diff -u src/vm/frame.h~ src/vm/frame.h +void frame_unlock (struct frame *); + +#endif /* vm/frame.h */ +Index: src/vm/page.c diff -u src/vm/page.c~ src/vm/page.c --- src/vm/page.c~ 1969-12-31 16:00:00.000000000 -0800 -+++ src/vm/page.c 2005-06-08 14:10:54.000000000 -0700 ++++ src/vm/page.c 2006-05-16 13:44:56.000000000 -0700 @@ -0,0 +1,293 @@ +#include "vm/page.h" +#include @@ -1591,9 +1630,9 @@ diff -u src/vm/page.c~ src/vm/page.c +#include "vm/swap.h" +#include "filesys/file.h" +#include "threads/malloc.h" -+#include "threads/mmu.h" +#include "threads/thread.h" +#include "userprog/pagedir.h" ++#include "threads/vaddr.h" + +/* Maximum size of process stack, in bytes. */ +#define STACK_MAX (1024 * 1024) @@ -1877,9 +1916,10 @@ diff -u src/vm/page.c~ src/vm/page.c + ASSERT (p != NULL); + frame_unlock (p->frame); +} +Index: src/vm/page.h diff -u src/vm/page.h~ src/vm/page.h --- src/vm/page.h~ 1969-12-31 16:00:00.000000000 -0800 -+++ src/vm/page.h 2005-06-08 14:10:54.000000000 -0700 ++++ src/vm/page.h 2006-05-16 13:44:56.000000000 -0700 @@ -0,0 +1,50 @@ +#ifndef VM_PAGE_H +#define VM_PAGE_H @@ -1931,9 +1971,10 @@ diff -u src/vm/page.h~ src/vm/page.h +hash_less_func page_less; + +#endif /* vm/page.h */ +Index: src/vm/swap.c diff -u src/vm/swap.c~ src/vm/swap.c --- src/vm/swap.c~ 1969-12-31 16:00:00.000000000 -0800 -+++ src/vm/swap.c 2005-06-08 14:10:54.000000000 -0700 ++++ src/vm/swap.c 2006-05-16 13:44:56.000000000 -0700 @@ -0,0 +1,85 @@ +#include "vm/swap.h" +#include @@ -1942,8 +1983,8 @@ diff -u src/vm/swap.c~ src/vm/swap.c +#include "vm/frame.h" +#include "vm/page.h" +#include "devices/disk.h" -+#include "threads/mmu.h" +#include "threads/synch.h" ++#include "threads/vaddr.h" + +/* The swap disk. */ +static struct disk *swap_disk; @@ -2020,9 +2061,10 @@ diff -u src/vm/swap.c~ src/vm/swap.c + + return true; +} +Index: src/vm/swap.h diff -u src/vm/swap.h~ src/vm/swap.h --- src/vm/swap.h~ 1969-12-31 16:00:00.000000000 -0800 -+++ src/vm/swap.h 2005-06-08 14:10:54.000000000 -0700 ++++ src/vm/swap.h 2006-05-16 13:44:56.000000000 -0700 @@ -0,0 +1,11 @@ +#ifndef VM_SWAP_H +#define VM_SWAP_H 1