Merge pull request #130 from hangpark/develop

Release v3.0

src/Makefile.build

@@ -55,7 +55,9 @@ userprog_SRC += userprog/gdt.c		# GDT initialization.
 userprog_SRC += userprog/tss.c		# TSS management.
 
 # No virtual memory code yet.
-#vm_SRC = vm/file.c			# Some file.
+vm_SRC  = vm/frame.c            # Frame table management.
+vm_SRC += vm/page.c             # Supplemental page management.
+vm_SRC += vm/swap.c             # Swap table management.
 
 # Filesystem code.
 filesys_SRC  = filesys/filesys.c	# Filesystem core.

src/tests/vm/Make.tests

@@ -3,11 +3,7 @@
 tests/vm_TESTS = $(addprefix tests/vm/,pt-grow-stack pt-grow-pusha	\
 pt-grow-bad pt-big-stk-obj pt-bad-addr pt-bad-read pt-write-code	\
 pt-write-code2 pt-grow-stk-sc page-linear page-parallel page-merge-seq	\
-page-merge-par page-merge-stk page-merge-mm page-shuffle mmap-read	\
-mmap-close mmap-unmap mmap-overlap mmap-twice mmap-write mmap-exit	\
-mmap-shuffle mmap-bad-fd mmap-clean mmap-inherit mmap-misalign		\
-mmap-null mmap-over-code mmap-over-data mmap-over-stk mmap-remove	\
-mmap-zero)
+page-merge-par page-merge-stk page-shuffle) 
 
 tests/vm_PROGS = $(tests/vm_TESTS) $(addprefix tests/vm/,child-linear	\
 child-sort child-qsort child-qsort-mm child-mm-wrt child-inherit)
@@ -33,32 +29,10 @@ tests/vm/page-merge-par_SRC = tests/vm/page-merge-par.c \
 tests/vm/parallel-merge.c tests/arc4.c tests/lib.c tests/main.c
 tests/vm/page-merge-stk_SRC = tests/vm/page-merge-stk.c \
 tests/vm/parallel-merge.c tests/arc4.c tests/lib.c tests/main.c
-tests/vm/page-merge-mm_SRC = tests/vm/page-merge-mm.c \
-tests/vm/parallel-merge.c tests/arc4.c tests/lib.c tests/main.c
 tests/vm/page-shuffle_SRC = tests/vm/page-shuffle.c tests/arc4.c	\
 tests/cksum.c tests/lib.c tests/main.c
-tests/vm/mmap-read_SRC = tests/vm/mmap-read.c tests/lib.c tests/main.c
 tests/vm/mmap-close_SRC = tests/vm/mmap-close.c tests/lib.c tests/main.c
-tests/vm/mmap-unmap_SRC = tests/vm/mmap-unmap.c tests/lib.c tests/main.c
 tests/vm/mmap-overlap_SRC = tests/vm/mmap-overlap.c tests/lib.c tests/main.c
-tests/vm/mmap-twice_SRC = tests/vm/mmap-twice.c tests/lib.c tests/main.c
-tests/vm/mmap-write_SRC = tests/vm/mmap-write.c tests/lib.c tests/main.c
-tests/vm/mmap-exit_SRC = tests/vm/mmap-exit.c tests/lib.c tests/main.c
-tests/vm/mmap-shuffle_SRC = tests/vm/mmap-shuffle.c tests/arc4.c	\
-tests/cksum.c tests/lib.c tests/main.c
-tests/vm/mmap-bad-fd_SRC = tests/vm/mmap-bad-fd.c tests/lib.c tests/main.c
-tests/vm/mmap-clean_SRC = tests/vm/mmap-clean.c tests/lib.c tests/main.c
-tests/vm/mmap-inherit_SRC = tests/vm/mmap-inherit.c tests/lib.c tests/main.c
-tests/vm/mmap-misalign_SRC = tests/vm/mmap-misalign.c tests/lib.c	\
-tests/main.c
-tests/vm/mmap-null_SRC = tests/vm/mmap-null.c tests/lib.c tests/main.c
-tests/vm/mmap-over-code_SRC = tests/vm/mmap-over-code.c tests/lib.c	\
-tests/main.c
-tests/vm/mmap-over-data_SRC = tests/vm/mmap-over-data.c tests/lib.c	\
-tests/main.c
-tests/vm/mmap-over-stk_SRC = tests/vm/mmap-over-stk.c tests/lib.c tests/main.c
-tests/vm/mmap-remove_SRC = tests/vm/mmap-remove.c tests/lib.c tests/main.c
-tests/vm/mmap-zero_SRC = tests/vm/mmap-zero.c tests/lib.c tests/main.c
 
 tests/vm/child-linear_SRC = tests/vm/child-linear.c tests/arc4.c tests/lib.c
 tests/vm/child-qsort_SRC = tests/vm/child-qsort.c tests/vm/qsort.c tests/lib.c
@@ -70,29 +44,13 @@ tests/vm/child-inherit_SRC = tests/vm/child-inherit.c tests/lib.c tests/main.c
 
 tests/vm/pt-bad-read_PUTFILES = tests/vm/sample.txt
 tests/vm/pt-write-code2_PUTFILES = tests/vm/sample.txt
-tests/vm/mmap-close_PUTFILES = tests/vm/sample.txt
-tests/vm/mmap-read_PUTFILES = tests/vm/sample.txt
-tests/vm/mmap-unmap_PUTFILES = tests/vm/sample.txt
-tests/vm/mmap-twice_PUTFILES = tests/vm/sample.txt
-tests/vm/mmap-overlap_PUTFILES = tests/vm/zeros
-tests/vm/mmap-exit_PUTFILES = tests/vm/child-mm-wrt
 tests/vm/page-parallel_PUTFILES = tests/vm/child-linear
 tests/vm/page-merge-seq_PUTFILES = tests/vm/child-sort
 tests/vm/page-merge-par_PUTFILES = tests/vm/child-sort
 tests/vm/page-merge-stk_PUTFILES = tests/vm/child-qsort
-tests/vm/page-merge-mm_PUTFILES = tests/vm/child-qsort-mm
-tests/vm/mmap-clean_PUTFILES = tests/vm/sample.txt
-tests/vm/mmap-inherit_PUTFILES = tests/vm/sample.txt tests/vm/child-inherit
-tests/vm/mmap-misalign_PUTFILES = tests/vm/sample.txt
-tests/vm/mmap-null_PUTFILES = tests/vm/sample.txt
-tests/vm/mmap-over-code_PUTFILES = tests/vm/sample.txt
-tests/vm/mmap-over-data_PUTFILES = tests/vm/sample.txt
-tests/vm/mmap-over-stk_PUTFILES = tests/vm/sample.txt
-tests/vm/mmap-remove_PUTFILES = tests/vm/sample.txt
 
 tests/vm/page-linear.output: TIMEOUT = 300
 tests/vm/page-shuffle.output: TIMEOUT = 600
-tests/vm/mmap-shuffle.output: TIMEOUT = 600
 tests/vm/page-merge-seq.output: TIMEOUT = 600
 tests/vm/page-merge-par.output: TIMEOUT = 600
 

src/tests/vm/Make.tests.orig

@@ -0,0 +1,103 @@
+# -*- makefile -*-
+
+tests/vm_TESTS = $(addprefix tests/vm/,pt-grow-stack pt-grow-pusha	\
+pt-grow-bad pt-big-stk-obj pt-bad-addr pt-bad-read pt-write-code	\
+pt-write-code2 pt-grow-stk-sc page-linear page-parallel page-merge-seq	\
+page-merge-par page-merge-stk page-merge-mm page-shuffle mmap-read	\
+mmap-close mmap-unmap mmap-overlap mmap-twice mmap-write mmap-exit	\
+mmap-shuffle mmap-bad-fd mmap-clean mmap-inherit mmap-misalign		\
+mmap-null mmap-over-code mmap-over-data mmap-over-stk mmap-remove	\
+mmap-zero)
+
+tests/vm_PROGS = $(tests/vm_TESTS) $(addprefix tests/vm/,child-linear	\
+child-sort child-qsort child-qsort-mm child-mm-wrt child-inherit)
+
+tests/vm/pt-grow-stack_SRC = tests/vm/pt-grow-stack.c tests/arc4.c	\
+tests/cksum.c tests/lib.c tests/main.c
+tests/vm/pt-grow-pusha_SRC = tests/vm/pt-grow-pusha.c tests/lib.c	\
+tests/main.c
+tests/vm/pt-grow-bad_SRC = tests/vm/pt-grow-bad.c tests/lib.c tests/main.c
+tests/vm/pt-big-stk-obj_SRC = tests/vm/pt-big-stk-obj.c tests/arc4.c	\
+tests/cksum.c tests/lib.c tests/main.c
+tests/vm/pt-bad-addr_SRC = tests/vm/pt-bad-addr.c tests/lib.c tests/main.c
+tests/vm/pt-bad-read_SRC = tests/vm/pt-bad-read.c tests/lib.c tests/main.c
+tests/vm/pt-write-code_SRC = tests/vm/pt-write-code.c tests/lib.c tests/main.c
+tests/vm/pt-write-code2_SRC = tests/vm/pt-write-code-2.c tests/lib.c tests/main.c
+tests/vm/pt-grow-stk-sc_SRC = tests/vm/pt-grow-stk-sc.c tests/lib.c tests/main.c
+tests/vm/page-linear_SRC = tests/vm/page-linear.c tests/arc4.c	\
+tests/lib.c tests/main.c
+tests/vm/page-parallel_SRC = tests/vm/page-parallel.c tests/lib.c tests/main.c
+tests/vm/page-merge-seq_SRC = tests/vm/page-merge-seq.c tests/arc4.c	\
+tests/lib.c tests/main.c
+tests/vm/page-merge-par_SRC = tests/vm/page-merge-par.c \
+tests/vm/parallel-merge.c tests/arc4.c tests/lib.c tests/main.c
+tests/vm/page-merge-stk_SRC = tests/vm/page-merge-stk.c \
+tests/vm/parallel-merge.c tests/arc4.c tests/lib.c tests/main.c
+tests/vm/page-merge-mm_SRC = tests/vm/page-merge-mm.c \
+tests/vm/parallel-merge.c tests/arc4.c tests/lib.c tests/main.c
+tests/vm/page-shuffle_SRC = tests/vm/page-shuffle.c tests/arc4.c	\
+tests/cksum.c tests/lib.c tests/main.c
+tests/vm/mmap-read_SRC = tests/vm/mmap-read.c tests/lib.c tests/main.c
+tests/vm/mmap-close_SRC = tests/vm/mmap-close.c tests/lib.c tests/main.c
+tests/vm/mmap-unmap_SRC = tests/vm/mmap-unmap.c tests/lib.c tests/main.c
+tests/vm/mmap-overlap_SRC = tests/vm/mmap-overlap.c tests/lib.c tests/main.c
+tests/vm/mmap-twice_SRC = tests/vm/mmap-twice.c tests/lib.c tests/main.c
+tests/vm/mmap-write_SRC = tests/vm/mmap-write.c tests/lib.c tests/main.c
+tests/vm/mmap-exit_SRC = tests/vm/mmap-exit.c tests/lib.c tests/main.c
+tests/vm/mmap-shuffle_SRC = tests/vm/mmap-shuffle.c tests/arc4.c	\
+tests/cksum.c tests/lib.c tests/main.c
+tests/vm/mmap-bad-fd_SRC = tests/vm/mmap-bad-fd.c tests/lib.c tests/main.c
+tests/vm/mmap-clean_SRC = tests/vm/mmap-clean.c tests/lib.c tests/main.c
+tests/vm/mmap-inherit_SRC = tests/vm/mmap-inherit.c tests/lib.c tests/main.c
+tests/vm/mmap-misalign_SRC = tests/vm/mmap-misalign.c tests/lib.c	\
+tests/main.c
+tests/vm/mmap-null_SRC = tests/vm/mmap-null.c tests/lib.c tests/main.c
+tests/vm/mmap-over-code_SRC = tests/vm/mmap-over-code.c tests/lib.c	\
+tests/main.c
+tests/vm/mmap-over-data_SRC = tests/vm/mmap-over-data.c tests/lib.c	\
+tests/main.c
+tests/vm/mmap-over-stk_SRC = tests/vm/mmap-over-stk.c tests/lib.c tests/main.c
+tests/vm/mmap-remove_SRC = tests/vm/mmap-remove.c tests/lib.c tests/main.c
+tests/vm/mmap-zero_SRC = tests/vm/mmap-zero.c tests/lib.c tests/main.c
+
+tests/vm/child-linear_SRC = tests/vm/child-linear.c tests/arc4.c tests/lib.c
+tests/vm/child-qsort_SRC = tests/vm/child-qsort.c tests/vm/qsort.c tests/lib.c
+tests/vm/child-qsort-mm_SRC = tests/vm/child-qsort-mm.c tests/vm/qsort.c \
+tests/lib.c
+tests/vm/child-sort_SRC = tests/vm/child-sort.c tests/lib.c
+tests/vm/child-mm-wrt_SRC = tests/vm/child-mm-wrt.c tests/lib.c tests/main.c
+tests/vm/child-inherit_SRC = tests/vm/child-inherit.c tests/lib.c tests/main.c
+
+tests/vm/pt-bad-read_PUTFILES = tests/vm/sample.txt
+tests/vm/pt-write-code2_PUTFILES = tests/vm/sample.txt
+tests/vm/mmap-close_PUTFILES = tests/vm/sample.txt
+tests/vm/mmap-read_PUTFILES = tests/vm/sample.txt
+tests/vm/mmap-unmap_PUTFILES = tests/vm/sample.txt
+tests/vm/mmap-twice_PUTFILES = tests/vm/sample.txt
+tests/vm/mmap-overlap_PUTFILES = tests/vm/zeros
+tests/vm/mmap-exit_PUTFILES = tests/vm/child-mm-wrt
+tests/vm/page-parallel_PUTFILES = tests/vm/child-linear
+tests/vm/page-merge-seq_PUTFILES = tests/vm/child-sort
+tests/vm/page-merge-par_PUTFILES = tests/vm/child-sort
+tests/vm/page-merge-stk_PUTFILES = tests/vm/child-qsort
+tests/vm/page-merge-mm_PUTFILES = tests/vm/child-qsort-mm
+tests/vm/mmap-clean_PUTFILES = tests/vm/sample.txt
+tests/vm/mmap-inherit_PUTFILES = tests/vm/sample.txt tests/vm/child-inherit
+tests/vm/mmap-misalign_PUTFILES = tests/vm/sample.txt
+tests/vm/mmap-null_PUTFILES = tests/vm/sample.txt
+tests/vm/mmap-over-code_PUTFILES = tests/vm/sample.txt
+tests/vm/mmap-over-data_PUTFILES = tests/vm/sample.txt
+tests/vm/mmap-over-stk_PUTFILES = tests/vm/sample.txt
+tests/vm/mmap-remove_PUTFILES = tests/vm/sample.txt
+
+tests/vm/page-linear.output: TIMEOUT = 300
+tests/vm/page-shuffle.output: TIMEOUT = 600
+tests/vm/mmap-shuffle.output: TIMEOUT = 600
+tests/vm/page-merge-seq.output: TIMEOUT = 600
+tests/vm/page-merge-par.output: TIMEOUT = 600
+
+tests/vm/zeros:
+	dd if=/dev/zero of=$@ bs=1024 count=6
+
+clean::
+	rm -f tests/vm/zeros

src/tests/vm/Rubric.functionality

@@ -11,20 +11,4 @@ Functionality of virtual memory subsystem:
 3	page-shuffle
 4	page-merge-seq
 4	page-merge-par
-4	page-merge-mm
 4	page-merge-stk
-
-- Test "mmap" system call.
-2	mmap-read
-2	mmap-write
-2	mmap-shuffle
-
-2	mmap-twice
-
-2	mmap-unmap
-1	mmap-exit
-
-3	mmap-clean
-
-2	mmap-close
-2	mmap-remove

src/tests/vm/Rubric.functionality.orig

@@ -0,0 +1,30 @@
+Functionality of virtual memory subsystem:
+- Test stack growth.
+3	pt-grow-stack
+3	pt-grow-stk-sc
+3	pt-big-stk-obj
+3	pt-grow-pusha
+
+- Test paging behavior.
+3	page-linear
+3	page-parallel
+3	page-shuffle
+4	page-merge-seq
+4	page-merge-par
+4	page-merge-mm
+4	page-merge-stk
+
+- Test "mmap" system call.
+2	mmap-read
+2	mmap-write
+2	mmap-shuffle
+
+2	mmap-twice
+
+2	mmap-unmap
+1	mmap-exit
+
+3	mmap-clean
+
+2	mmap-close
+2	mmap-remove

src/tests/vm/Rubric.robustness

@@ -5,17 +5,3 @@ Robustness of virtual memory subsystem:
 2	pt-write-code
 3	pt-write-code2
 4	pt-grow-bad
-
-- Test robustness of "mmap" system call.
-1	mmap-bad-fd
-1	mmap-inherit
-1	mmap-null
-1	mmap-zero
-
-2	mmap-misalign
-
-2	mmap-over-code
-2	mmap-over-data
-2	mmap-over-stk
-2	mmap-overlap
-

src/tests/vm/Rubric.robustness.orig

@@ -0,0 +1,21 @@
+Robustness of virtual memory subsystem:
+- Test robustness of page table support.
+2	pt-bad-addr
+3	pt-bad-read
+2	pt-write-code
+3	pt-write-code2
+4	pt-grow-bad
+
+- Test robustness of "mmap" system call.
+1	mmap-bad-fd
+1	mmap-inherit
+1	mmap-null
+1	mmap-zero
+
+2	mmap-misalign
+
+2	mmap-over-code
+2	mmap-over-data
+2	mmap-over-stk
+2	mmap-overlap
+

src/threads/init.c

@@ -34,6 +34,10 @@
 #include "filesys/filesys.h"
 #include "filesys/fsutil.h"
 #endif
+#ifdef VM
+#include "vm/frame.h"
+#include "vm/swap.h"
+#endif
 
 /* Amount of physical memory, in 4 kB pages. */
 size_t ram_pages;
@@ -87,6 +91,9 @@ main (void)
   palloc_init ();
   malloc_init ();
   paging_init ();
+#ifdef VM
+  frame_table_init ();
+#endif
 
   /* Segmentation. */
 #ifdef USERPROG
@@ -113,6 +120,9 @@ main (void)
   /* Initialize file system. */
   disk_init ();
   filesys_init (format_filesys);
+#ifdef VM
+  swap_table_init ();
+#endif
 #endif
 
   printf ("Boot complete.\n");

src/threads/thread.h

@@ -7,6 +7,9 @@
 #ifdef USERPROG
 #include "userprog/process.h"
 #endif
+#ifdef VM
+#include "vm/page.h"
+#endif
 
 /* States in a thread's life cycle. */
 enum thread_status
@@ -106,6 +109,8 @@ struct thread
     /* Owned by userprog/process.c. */
     struct process process;             /* User process. */
     uint32_t *pagedir;                  /* Page directory. */
+    struct suppl_pt *suppl_pt;          /* Suppplemental page table. */
+    uint32_t *esp;                      /* Stack pointer. */
 #endif
 
     /* Owned by thread.c. */

src/userprog/exception.c

@@ -1,11 +1,14 @@
 #include "userprog/exception.h"
+#include <debug.h>
 #include <inttypes.h>
 #include <stdio.h>
-#include <debug.h>
-#include "userprog/gdt.h"
-#include "userprog/syscall.h"
 #include "threads/interrupt.h"
 #include "threads/thread.h"
+#include "threads/vaddr.h"
+#include "userprog/gdt.h"
+#include "userprog/syscall.h"
+
+#define STACK_LIMIT 0x40000000
 
 /* Number of page faults processed. */
 static long long page_fault_cnt;
@@ -150,6 +153,29 @@ page_fault (struct intr_frame *f)
   write = (f->error_code & PF_W) != 0;
   user = (f->error_code & PF_U) != 0;
 
+#ifdef VM
+  void *upage = pg_round_down (fault_addr);
+
+  /* Only deal with a fault caused by a non-present page.
+     See [IA32-v3a] 6-41 for more information. */
+  if (!not_present)
+    goto page_level_protection_violation;
+
+  /* Stack growth. */
+  uint32_t *esp = user ? f->esp : thread_current ()->esp;
+  if (STACK_LIMIT <= fault_addr && fault_addr < PHYS_BASE
+      && esp - 16 <= fault_addr && suppl_pt_get_page (upage) == NULL)
+    {
+      if (!suppl_pt_set_zero (upage))
+        goto page_level_protection_violation;
+    }
+
+  /* Load page from appropriate source. */
+  if (suppl_pt_load_page (upage))
+    return;
+#endif
+
+ page_level_protection_violation:
   /* Change EIP to the next instruction address which is saved on
      EAX, and set EAX by -1 to return the failure code. */
   if (!user)