Fix rox checking and make filesys_lock global

.gitlab-ci.yml

@@ -16,13 +16,18 @@ stages:
   script:
     - cd src/$DIR
     - make check | tee build.log
-    - grep -vE "^FAIL $IGNORE\$" build.log | grep -q "FAIL tests/$DIR" && exit 1 || exit 0
+    - grep -q "FAIL tests/$DIR" build.log && exit 1 || exit 0
 
 test_devices:
   extends: .pintos_tests
   variables:
     DIR: devices
 
+test_filesys:
+  extends: .pintos_tests
+  variables:
+    DIR: filesys
+
 test_threads:
   extends: .pintos_tests
   variables:
@@ -37,4 +42,3 @@ test_vm:
   extends: .pintos_tests
   variables:
     DIR: vm
-    IGNORE: (tests/vm/pt-grow-stack|tests/vm/pt-grow-pusha|tests/vm/pt-big-stk-obj|tests/vm/pt-overflowstk|tests/vm/pt-write-code2|tests/vm/pt-grow-stk-sc|tests/vm/page-linear|tests/vm/page-parallel|tests/vm/page-merge-seq|tests/vm/page-merge-par|tests/vm/page-merge-stk|tests/vm/page-merge-mm|tests/vm/mmap-read|tests/vm/mmap-close|tests/vm/mmap-overlap|tests/vm/mmap-twice|tests/vm/mmap-write|tests/vm/mmap-exit|tests/vm/mmap-shuffle|tests/vm/mmap-clean|tests/vm/mmap-inherit|tests/vm/mmap-misalign|tests/vm/mmap-null|tests/vm/mmap-over-code|tests/vm/mmap-over-data|tests/vm/mmap-over-stk|tests/vm/mmap-remove)

src/Makefile.build

@@ -62,8 +62,6 @@ userprog_SRC += userprog/gdt.c		# GDT initialization.
 userprog_SRC += userprog/tss.c		# TSS management.
 
 # Virtual memory code.
-vm_SRC += vm/frame.c                    # Frame table manager.
-vm_SRC += vm/page.c                     # Page table manager.
 vm_SRC += devices/swap.c		# Swap block manager.
 #vm_SRC = vm/file.c			# Some other file.
 

src/examples/Makefile

@@ -4,7 +4,7 @@ SRCDIR = ..
 # To add a new test, put its name on the PROGS list
 # and then add a name_SRC line that lists its source files.
 PROGS = cat cmp cp echo halt hex-dump mcat mcp rm \
-	bubsort insult lineup matmult recursor args-ovf
+	bubsort insult lineup matmult recursor
 
 # Should work from task 2 onward.
 cat_SRC = cat.c
@@ -18,7 +18,6 @@ lineup_SRC = lineup.c
 ls_SRC = ls.c
 recursor_SRC = recursor.c
 rm_SRC = rm.c
-args-ovf_SRC = args-ovf.c
 
 # Should work in task 3; also in task 4 if VM is included.
 bubsort_SRC = bubsort.c

src/tests/userprog/Make.tests

@@ -9,14 +9,14 @@ sc-bad-arg sc-bad-num sc-boundary sc-boundary-2 halt exit create-normal		\
 create-empty create-null create-bad-ptr create-long create-exists	\
 create-bound open-normal open-missing open-boundary open-empty		\
 open-null open-bad-ptr open-twice close-normal close-twice close-stdin	\
-close-stdout close-bad-fd read-normal read-bad-ptr read-bad-buf read-boundary	\
-read-zero read-stdout read-bad-fd write-normal write-bad-ptr write-bad-buf	\
+close-stdout close-bad-fd read-normal read-bad-ptr read-boundary	\
+read-zero read-stdout read-bad-fd write-normal write-bad-ptr		\
 write-boundary write-zero write-stdin write-bad-fd exec-once exec-arg	\
 exec-large-arg exec-multiple exec-missing exec-over-arg exec-over-args \
 exec-bad-ptr wait-simple wait-twice wait-killed wait-load-kill \
 wait-bad-pid wait-bad-child multi-recurse multi-child-fd rox-simple	\
 rox-child rox-multichild bad-read bad-write bad-read2 bad-write2        \
-bad-jump bad-jump2 bad-maths overflow-stack)
+bad-jump bad-jump2 bad-maths)
 
 tests/userprog_PROGS = $(tests/userprog_TESTS) $(addprefix \
 tests/userprog/,child-simple child-args child-bad child-close child-rox exec-exit)
@@ -36,7 +36,6 @@ tests/userprog/bad-read2_SRC = tests/userprog/bad-read2.c tests/main.c
 tests/userprog/bad-write2_SRC = tests/userprog/bad-write2.c tests/main.c
 tests/userprog/bad-jump2_SRC = tests/userprog/bad-jump2.c tests/main.c
 tests/userprog/bad-maths_SRC = tests/userprog/bad-maths.c tests/main.c
-tests/userprog/overflow-stack_SRC = tests/userprog/overflow-stack.c tests/main.c
 tests/userprog/sc-boundary_SRC = tests/userprog/sc-boundary.c	\
 tests/userprog/boundary.c tests/main.c
 tests/userprog/sc-boundary-2_SRC = tests/userprog/sc-boundary-2.c	\
@@ -67,7 +66,6 @@ tests/userprog/close-stdout_SRC = tests/userprog/close-stdout.c tests/main.c
 tests/userprog/close-bad-fd_SRC = tests/userprog/close-bad-fd.c tests/main.c
 tests/userprog/read-normal_SRC = tests/userprog/read-normal.c tests/main.c
 tests/userprog/read-bad-ptr_SRC = tests/userprog/read-bad-ptr.c tests/main.c
-tests/userprog/read-bad-buf_SRC = tests/userprog/read-bad-buf.c tests/main.c
 tests/userprog/read-boundary_SRC = tests/userprog/read-boundary.c	\
 tests/userprog/boundary.c tests/main.c
 tests/userprog/read-zero_SRC = tests/userprog/read-zero.c tests/main.c
@@ -75,7 +73,6 @@ tests/userprog/read-stdout_SRC = tests/userprog/read-stdout.c tests/main.c
 tests/userprog/read-bad-fd_SRC = tests/userprog/read-bad-fd.c tests/main.c
 tests/userprog/write-normal_SRC = tests/userprog/write-normal.c tests/main.c
 tests/userprog/write-bad-ptr_SRC = tests/userprog/write-bad-ptr.c tests/main.c
-tests/userprog/write-bad-buf_SRC = tests/userprog/write-bad-buf.c tests/main.c
 tests/userprog/write-boundary_SRC = tests/userprog/write-boundary.c	\
 tests/userprog/boundary.c tests/main.c
 tests/userprog/write-zero_SRC = tests/userprog/write-zero.c tests/main.c
@@ -125,12 +122,10 @@ tests/userprog/close-normal_PUTFILES += tests/userprog/sample.txt
 tests/userprog/close-twice_PUTFILES += tests/userprog/sample.txt
 tests/userprog/read-normal_PUTFILES += tests/userprog/sample.txt
 tests/userprog/read-bad-ptr_PUTFILES += tests/userprog/sample.txt
-tests/userprog/read-bad-buf_PUTFILES += tests/userprog/sample.txt
 tests/userprog/read-boundary_PUTFILES += tests/userprog/sample.txt
 tests/userprog/read-zero_PUTFILES += tests/userprog/sample.txt
 tests/userprog/write-normal_PUTFILES += tests/userprog/sample.txt
 tests/userprog/write-bad-ptr_PUTFILES += tests/userprog/sample.txt
-tests/userprog/write-bad-buf_PUTFILES += tests/userprog/sample.txt
 tests/userprog/write-boundary_PUTFILES += tests/userprog/sample.txt
 tests/userprog/write-zero_PUTFILES += tests/userprog/sample.txt
 tests/userprog/multi-child-fd_PUTFILES += tests/userprog/sample.txt

src/tests/userprog/Rubric.robustnessCR

@@ -1,9 +1,5 @@
-Full robustness of argument passing and syscall handling code:
-- Test user stack overflow robustness of "exec" system calls and user code.
+Full robustness of argument passing code:
+- Test user stack overflow robustness of "exec" system calls.
 5	exec-over-arg
 5	exec-over-args
-5	overflow-stack
 
-- Test syscall user provided buffer validity checks.
-5	read-bad-buf
-5	write-bad-buf

src/tests/userprog/exec-bad-ptr.ck

@@ -2,7 +2,11 @@
 use strict;
 use warnings;
 use tests::tests;
-check_expected ([<<'EOF']);
+check_expected ([<<'EOF', <<'EOF']);
+(exec-bad-ptr) begin
+(exec-bad-ptr) end
+exec-bad-ptr: exit(0)
+EOF
 (exec-bad-ptr) begin
 exec-bad-ptr: exit(-1)
 EOF

src/tests/userprog/open-bad-ptr.ck

@@ -2,7 +2,11 @@
 use strict;
 use warnings;
 use tests::tests;
-check_expected ([<<'EOF']);
+check_expected ([<<'EOF', <<'EOF']);
+(open-bad-ptr) begin
+(open-bad-ptr) end
+open-bad-ptr: exit(0)
+EOF
 (open-bad-ptr) begin
 open-bad-ptr: exit(-1)
 EOF

src/tests/userprog/overflow-stack.c

@@ -1,17 +0,0 @@
-/* Attempt to overflow the user stack by allocating a 4kB buffer and writing into it.
-   The process must be terminated with -1 exit code until stack growth has been implemented in Task 3
-*/
-
-#include <string.h>
-#include <syscall.h>
-#include "tests/lib.h"
-#include "tests/main.h"
-
-void
-test_main (void)
-{
-  char stack_obj[4096];
-  memset (stack_obj, 'a', sizeof stack_obj);
-  memset (stack_obj+10, '\0', 1);
-  msg ("buffer: %s", stack_obj);
-}

src/tests/userprog/overflow-stack.ck

@@ -1,14 +0,0 @@
-# -*- perl -*-
-use strict;
-use warnings;
-use tests::tests;
-check_expected (IGNORE_USER_FAULTS => 1, [<<'EOF',<<'EOF']);
-(overflow-stack) begin
-overflow-stack: exit(-1)
-EOF
-(overflow-stack) begin
-(overflow-stack) buffer: aaaaaaaaaa
-(overflow-stack) end
-overflow-stack: exit(0)
-EOF
-pass;

src/tests/userprog/read-bad-buf.c

@@ -1,17 +0,0 @@
-/* Passes a buffer to the read system call that starts in valid memory, but runs into kernel space.
-   The process must be terminated with -1 exit code.
-*/
-
-#include <syscall.h>
-#include "tests/lib.h"
-#include "tests/main.h"
-
-void
-test_main (void)
-{
-  int handle;
-  CHECK ((handle = open ("sample.txt")) > 1, "open \"sample.txt\"");
-
-  read (handle, (char *) 0xbfffffe0, 100);
-  fail ("should not have survived read()");
-}

src/tests/userprog/read-bad-buf.ck

@@ -1,10 +0,0 @@
-# -*- perl -*-
-use strict;
-use warnings;
-use tests::tests;
-check_expected (IGNORE_KERNEL_FAULTS => 1, [<<'EOF']);
-(read-bad-buf) begin
-(read-bad-buf) open "sample.txt"
-read-bad-buf: exit(-1)
-EOF
-pass;

src/tests/userprog/read-bad-ptr.ck

@@ -2,7 +2,12 @@
 use strict;
 use warnings;
 use tests::tests;
-check_expected ([<<'EOF']);
+check_expected ([<<'EOF', <<'EOF']);
+(read-bad-ptr) begin
+(read-bad-ptr) open "sample.txt"
+(read-bad-ptr) end
+read-bad-ptr: exit(0)
+EOF
 (read-bad-ptr) begin
 (read-bad-ptr) open "sample.txt"
 read-bad-ptr: exit(-1)

src/tests/userprog/write-bad-buf.c

@@ -1,17 +0,0 @@
-/* Passes a buffer to the write system call that starts in valid memory, but runs into kernel space.
-   The process must be terminated with -1 exit code.
-*/
-
-#include <syscall.h>
-#include "tests/lib.h"
-#include "tests/main.h"
-
-void
-test_main (void)
-{
-  int handle;
-  CHECK ((handle = open ("sample.txt")) > 1, "open \"sample.txt\"");
-
-  write (handle, (char *) 0xbffffff0, 32);
-  fail ("should have exited with -1");
-}

src/tests/userprog/write-bad-buf.ck

@@ -1,10 +0,0 @@
-# -*- perl -*-
-use strict;
-use warnings;
-use tests::tests;
-check_expected (IGNORE_KERNEL_FAULTS => 1, [<<'EOF']);
-(write-bad-buf) begin
-(write-bad-buf) open "sample.txt"
-write-bad-buf: exit(-1)
-EOF
-pass;

src/tests/userprog/write-bad-ptr.ck

@@ -2,7 +2,12 @@
 use strict;
 use warnings;
 use tests::tests;
-check_expected ([<<'EOF']);
+check_expected ([<<'EOF', <<'EOF']);
+(write-bad-ptr) begin
+(write-bad-ptr) open "sample.txt"
+(write-bad-ptr) end
+write-bad-ptr: exit(0)
+EOF
 (write-bad-ptr) begin
 (write-bad-ptr) open "sample.txt"
 write-bad-ptr: exit(-1)

src/threads/init.c

@@ -32,7 +32,6 @@
 #include "tests/threads/tests.h"
 #endif
 #ifdef VM
-#include "vm/frame.h"
 #include "devices/swap.h"
 #endif
 #ifdef FILESYS
@@ -102,9 +101,6 @@ main (void)
   palloc_init (user_page_limit);
   malloc_init ();
   paging_init ();
-#ifdef VM
-  frame_init ();
-#endif
 
   /* Segmentation. */
 #ifdef USERPROG

src/threads/synch.c

@@ -212,7 +212,6 @@ donate_priority (struct thread *donee) {
   ASSERT (intr_get_level () == INTR_OFF);
 
   struct thread *donor = thread_current ();
-  list_remove (&donor->donor_elem);
   list_push_back (&donee->donors_list, &donor->donor_elem);
   
   while (donee != NULL)
@@ -261,7 +260,6 @@ lock_acquire (struct lock *lock)
   ASSERT (!lock_held_by_current_thread (lock));
 
   struct thread *t = thread_current ();
-  ASSERT (t->waiting_lock == NULL);
 
   enum intr_level old_level = intr_disable ();
   if (lock->holder != NULL)
@@ -343,6 +341,7 @@ lock_release (struct lock *lock)
      released, transfer the remaining orphaned donors to its donor list. */
   if (max_donor != NULL)
     {
+      list_remove (&max_donor->donor_elem);
       while (!list_empty (&orphan_list))
         list_push_back (&max_donor->donors_list, list_pop_front (&orphan_list));
     }

src/threads/thread.c

@@ -71,7 +71,7 @@ static void kernel_thread (thread_func *, void *aux);
 static void idle (void *aux UNUSED);
 static struct thread *running_thread (void);
 static struct thread *next_thread_to_run (void);
-static bool init_process_result (struct thread *t);
+static void init_process_result (struct thread *t);
 static void init_thread (struct thread *, const char *name, int nice,
                          int priority, fp32_t recent_cpu);
 static bool is_thread (struct thread *) UNUSED;
@@ -84,10 +84,6 @@ void thread_schedule_tail (struct thread *prev);
 static tid_t allocate_tid (void);
 static bool donor_priority_less (const struct list_elem *a_,
                                  const struct list_elem *b_, void *aux UNUSED);
-static unsigned process_result_hash (const struct hash_elem *e,
-                                     void *aux UNUSED);
-static bool process_result_less (const struct hash_elem *a,
-                                 const struct hash_elem *b, void *aux UNUSED);
 
 /* Initializes the threading system by transforming the code
    that's currently running into a thread.  This can't work in
@@ -126,13 +122,6 @@ thread_init (void)
 void
 thread_start (void) 
 {
-  /* Malloc has been initalised, we can allocate the child results table
-     for the main thread. */
-  struct thread *t = thread_current ();
-  if (!hash_init (&t->child_results, process_result_hash, process_result_less,
-                  t))
-    PANIC ("Failed to initialise child results table for main thread.");
-
   /* Create the idle thread. */
   struct semaphore idle_started;
   sema_init (&idle_started, 0);
@@ -252,24 +241,10 @@ thread_create (const char *name, int priority,
   struct thread *parent_thread = thread_current ();
   init_thread (t, name, parent_thread->nice, priority, parent_thread->recent_cpu);
   tid = t->tid = allocate_tid ();
-  if (!init_process_result (t))
-    {
-      palloc_free_page (t);
-      return TID_ERROR;
-    }
+  init_process_result (t);
 
   #ifdef USERPROG
-  /* Initialize the thread's file descriptor table. */
-  t->fd_counter = MINIMUM_USER_FD;
-
-  if (!hash_init (&t->open_files, fd_hash, fd_less, NULL)
-      || !hash_init (&t->child_results, process_result_hash,
-                     process_result_less, t))
-    {
-      palloc_free_page (t);
-      free (t->result);
-      return TID_ERROR;
-    }
+    hash_init (&t->open_files, fd_hash, fd_less, NULL);
   #endif
 
   /* Prepare thread for first run by initializing its stack.
@@ -294,7 +269,9 @@ thread_create (const char *name, int priority,
 
   intr_set_level (old_level);
 
-  hash_insert (&parent_thread->child_results, &t->result->elem);
+  /* No need to synchronise child_results since it is only ever accessed by one
+     thread. By the nature of increasing TIDs, this list is ordered. */
+  list_push_back (&parent_thread->child_results, &t->result->elem);
 
   /* Add to run queue. */
   thread_unblock (t);
@@ -396,9 +373,7 @@ thread_exit (void)
      and schedule another process.  That process will destroy us
      when it calls thread_schedule_tail(). */
   intr_disable ();
-  struct thread *t = thread_current ();
-  list_remove (&t->allelem);
-  list_remove (&t->donor_elem);
+  list_remove (&thread_current()->allelem);
   thread_current ()->status = THREAD_DYING;
   schedule ();
   NOT_REACHED ();
@@ -672,18 +647,15 @@ is_thread (struct thread *t)
 }
 
 /* Allocate and initialise a process result for given thread. */
-static bool
+static void
 init_process_result (struct thread *t)
 {
   struct process_result *result = malloc (sizeof (struct process_result));
-  if (result == NULL)
-    return false;
   result->tid = t->tid;
-  result->exit_status = -1;
+  result->exit_status = t->exit_status;
   lock_init (&result->lock);
   sema_init (&result->sema, 0);
   t->result = result;
-  return true;
 }
 
 /* Does basic initialization of T as a blocked thread named
@@ -707,13 +679,15 @@ init_thread (struct thread *t, const char *name, int nice, int priority,
   t->base_priority
       = thread_mlfqs ? calculate_bsd_priority (recent_cpu, nice) : priority;
   list_init (&t->donors_list);
-  list_push_back (&t->donors_list, &t->donor_elem);
   t->waiting_lock = NULL;
 
   t->nice = nice;
   t->recent_cpu = recent_cpu;
   t->priority = t->base_priority;
 
+  t->exit_status = -1;
+  list_init (&t->child_results);
+
   old_level = intr_disable ();
   list_push_back (&all_list, &t->allelem);
   intr_set_level (old_level);
@@ -844,29 +818,6 @@ allocate_tid (void)
   return tid;
 }
 
-/* Hashing function needed for child_results table.
-   Returns hash of process_result's TID. */
-static unsigned
-process_result_hash (const struct hash_elem *e, void *aux UNUSED)
-{
-  const struct process_result *result
-      = hash_entry (e, struct process_result, elem);
-  return hash_int (result->tid);
-}
-
-/* Comparator function needed for child_results table.
-   Returns less than comparison on process_results' TIDs. */
-static bool
-process_result_less (const struct hash_elem *a_, const struct hash_elem *b_,
-                     void *aux UNUSED)
-{
-  const struct process_result *a
-      = hash_entry (a_, struct process_result, elem);
-  const struct process_result *b
-      = hash_entry (b_, struct process_result, elem);
-  return a->tid < b->tid;
-}
-
 /* Offset of `stack' member within `struct thread'.
    Used by switch.S, which can't figure it out on its own. */
 uint32_t thread_stack_ofs = offsetof (struct thread, stack);

src/threads/thread.h

@@ -32,9 +32,6 @@ typedef int tid_t;
 #define NICE_DEFAULT 0 /* Default niceness. */
 #define NICE_MAX 20    /* Highest niceness. */
 
-/* File Descriptors. */
-#define MINIMUM_USER_FD 2 /* Minimum file descriptor for user programs. */
-
 /* A process result, synchronised between parent and child. */
 struct process_result
 {
@@ -44,7 +41,7 @@ struct process_result
   struct lock lock;      /* Lock the exit_status and sema. */
   struct semaphore sema; /* Semaphore to signal the parent that the exit_status
                             has been set. */
-  struct hash_elem elem; /* Hash element for the parent's children map. */
+  struct list_elem elem; /* List element for the parent's children list. */
 };
 
 /* A kernel thread or user process.
@@ -128,23 +125,21 @@ struct thread
 
     /* Process wait properties. */
     struct process_result *result;      /* Result of the process. */
-    struct hash child_results;          /* Map of children's of this thread
-                                           TID to process result. */
+    struct list child_results;          /* List of children's of this thread
+                                           process results. */
     struct file *exec_file;             /* Thread's currently running file */
 
     /* Shared between thread.c and synch.c. */
     struct list_elem elem;              /* List element. */
 
+    int exit_status;                    /* Exit Status: 0 = successful exit. */
+
 #ifdef USERPROG
     /* Owned by userprog/process.c. */
     uint32_t *pagedir;                  /* Page directory. */
-    unsigned int fd_counter;            /* File descriptor counter for thread's
-                                           open files. */
-    struct hash open_files;             /* Hash Table of FD -> Struct File. */
+    struct hash open_files;             /* Hash Table of FD -> Struct File */
 #endif
 
-    void *curr_esp;
-
     /* Owned by thread.c. */
     unsigned magic;                     /* Detects stack overflow. */
   };

src/userprog/Make.vars

@@ -1,7 +1,7 @@
 # -*- makefile -*-
 
-kernel.bin: DEFINES = -DUSERPROG -DFILESYS -DVM
-KERNEL_SUBDIRS = threads devices lib lib/kernel userprog filesys vm
+kernel.bin: DEFINES = -DUSERPROG -DFILESYS
+KERNEL_SUBDIRS = threads devices lib lib/kernel userprog filesys
 TEST_SUBDIRS = tests/userprog tests/userprog/no-vm tests/filesys/base
 GRADING_FILE = $(SRCDIR)/tests/userprog/Grading
 SIMULATOR = --qemu

src/userprog/exception.c

@@ -2,15 +2,8 @@
 #include <inttypes.h>
 #include <stdio.h>
 #include "userprog/gdt.h"
-#include "userprog/pagedir.h"
-#include "userprog/process.h"
 #include "threads/interrupt.h"
-#include "threads/palloc.h"
 #include "threads/thread.h"
-#include "threads/vaddr.h"
-
-#define MAX_STACK_SIZE (8 * 1024 * 1024) // 8MB
-#define MAX_STACK_OFFSET 32 // 32 bytes offset below stack pointer (ESP)
 
 /* Number of page faults processed. */
 static long long page_fault_cnt;
@@ -18,9 +11,6 @@ static long long page_fault_cnt;
 static void kill (struct intr_frame *);
 static void page_fault (struct intr_frame *);
 
-static bool is_valid_stack_access (const void *fault_addr, const void *esp);
-static bool grow_stack (void *upage);
-
 /* Registers handlers for interrupts that can be caused by user
    programs.
 
@@ -155,27 +145,6 @@ page_fault (struct intr_frame *f)
   write = (f->error_code & PF_W) != 0;
   user = (f->error_code & PF_U) != 0;
 
-  if (!user || !not_present)
-  {
-    f->eip = (void *)f->eax;
-    f->eax = 0xffffffff;
-    return;
-  }
-
-  /* If the fault address is in a user page that is not present, then it might
-   be just that the stack needs to grow. So we attempt to grow the stack. */
-  void *upage = pg_round_down (fault_addr);
-  if (not_present && is_user_vaddr (upage) && upage != NULL)
-    {
-      if (is_valid_stack_access (fault_addr, f->esp))
-        {
-          if (grow_stack (upage))
-            return;
-        }
-
-      /* TODO: Check SPT for the page. */
-    }
-
   /* To implement virtual memory, delete the rest of the function
      body, and replace it with code that brings in the page to
      which fault_addr refers. */
@@ -187,50 +156,3 @@ page_fault (struct intr_frame *f)
   kill (f);
 }
 
-/* Validates whether the fault address is a valid stack access. Access is a
-   valid stack access under the following two conditions:
-     1. The fault address must be within MAX_STACK_OFFSET (32) bytes below
-      the current stack pointer. (Accounts for both PUSH and PUSHA instructions)
-     2. Growing this stack to this address does not cause it to exceed the
-      MAX_STACK_SIZE (8MB) limit.
-
-   Returns true if both conditions are met, false otherwise.
-
-   Pre: fault_addr is a valid user virtual address (so also not NULL). */
-static bool
-is_valid_stack_access (const void *fault_addr, const void *esp)
-{
-  uint32_t new_stack_size = PHYS_BASE - pg_round_down (fault_addr);
-
-  uint32_t *lowest_valid_push_addr = (uint32_t *)esp - MAX_STACK_OFFSET;
-  bool is_within_push_range = (uint32_t *)fault_addr >= lowest_valid_push_addr;
-
-  return is_within_push_range && new_stack_size <= MAX_STACK_SIZE;
-}
-
-/* Attempts to grow the stack by allocating and mapping a new page.
-  This involves:
-    1. Allocating a zeroed page from the user pool
-    2. Installing it into the page table with write permissions
-
-  Returns true if the stack was successfully grown, false if either
-  allocation or installation fails.
-
-  Pre: upage is a valid page-aligned address (so also not NULL). */
-static bool
-grow_stack (void *upage)
-{
-  /* Allocate new page for stack */
-  void *kpage = palloc_get_page (PAL_USER | PAL_ZERO);
-  if (kpage == NULL)
-    return false;
-
-  /* Install the page into user page table */
-  if (!install_page (upage, kpage, true))
-    {
-      palloc_free_page (kpage);
-      return false;
-    }
-
-  return true;
-}

src/userprog/process.c

@@ -1,6 +1,5 @@
 #include "userprog/process.h"
 #include <debug.h>
-#include <hash.h>
 #include <inttypes.h>
 #include <list.h>
 #include <round.h>
@@ -24,18 +23,11 @@
 #include "threads/vaddr.h"
 #include "threads/synch.h"
 #include "devices/timer.h"
-#ifdef VM
-#include "vm/frame.h"
-#endif
 
 /* Defines the native number of bytes processed by the processor
    (for the purposes of alignment). */
 #define WORD_SIZE 4
 
-/* Defines non-negative integer division wherein the result is always rounded
-   up. */
-#define DIV_CEIL(x, y) ((x + (y - 1)) / y)
-
 /* Keeps track of the position of pointers to user program arguments
    within a linked list. */
 struct arg_elem
@@ -48,18 +40,16 @@ struct arg_elem
    that executes process_start for the purpose of starting a user process. */
 struct process_start_data
   {
+    char *cmd; /* Pointer to a copy of the command used to execute the process.
+                  Allocated a page that must be freed by process_start. */
     char *cmd_saveptr; /* Value pointed to by 'saveptr' argument used by
                           successive calls to strtok_r to split 'cmd' into
                           tokens while maintaining state. */
     char file_name[FNAME_MAX_LEN + 1]; /* Name of the file of the process to
                                       be started. */
-    bool success; /* Indicates whether the process was successfully loaded. */
-    struct semaphore loaded; /* Semaphore used to signal that the process has
-                                finished attempting to load. */
   };
 
 static thread_func start_process NO_RETURN;
-static void destruct_process_result (struct hash_elem *e, void *aux UNUSED);
 static bool load (const char *cmdline, void (**eip) (void), void **esp);
 
 /* Starts a new thread running a user program executed via
@@ -71,7 +61,12 @@ process_execute (const char *cmd)
 {
   char *cmd_copy;
   tid_t tid;
-  struct process_start_data data;
+  
+  struct process_start_data *data = malloc (sizeof (struct process_start_data));
+  if (data == NULL)
+    {
+      return TID_ERROR;
+    }
 
   /* Make a copy of command.
      Otherwise there's a race between the caller and load(). */
@@ -85,41 +80,25 @@ process_execute (const char *cmd)
 
   /* Retrieve first argument of command, which is the file name
      of the process. */
-  char *file_name = strtok_r (cmd_copy, " ", &data.cmd_saveptr);
+  char *file_name = strtok_r (cmd_copy, " ", &data->cmd_saveptr);
 
-  /* Validates that the current file to be executed can be opened/exists. */
-  lock_acquire (&filesys_lock);
-  struct file *file = filesys_open (file_name);
-  lock_release (&filesys_lock);
-  if (file == NULL)
+  /* Validates that the current file to be executed is a valid file */
+  if (filesys_open (file_name) == NULL)
     return TID_ERROR;
 
   /* Create a new thread to execute the command, by initializing
      it running the function 'start_process' with the appropriate
      arguments. For details of arguments, see 'start_process'. */
-  strlcpy (data.file_name, file_name, FNAME_MAX_LEN + 1);
-  sema_init (&data.loaded, 0);
-  data.success = false;
-
-  tid = thread_create (file_name, PRI_DEFAULT, start_process, &data);
-
-  /* Wait until process file has finished attempting to load via the child
-     thread before reporting success of starting execution. */
-  if (tid != TID_ERROR)
-    {
-      sema_down (&data.loaded);
-      if (!data.success)
-        tid = TID_ERROR;
-    }
+  data->cmd = cmd_copy;
+  strlcpy (data->file_name, file_name, FNAME_MAX_LEN + 1);
 
+  tid = thread_create (file_name, PRI_DEFAULT, start_process, data);
+  if (tid == TID_ERROR)
     palloc_free_page (cmd_copy); 
   return tid;
 }
 
-static void *get_usr_kpage (enum palloc_flags flags, void *upage);
-static void free_usr_kpage (void *kpage);
-bool install_page (void *upage, void *kpage, bool writable);
-
+static bool install_page (void *upage, void *kpage, bool writable);
 static bool process_init_stack (char *cmd_saveptr, void **esp, char *file_name);
 static void *push_to_stack (void **esp, void *data, size_t data_size);
 #define push_var_to_stack(esp, var) (push_to_stack (esp, &var, sizeof (var)))
@@ -127,15 +106,14 @@ static void *push_to_stack (void **esp, void *data, size_t data_size);
 /* Make the current thread execute 'cmd', passing in a copy of the
    command string used for processing, the saveptr used by strtok_r
    (in order to further tokenize the same command and retrieve its
-   arguments), the name of the file being executed, and a semaphore that
-   calls sema_up to indicate that the 'success' variable passed to it
-   has been updated to indicate whether the process file loading succeeded. 
-   This involves loading the specified file and calling its main () function
-   with the specified command arguments. */
+   arguments), as well as the name of the file being executed. This
+   involves loading the specified file and starting it running. */
 static void
 start_process (void *proc_start_data)
 {
   struct intr_frame if_;
+  bool success;
+
   struct process_start_data *data = proc_start_data;
 
   /* Initialize interrupt frame and load executable. */
@@ -143,46 +121,33 @@ start_process (void *proc_start_data)
   if_.gs = if_.fs = if_.es = if_.ds = if_.ss = SEL_UDSEG;
   if_.cs = SEL_UCSEG;
   if_.eflags = FLAG_IF | FLAG_MBS;
+  success = load (data->file_name, &if_.eip, &if_.esp);
 
-  /* Acquire the file system lock to prevent race conditions. */
-  lock_acquire (&filesys_lock);
-
-  struct file *exec_file = filesys_open (data->file_name);
-  if (exec_file == NULL)
-    {
-      /* If the executable file cannot be opened, free resources and quit. */
-      lock_release (&filesys_lock);
-      sema_up (&data->loaded);
-      thread_exit ();
-    }
-
-  /* Deny write to the executable file to prevent writing to it and release the
-     file system lock. */
-  file_deny_write (exec_file);
-  lock_release (&filesys_lock);
-
-  thread_current ()->exec_file = exec_file;
-
-  /* Load the ELF executable file, and store the success of the operation in
-     the 'success' variable in data. */
-  data->success = load (data->file_name, &if_.eip, &if_.esp);
-
-  /* If load was sucessful, initialize user process stack and free page used
- to store the command that executed the process. */
-  if (data->success)
-    {
-      data->success =
-        process_init_stack (data->cmd_saveptr, &if_.esp, data->file_name);
-    }
-
-  /* Signal that the process has finished attempting to load. */
-  bool success = data->success;
-  sema_up (&data->loaded);
-  
-  /* If the load was unsuccessful or if it was but the stack initialization
-     failed, exit the thread. */
+  /* If load failed, quit. */
   if (!success) 
-      thread_exit ();
+    {
+      palloc_free_page (data->cmd);
+      goto fail;
+    }
+
+  /* Initialize user process stack and free page used to store the
+     command that executed the process. */
+  success = process_init_stack (data->cmd_saveptr, &if_.esp, data->file_name);
+  palloc_free_page (data->cmd);
+  
+  /* If stack initialization failed, free resources and quit. */
+  if (!success)
+    {
+      process_exit ();
+      goto fail;
+    }
+
+  /* NOTE: Currently, the file being executed is closed in load () and then 
+           reopened here. Because load is an exported public function, this
+           might be necessary. */
+  struct file *exec_file = filesys_open (data->file_name);
+  thread_current ()->exec_file = exec_file;
+  file_deny_write (exec_file);
 
   /* Start the user process by simulating a return from an
      interrupt, implemented by intr_exit (in
@@ -192,6 +157,11 @@ start_process (void *proc_start_data)
      and jump to it. */
   asm volatile ("movl %0, %%esp; jmp intr_exit" : : "g" (&if_) : "memory");
   NOT_REACHED ();
+
+/* If starting the process failed, free its common resources and exit. */
+ fail:
+  free (data);
+  thread_exit ();
 }
 
 /* Helper function that initializes the stack of a newly created 
@@ -199,10 +169,6 @@ start_process (void *proc_start_data)
 static bool
 process_init_stack (char *cmd_saveptr, void **esp, char *file_name)
   {
-    ASSERT (cmd_saveptr != NULL);
-    ASSERT (esp != NULL);
-    ASSERT (file_name != NULL);
-
     /* Load command line argument *data* to user process stack.
        This can't cause overflow due to enforcing that the size of
        command line input must fit in a page. Also keep track
@@ -214,12 +180,8 @@ process_init_stack (char *cmd_saveptr, void **esp, char *file_name)
     int arg_count = 0;
     while (arg != NULL)
       {
-        /* filename has already been validated to be a safe-to-access string,
-           so we can safely use strlen here. Filename has already been
-           split from the command line arguments. */
         push_to_stack (esp, arg, (strlen (arg) + 1) * sizeof (char));
         
-        /* Try to allocate memory for the argument pointer. */
         struct arg_elem *arg_elem = malloc (sizeof (struct arg_elem));
         if (arg_elem == NULL)
           {
@@ -228,11 +190,9 @@ process_init_stack (char *cmd_saveptr, void **esp, char *file_name)
             return false;
           }
 
-        /* Store the argument pointer in the linked list. */
         arg_elem->arg = *esp;
         list_push_front (&arg_list, &arg_elem->elem);
 
-        /* Increment the argument count and get the next argument. */
         arg_count++;
         arg = strtok_r (NULL, " ", &cmd_saveptr);
       }
@@ -248,23 +208,13 @@ process_init_stack (char *cmd_saveptr, void **esp, char *file_name)
                             + return_addr_size;
 
     /* If pushing the rest of the data required for the stack would cause
-       overflow, allocate as many extra pages as needed to the user process
-       contiguously in the virtual address space below the initial page. */
-    int overflow_bytes = (PHYS_BASE - *esp) + remaining_size - PGSIZE;
-    if (overflow_bytes > 0)
+       overflow, allocate an extra page that is contiguous within the
+       virtual address space (below the current address range). */ 
+    if (PHYS_BASE - *esp + remaining_size > PGSIZE)
       {
-        /* Calculate the number of pages needed to allocate. */
-        int pages_needed = DIV_CEIL (overflow_bytes, PGSIZE);
-
-        /* Allocate the pages and map them to the user process. */
-        void *upage;
-        uint8_t *kpage;
-        for (int i = 1; i < pages_needed + 1; i++)
-          {
-            upage = ((uint8_t *) PHYS_BASE) - PGSIZE * (i + 1);
-            kpage = get_usr_kpage (PAL_ZERO, upage);
-            if (!install_page (upage, kpage, true)) return false;
-          }
+        uint8_t *kpage = palloc_get_page (PAL_USER | PAL_ZERO);
+        if (!install_page (((uint8_t *) PHYS_BASE) - PGSIZE * 2, kpage, true))
+          return false;
       }
 
     /* Align stack pointer to word size before pushing argv elements for
@@ -322,35 +272,39 @@ push_to_stack (void **esp, void *data, size_t data_size)
  * This function will be implemented in task 2.
  * For now, it does nothing. */
 int
-process_wait (tid_t child_tid)
+process_wait (tid_t child_tid UNUSED) 
 {
-  struct thread *t = thread_current ();
-  struct process_result fake_result;
-  fake_result.tid = child_tid;
-  struct hash_elem *e = hash_find (&t->child_results, &fake_result.elem);
-  if (e == NULL)
+  struct process_result *child_result = NULL;
+  struct list_elem *e;
+  struct thread *cur = thread_current ();
+  for (e = list_begin (&cur->child_results);
+       e != list_end (&cur->child_results); e = list_next (e))
+    {
+      struct process_result *result
+          = list_entry (e, struct process_result, elem);
+      if (result->tid == child_tid)
+        {
+          child_result = result;
+          break;
+        }
+      /* List is ordered, allowing us to break early. */
+      else if (result->tid > child_tid)
+        break;
+    }
+  if (child_result == NULL)
     return -1;
-
-  struct process_result *child_result
-      = hash_entry (e, struct process_result, elem);
   /* Wait for child to die. */
   sema_down (&child_result->sema);
-
   /* We need lock release in process_exit, so we need to acquire (and possibly
      wait) for it here to ensure we don't free the lock memory before it is
      released in process_exit. */
   lock_acquire (&child_result->lock);
-  /* To prevent waiting for child twice, remove it from the table.
+  /* To prevent waiting for child twice, remove it from the list.
      No need to use lock since this is the only thread with access to
      the struct process_result now. */
-  hash_delete (&t->child_results, &child_result->elem);
-
-  /* Get the exit status of the child */
+  list_remove (&child_result->elem);
   int exit_status = child_result->exit_status;
-
-  /* Release the lock */
   lock_release (&child_result->lock);
-  /* Result no-longer used by parent, nor child. Deallocate it. */
   free (child_result);
   return exit_status;
 }
@@ -362,27 +316,50 @@ process_exit (void)
   struct thread *cur = thread_current ();
   uint32_t *pd;
 
-  /* Clean up all open files */
-  hash_destroy (&cur->open_files, fd_cleanup);
-
-  /* Close the executable file, implicitly allowing it to be written to. */
-  if (cur->exec_file != NULL)
-    {
-      /* Acquire the file system lock to prevent race conditions. */
-      lock_acquire (&filesys_lock);
+  printf ("%s: exit(%d)\n", cur->name, cur->exit_status);
   file_close (cur->exec_file);
-      lock_release (&filesys_lock);
-    }
 
+  /* Update process result. */
   if (cur->result != NULL)
     {
-      printf ("%s: exit(%d)\n", cur->name, cur->result->exit_status);
-      /* Update own process result. */
-      destruct_process_result (&cur->result->elem, cur);
+      lock_acquire (&cur->result->lock);
+      cur->result->exit_status = cur->exit_status;
+      /* Parent has died, child has to free the struct process_result * */
+      if (sema_try_down (&cur->result->sema))
+        {
+          lock_release (&cur->result->lock);
+          free (cur->result);
+        }
+      /* Parent is still alive and will be the one to free the
+         struct process_result *, and may be waiting so call sema_up */
+      else
+        {
+          sema_up (&cur->result->sema);
+          lock_release (&cur->result->lock);
+        }
     }
 
   /* Free child process results or signal parent's death. */
-  hash_destroy (&cur->child_results, destruct_process_result);
+  struct list_elem *e;
+  for (e = list_begin (&cur->child_results);
+       e != list_end (&cur->child_results); e = list_next (e))
+    {
+      struct process_result *result
+          = list_entry (e, struct process_result, elem);
+      lock_acquire (&result->lock);
+      /* Child has died (and was not waited for). Free the result. */
+      if (sema_try_down (&result->sema))
+        {
+          lock_release (&result->lock);
+          free (result);
+        }
+      /* Child is still alive, signal via sema that parent has died. */
+      else
+        {
+          sema_up (&result->sema);
+          lock_release (&result->lock);
+        }
+    }
 
   /* Destroy the current process's page directory and switch back
      to the kernel-only page directory. */
@@ -402,28 +379,6 @@ process_exit (void)
     }
 }
 
-/* Destruct a process_result, with multi-thread awareness.
-   If the other thread is running, simply signals death. Otherwise
-   frees the result. */
-static void
-destruct_process_result (struct hash_elem *e, void *aux UNUSED)
-{
-  struct process_result *result = hash_entry (e, struct process_result, elem);
-  lock_acquire (&result->lock);
-  /* Other thread has died (and was not waited for). Free the result. */
-  if (sema_try_down (&result->sema))
-    {
-      lock_release (&result->lock);
-      free (result);
-    }
-  /* Other thread is still alive, signal via sema that parent has died. */
-  else
-    {
-      sema_up (&result->sema);
-      lock_release (&result->lock);
-    }
-}
-
 /* Sets up the CPU for running user code in the current
    thread.
    This function is called on every context switch. */
@@ -522,7 +477,6 @@ load (const char *file_name, void (**eip) (void), void **esp)
   off_t file_ofs;
   bool success = false;
   int i;
-  lock_acquire (&filesys_lock);
 
   /* Allocate and activate page directory. */
   t->pagedir = pagedir_create ();
@@ -622,7 +576,6 @@ load (const char *file_name, void (**eip) (void), void **esp)
  done:
   /* We arrive here whether the load is successful or not. */
   file_close (file);
-  lock_release (&filesys_lock);
   return success;
 }
 
@@ -711,7 +664,7 @@ load_segment (struct file *file, off_t ofs, uint8_t *upage,
       if (kpage == NULL){
         
         /* Get a new page of memory. */
-        kpage = get_usr_kpage (0, upage);
+        kpage = palloc_get_page (PAL_USER);
         if (kpage == NULL){
           return false;
         }
@@ -719,7 +672,7 @@ load_segment (struct file *file, off_t ofs, uint8_t *upage,
         /* Add the page to the process's address space. */
         if (!install_page (upage, kpage, writable)) 
         {
-          free_usr_kpage (kpage);
+          palloc_free_page (kpage);
           return false; 
         }     
         
@@ -754,52 +707,18 @@ setup_stack (void **esp)
   uint8_t *kpage;
   bool success = false;
 
-  void *upage = ((uint8_t *) PHYS_BASE) - PGSIZE;
-  
-  kpage = get_usr_kpage (PAL_ZERO, upage);
+  kpage = palloc_get_page (PAL_USER | PAL_ZERO);
   if (kpage != NULL) 
     {
-      success = install_page (upage, kpage, true);
+      success = install_page (((uint8_t *) PHYS_BASE) - PGSIZE, kpage, true);
       if (success)
         *esp = PHYS_BASE;
       else
-        free_usr_kpage (kpage);
+        palloc_free_page (kpage);
     }
   return success;
 }
 
-/* Claims a page from the user pool for ownership by the current thread
-   and returns its kernel address, updating the frame table if VM
-   is enabled. Requires the intended virtual address for where the page
-   will be installed. */
-static void *
-get_usr_kpage (enum palloc_flags flags, void *upage)
-{
-  void *page;
-#ifdef VM
-  struct thread *t = thread_current ();
-  if (pagedir_get_page (t->pagedir, upage) != NULL)
-    return NULL;
-  else
-    page = frame_alloc (flags, upage, t);
-#else
-  page = palloc_get_page (flags | PAL_USER);
-#endif
-  return page;
-}
-
-/* Frees a page belonging to a user process given its kernel address,
-   updating the frame table if VM is enabled. */
-static void
-free_usr_kpage (void *kpage)
-{
-#ifdef VM
-  frame_free (kpage);
-#else
-  palloc_free_page (kpage);
-#endif
-}
-
 /* 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;
@@ -809,7 +728,7 @@ free_usr_kpage (void *kpage)
    with palloc_get_page().
    Returns true on success, false if UPAGE is already mapped or
    if memory allocation fails. */
-bool
+static bool
 install_page (void *upage, void *kpage, bool writable)
 {
   struct thread *t = thread_current ();

src/userprog/process.h

@@ -8,6 +8,4 @@ int process_wait (tid_t);
 void process_exit (void);
 void process_activate (void);
 
-bool install_page (void *upage, void *kpage, bool writable);
-
 #endif /* userprog/process.h */

src/userprog/syscall.c

@@ -11,11 +11,9 @@
 #include "userprog/process.h"
 #include "userprog/pagedir.h"
 #include <stdio.h>
-#include <stdbool.h>
 #include <syscall-nr.h>
 
-#define MAX_SYSCALL_ARGS 3
-#define EXIT_FAILURE -1
+static unsigned fd_counter = MIN_USER_FD;
 
 struct open_file
   {
@@ -47,22 +45,18 @@ static unsigned syscall_tell (int fd);
 static void syscall_close (int fd);
 
 static struct open_file *fd_get_file (int fd);
-static void validate_user_pointer (const void *ptr, size_t size,
-                                   bool check_write);
-static void validate_user_string (const char *str, bool check_write);
-static int get_user (const uint8_t *);
-static bool put_user (uint8_t *, uint8_t);
+static void *validate_user_pointer (const void *ptr, size_t size);
 
 /* A struct defining a syscall_function pointer along with its arity. */
-struct syscall_arguments
+typedef struct
   {
     syscall_function function;    /* Function pointer. */
     int arity;                    /* Number of arguments of the function. */
-  };
+  } syscall_arguments;
 
 /* A look-up table mapping numbers to system call functions with their number of
    arguments. */
-static const struct syscall_arguments syscall_lookup[] =
+static const syscall_arguments syscall_lookup[] =
 {
   [SYS_HALT] = {(syscall_function) syscall_halt, 0},
   [SYS_EXIT] = {(syscall_function) syscall_exit, 1},
@@ -82,7 +76,8 @@ static const struct syscall_arguments syscall_lookup[] =
 /* The number of syscall functions (i.e, number of elements) within the
    syscall_lookup table. */
 static const int LOOKUP_SIZE
-  = sizeof (syscall_lookup) / sizeof (struct syscall_arguments);
+  = sizeof (syscall_lookup) / sizeof (syscall_arguments);
+
 
 /* Initialises the syscall handling system, as well as a global lock to
    synchronise all file access between processes. */
@@ -93,28 +88,27 @@ syscall_init (void)
   lock_init (&filesys_lock);
 }
 
-/* Function that takes an interrupt frame containing a syscall and its args.
+/* Function that takes a interrupt frame containing a syscall and its args.
    Validates the arguments and pointers before calling the relevant
    high-level system call function, storing its output (if any) in f->eax */
 static void
 syscall_handler (struct intr_frame *f)
 {
   /* First, read the system call number from the stack. */
-  validate_user_pointer (f->esp, sizeof (uintptr_t), false);
-  uintptr_t syscall_number = *(int *)f->esp;
-  thread_current ()->curr_esp = f->esp;
+  validate_user_pointer (f->esp, 1);
+  unsigned syscall_number = *(int *) f->esp;
 
   /* Ensures the number corresponds to a system call that can be handled. */
   if (syscall_number >= LOOKUP_SIZE)
-    syscall_exit (EXIT_FAILURE);
+    thread_exit ();
 
-  struct syscall_arguments syscall = syscall_lookup[syscall_number];
+  syscall_arguments syscall = syscall_lookup[syscall_number];
 
   /* Next, read and copy the arguments from the stack pointer. */
   validate_user_pointer (f->esp + sizeof (uintptr_t),
-                         syscall.arity * sizeof (uintptr_t), false);
-  uintptr_t args[MAX_SYSCALL_ARGS] = { 0 };
-  for (int i = 0; i < syscall.arity && i < MAX_SYSCALL_ARGS; i++)
+                         syscall.arity * sizeof (uintptr_t));
+  uintptr_t args[3] = {0};
+  for (int i=0; i < syscall.arity; i++)
       args[i] = *(uintptr_t *) (f->esp + sizeof (uintptr_t) * (i + 1));
 
   /* Call the function that handles this system call with the arguments. When
@@ -135,18 +129,22 @@ syscall_exit (int status)
 {
   /* Sets exit_status of the thread to status. thread_exit () will call
      process_exit () if user programs are allowed. */
-  thread_current ()->result->exit_status = status;
+  thread_current ()->exit_status = status;
   thread_exit ();
 }
 
 /* Executes a given command with the relevant args, by calling process_execute.
-   Returns PID for the process that is running the CMD_LINE. */
+   Acquires the filesystem lock as process_execute accesses the file system.
+   Returns PID for the process that is running the CMD_LINE
+ */
 static pid_t
 syscall_exec (const char *cmd_line)
 {
-  validate_user_string (cmd_line, false);
+  validate_user_pointer (cmd_line, 1);
 
-  return process_execute (cmd_line); /* Returns the PID of the new process */
+  pid_t pid = process_execute(cmd_line);
+
+  return pid;
 }
 
 /* Handles the syscall of wait. Effectively a wrapper for process_wait as the
@@ -154,23 +152,21 @@ syscall_exec (const char *cmd_line)
 static int
 syscall_wait (pid_t pid)
 {
-  return process_wait (pid); /* Returns the exit status of the waited process */
+  return process_wait (pid);
 }
 
 /* Handles the syscall for file creation. First validates the user file
    pointer. Acquires the file system lock to prevent synchronisation issues,
    and then uses FILESYS_CREATE to create the file, returning the same status */
 static bool
-syscall_create (const char *file, unsigned initial_size)
+syscall_create (const char *file UNUSED, unsigned initial_size UNUSED)
 {
-  validate_user_string (file, false);
+  validate_user_pointer (file, 1);
 
-  /* Acquire the file system lock to prevent race conditions. */
   lock_acquire (&filesys_lock);
   bool status = filesys_create (file, initial_size);
   lock_release (&filesys_lock);
 
-  /* Return the status of the file creation. */
   return status;
 }
 
@@ -180,14 +176,12 @@ syscall_create (const char *file, unsigned initial_size)
 static bool
 syscall_remove (const char *file)
 {
-  validate_user_string (file, false);
+  validate_user_pointer (file, 1);
 
-  /* Acquire the file system lock to prevent race conditions. */
   lock_acquire (&filesys_lock);
   bool status = filesys_remove (file);
   lock_release (&filesys_lock);
 
-  /* Return the status of the file removal. */
   return status;
 }
 
@@ -198,31 +192,23 @@ syscall_remove (const char *file)
 static int
 syscall_open (const char *file)
 {
-  validate_user_string (file, false);
+  validate_user_pointer (file, 1);
 
-  /* Acquire the file system lock to prevent race conditions. */
   lock_acquire (&filesys_lock);
   struct file *ptr = filesys_open (file);
   lock_release (&filesys_lock);
-
-  /* If the file could not be opened, return failure. */
   if (ptr == NULL)
-    return EXIT_FAILURE;
+    return -1;
 
   /* Allocate space for a struct representing a mapping from an FD to a struct
      file. */
   struct open_file *file_info
     = (struct open_file*) malloc (sizeof (struct open_file));
   if (file_info == NULL)
-    {
-      /* If we could not allocate memory for the file_info struct, close the
-         file and return failure. */
-      file_close (ptr);
-      return EXIT_FAILURE;
-    }
+    return -1;
 
   /* Populate the above struct, with a unique FD and the current open file */
-  file_info->fd = thread_current ()->fd_counter++;
+  file_info->fd = fd_counter++;
   file_info->file = ptr;
 
   /* Add the new FD->file mapping to the hashtable for the current thread */
@@ -238,17 +224,14 @@ syscall_open (const char *file)
 static int
 syscall_filesize (int fd)
 {
-  /* Try to get the file from the FD. If it does not exist, return failure. */
   struct open_file *file_info = fd_get_file (fd);
   if (file_info == NULL)
-      return EXIT_FAILURE;
+      return -1;
 
-  /* Acquire the file system lock to prevent any race conditions. */
   lock_acquire (&filesys_lock);
   int bytes = file_length (file_info->file);
   lock_release (&filesys_lock);
 
-  /* Return the number of bytes in the file. */
   return bytes;
 }
 
@@ -261,36 +244,30 @@ syscall_read (int fd, void *buffer, unsigned size)
 {
   /* Only console (fd = 0) or other files, not including STDOUT, (fd > 1) are
      allowed. */
-  if (fd < STDIN_FILENO || fd == STDOUT_FILENO)
-    return EXIT_FAILURE;
+  if (fd < 0 || fd == STDOUT_FILENO)
+    return -1;
 
-  validate_user_pointer (buffer, size, true);
+  validate_user_pointer (buffer, size);
 
   if (fd == STDIN_FILENO)
     {
       /* Reading from the console. */
       char *write_buffer = buffer;
-      for (unsigned i = 0; i < size; i++)
+      for (int i = 0; i < size; i++)
         write_buffer[i] = input_getc ();
 
-      /* In case of console, read is always (eventually) successful. So return
-         the size for the number of bytes read. */
       return size;
     }
   else
     {
       /* Reading from a file. */
-      /* Find the file from the FD. If it does not exist, return failure. */
       struct open_file *file_info = fd_get_file (fd);
       if (file_info == NULL)
-        return EXIT_FAILURE;
+        return -1;
 
-      /* Acquire the file system lock to prevent race-conditions. */
       lock_acquire (&filesys_lock);
       int bytes_written = file_read (file_info->file, buffer, size);
       lock_release (&filesys_lock);
-
-      /* Return the number of bytes read. */
       return bytes_written;
     }
 }
@@ -307,31 +284,25 @@ syscall_write (int fd, const void *buffer, unsigned size)
   if (fd <= 0)
     return 0;
 
-  validate_user_pointer (buffer, size, false);
+  validate_user_pointer (buffer, size);
 
   if (fd == STDOUT_FILENO)
     {
       /* Writing to the console. */
       putbuf (buffer, size);
-
-      /* In case of console, write is always successful. So return the size for
-         the number of bytes written. */
       return size;
     }
   else
     {
       /* Writing to a file. */
-      /* Find the file from the FD. If it does not exist, return failure. */
       struct open_file *file_info = fd_get_file (fd);
       if (file_info == NULL)
         return 0;
 
-      /* Acquire the file system lock to prevent race conditions. */
       lock_acquire (&filesys_lock);
       int bytes = file_write (file_info->file, buffer, size);
       lock_release (&filesys_lock);
 
-      /* Return the number of bytes written. */
       return bytes;
     }
 }
@@ -343,10 +314,13 @@ syscall_write (int fd, const void *buffer, unsigned size)
 static void
 syscall_seek (int fd, unsigned position)
 {
-  /* Find the file from the FD. If it does not exist, do nothing. */
   struct open_file *file_info = fd_get_file (fd);
   if (file_info != NULL)
+  {
+    lock_acquire (&filesys_lock);
     file_seek (file_info->file, position);
+    lock_release (&filesys_lock);
+  }
 }
 
 /* Handles the syscall for returning the next byte in a file referenced by
@@ -355,14 +329,14 @@ syscall_seek (int fd, unsigned position)
 static unsigned
 syscall_tell (int fd)
 {
-  /* Find the file from the FD. If it does not exist, return 0. */
   struct open_file *file_info = fd_get_file (fd);
   if (file_info == NULL)
     return 0;
 
+  lock_acquire (&filesys_lock);
   unsigned pos = file_tell (file_info->file);
+  lock_release (&filesys_lock);
 
-  /* Return the current position in the file. */
   return pos;
 }
 
@@ -372,21 +346,14 @@ syscall_tell (int fd)
 static void
 syscall_close (int fd)
 {
-  /* Find the file from the FD. If it does not exist, do nothing. */
   struct open_file *file_info = fd_get_file (fd);
   if (file_info != NULL)
     {
-      /* File exists */
-      /* First, remove the file from the hash table of open files. */
       hash_delete (&thread_current ()->open_files, &file_info->elem);
 
-      /* Then, close the file, acquiring the file system lock to prevent race
-         conditions. */
       lock_acquire (&filesys_lock);
       file_close (file_info->file);
       lock_release (&filesys_lock);
-
-      /* Free the memory allocated for the file_info struct. */
       free (file_info);
     }
 }
@@ -396,12 +363,7 @@ syscall_close (int fd)
 unsigned
 fd_hash (const struct hash_elem *element, void *aux UNUSED)
 {
-  /* We use the FD as the hash value. This is because the FD is incremented
-     sequentially and is therefore unique for each file. It positively affects
-     the performance of the hash table: 1. It is unique so no need to call
-     expensive hash functions. 2. It being sequential means that the hash table
-     is more likely to be weight balanced. */
-  return hash_entry (element, struct open_file, elem)->fd;
+  return hash_int (hash_entry (element, struct open_file, elem)->fd);
 }
 
 /* Comparator function for the open_file table. Compares two entries based on
@@ -416,20 +378,6 @@ fd_less (const struct hash_elem *a_, const struct hash_elem *b_,
   return a->fd < b->fd;
 }
 
-/* Function to clean up an open file entry. Closes the file and frees the
-   associated memory. */
-void
-fd_cleanup (struct hash_elem *e, void *aux UNUSED)
-{
-  struct open_file *file_info = hash_entry (e, struct open_file, elem);
-
-  lock_acquire (&filesys_lock);
-  file_close (file_info->file);
-  lock_release (&filesys_lock);
-
-  free (file_info);
-}
-
 /* Gets a file from its descriptor (FD number). If there is no file with the fd
    FD it returns NULL. */
 static struct open_file *
@@ -450,90 +398,17 @@ fd_get_file (int fd)
 }
 
 /* Validates if a block of memory starting at PTR and of size SIZE bytes is
-   fully contained within valid user virtual memory. thread_exit () if the
-   memory is invalid.
+   fully contained within user virtual memory. Kills the thread (by calling
+   thread_exit) if the memory is invalid. Otherwise, returns the PTR given.
    If the size is 0, the function does no checks and returns PTR.*/
-static void
-validate_user_pointer (const void *ptr, size_t size, bool check_write)
+static void *
+validate_user_pointer (const void *ptr, size_t size)
 {
-  if (size == 0)
-    return;
-  /* ptr < ptr + size - 1, so sufficient to check that (ptr + size -1) is a
-     valid user virtual memory address. */
-  void *last = ptr + size - 1;
-  if (!is_user_vaddr (last))
-    syscall_exit (EXIT_FAILURE);
-  ptr = pg_round_down (ptr);
-  while (ptr <= last)
-    {
-      int result;
-      /* Check read access to pointer. */
-      if ((result = get_user (ptr)) == -1)
-        syscall_exit (EXIT_FAILURE);
-      /* Check write access to pointer (if required). */
-      if (check_write && !put_user (ptr, result))
-        syscall_exit (EXIT_FAILURE);
-      ptr += PGSIZE;
-    }
-}
-
-/* Validates of a C-string starting at ptr is fully contained within valid
-   user virtual memory. thread_exit () if the memory is invalid. */
-static void
-validate_user_string (const char *ptr, bool check_write)
-{
-  size_t offset = (uintptr_t) ptr % PGSIZE;
-
-  for (;;)
-    {
-      void *page = pg_round_down (ptr);
-
-      if (!is_user_vaddr (page))
-        syscall_exit (EXIT_FAILURE);
-      if (!is_user_vaddr (ptr))
-        syscall_exit (EXIT_FAILURE);
-      int result;
-      if ((result = get_user ((const uint8_t *)ptr)) == -1)
-        syscall_exit (EXIT_FAILURE);
-      if (check_write && !put_user ((uint8_t *)ptr, result))
-        syscall_exit (EXIT_FAILURE);
-
-      while (offset < PGSIZE)
-      {
-        if (*ptr == '\0')
-          return; /* We reached the end of the string without issues. */
-
-        ptr++;
-        offset++;
-      }
-
-      offset = 0;
-
-    }
-}
-
-/* PROVIDED BY SPEC.
-   Reads a byte at user virtual address UADDR.
-   UADDR must be below PHYS_BASE.
-   Returns the byte value if successful, -1 if a segfault occurred. */
-static int
-get_user (const uint8_t *uaddr)
-{
-  int result;
-  asm ("movl $1f, %0; movzbl %1, %0; 1:" : "=&a"(result) : "m"(*uaddr));
-  return result;
-}
-
-/* PROVIDED BY SPEC.
-   Writes BYTE to user address UDST.
-   UDST must be below PHYS_BASE.
-   Returns true if successful, false if a segfault occurred. */
-static bool
-put_user (uint8_t *udst, uint8_t byte)
-{
-  int error_code;
-  asm ("movl $1f, %0; movb %b2, %1; 1:"
-       : "=&a"(error_code), "=m"(*udst)
-       : "q"(byte));
-  return error_code != -1;
+  if (size > 0 && (ptr == NULL ||
+                   !is_user_vaddr (ptr) ||
+                   !is_user_vaddr (ptr + size - 1) ||
+                   pagedir_get_page (thread_current()->pagedir, ptr) == NULL))
+    thread_exit ();
+
+  return (void *) ptr;
 }

src/userprog/syscall.h

@@ -4,6 +4,8 @@
 #include <hash.h>
 #include "threads/synch.h"
 
+#define MIN_USER_FD 2
+
 typedef int pid_t;
 
 struct lock filesys_lock;
@@ -12,6 +14,5 @@ void syscall_init (void);
 
 unsigned fd_hash (const struct hash_elem *element, void *aux);
 bool fd_less (const struct hash_elem *a, const struct hash_elem *b, void *aux);
-void fd_cleanup (struct hash_elem *e, void *aux);
 
 #endif /* userprog/syscall.h */

src/vm/frame.c

@@ -1,256 +0,0 @@
-#include <debug.h>
-#include <hash.h>
-#include <list.h>
-#include <string.h>
-
-#include "frame.h"
-#include "page.h"
-#include "threads/malloc.h"
-#include "threads/vaddr.h"
-#include "userprog/pagedir.h"
-#include "threads/synch.h"
-#include "devices/swap.h"
-
-/* Hash table that maps every active frame's kernel virtual address
-   to its corresponding 'frame_metadata'.*/
-struct hash frame_table;
-
-/* Linked list used to represent the circular queue in the 'clock'
-   algorithm for page eviction. Iterating from the element that is
-   currently pointed at by 'next_victim' yields an ordering of the entries
-   from oldest to newest (in terms of when they were added or checked
-   for having been referenced by a process). */
-struct list lru_list;
-
-/* The next element in lru_list to be considered for eviction (oldest added
-   or referenced page in the circular queue). If this page has has an
-   'accessed' bit of 0 when considering eviction, then it will be the next
-   victim. Otherwise, the next element in the queue is similarly considered. */
-struct list_elem *next_victim = NULL;
-
-/* Synchronisation variables. */
-/* Protects access to 'lru_list'. */
-struct lock lru_lock;
-
-struct frame_metadata
-  {
-     void *frame;  /* The kernel virtual address holding the frame. */
-     void *upage; /* The user virtual address pointing to the frame. */
-     struct thread *owner; /* Pointer to the thread that owns the frame. */
-     struct hash_elem hash_elem;  /* Tracks the position of the frame metadata
-                                     within 'frame_table', whose key is the 
-                                     kernel virtual address of the frame. */
-     struct list_elem list_elem;  /* Tracks the position of the frame metadata
-                                     in either the 'active' or 'inactive' list,
-                                     so a victim can be chosen for eviction. */
-  };
-
-hash_hash_func frame_metadata_hash;
-hash_less_func frame_metadata_less;
-
-static struct list_elem *lru_next (struct list_elem *e);
-static struct list_elem *lru_prev (struct list_elem *e);
-static struct frame_metadata *get_victim (void);
-
-/* Initialize the frame system by initializing the frame (hash) table with
-   the frame_metadata hashing and comparison functions, as well as initializing
-   'lru_list' and its associated synchronisation primitives. */
-void
-frame_init (void)
-{
-  hash_init (&frame_table, frame_metadata_hash, frame_metadata_less, NULL);
-
-  list_init (&lru_list);
-  lock_init (&lru_lock);
-}
-
-/* TODO: Consider synchronisation more closely (i.e. just for hash
-         table). */
-/* Attempt to allocate a frame for a user process, either by direct
-   allocation of a user page if there is sufficient RAM, or by
-   evicting a currently active page if memory allocated for user
-   processes is fulled and storing it in swap. If swap is full in
-   the former case, panic the kernel. */
-void *
-frame_alloc (enum palloc_flags flags, void *upage, struct thread *owner)
-{
-  struct frame_metadata *frame_metadata;
-  flags |= PAL_USER;
-  
-  lock_acquire (&lru_lock);
-  void *frame = palloc_get_page (flags);
-
-  /* If a frame couldn't be allocated we must be out of main memory. Thus,
-     obtain a victim page to replace with our page, and swap the victim
-     into disk. */
-  if (frame == NULL)
-    {
-      /* 1. Obtain victim. */
-      if (next_victim == NULL)
-        PANIC ("Couldn't allocate a single page to main memory!\n");
-
-      struct frame_metadata *victim = get_victim ();
-      ASSERT (victim != NULL); /* get_victim () should never return null. */
-
-      /* 2. Swap out victim into disk. */
-      size_t swap_slot = swap_out (victim->frame);
-      page_set_swap (victim->owner, victim->upage, swap_slot);
-
-      /* If zero flag is set, zero out the victim page. */
-      if (flags & PAL_ZERO)
-        memset (victim->frame, 0, PGSIZE);
-
-      /* 3. Indicate that the new frame's metadata will be stored
-            inside the same structure that stored the victim's metadata.
-            As both the new frame and the victim frame share the same kernel
-            virtual address, the hash map need not be updated, and neither
-            the list_elem value as both share the same lru_list position. */
-      frame_metadata = victim;
-    }
-
-  /* If sufficient main memory allows the frame to be directly allocated,
-     we must update the frame table with a new entry, and grow lru_list. */
-  else
-    {
-      /* Must own lru_lock here, as otherwise there is a race condition
-         with next_victim either being NULL or uninitialized. */
-      frame_metadata = malloc (sizeof (struct frame_metadata));
-      frame_metadata->frame = frame;
-
-      /* Newly allocated frames are pushed to the back of the circular queue
-         represented by lru_list. Must explicitly handle the case where the
-         circular queue is empty (when next_victim == NULL). */
-      if (next_victim == NULL)
-        {
-          list_push_back (&lru_list, &frame_metadata->list_elem);
-          next_victim = &frame_metadata->list_elem;
-        }
-      else
-        {
-          struct list_elem *lru_tail = lru_prev (next_victim);
-          list_insert (lru_tail, &frame_metadata->list_elem);
-        }
-
-      hash_insert (&frame_table, &frame_metadata->hash_elem);
-    }
-
-  frame_metadata->upage = upage;
-  frame_metadata->owner = owner;
-  lock_release (&lru_lock);
-
-  return frame_metadata->frame;
-}
-
-/* Attempt to deallocate a frame for a user process by removing it from the
-   frame table as well as lru_list, and freeing the underlying page
-   memory & metadata struct. Panics if the frame isn't active in memory. */
-void
-frame_free (void *frame)
-  {
-    struct frame_metadata key_metadata;
-    key_metadata.frame = frame;
-
-    struct hash_elem *e =
-      hash_delete (&frame_table, &key_metadata.hash_elem);
-    if (e == NULL) PANIC ("Attempted to free a frame at kernel address %p, "
-                          "but this address is not allocated!\n", frame);
-
-    struct frame_metadata *frame_metadata =
-      hash_entry (e, struct frame_metadata, hash_elem);
-    
-    lock_acquire (&lru_lock);
-    list_remove (&frame_metadata->list_elem);
-
-    /* If we're freeing the frame marked as the next victim, update
-       next_victim to either be the next least recently used page, or NULL
-       if no pages are loaded in main memory. */
-    if (&frame_metadata->list_elem == next_victim)
-      {
-        if (list_empty (&lru_list))
-          next_victim = NULL;
-        else
-          next_victim = lru_next (next_victim);
-      }
-    lock_release (&lru_lock);
-
-    free (frame_metadata);
-    palloc_free_page (frame);
-  }
-
-/* TODO: Account for page aliases when checking accessed bit. */
-/* A pre-condition for calling this function is that the calling thread
-   owns lru_lock and that lru_list is non-empty. */
-static struct frame_metadata *
-get_victim (void)
-  {
-    struct list_elem *e = next_victim;
-    struct frame_metadata *frame_metadata;
-    uint32_t *pd;
-    void *upage;
-    for (;;)
-      {
-        frame_metadata = list_entry (e, struct frame_metadata, list_elem);
-        pd = frame_metadata->owner->pagedir;
-        upage = frame_metadata->upage;
-        e = lru_next (e);
-
-        if (!pagedir_is_accessed (pd, upage))
-          break;
-
-        pagedir_set_accessed (pd, upage, false);
-      }
-
-    next_victim = e;
-    return frame_metadata;
-  }
-
-/* Hash function for frame metadata, used for storing entries in the
-   frame table. */
-unsigned
-frame_metadata_hash (const struct hash_elem *e, void *aux UNUSED)
-  {
-    struct frame_metadata *frame_metadata = 
-      hash_entry (e, struct frame_metadata, hash_elem);
-
-    return hash_bytes (&frame_metadata->frame, sizeof (frame_metadata->frame));
-  }
-
-/* 'less_func' comparison function for frame metadata, used for comparing 
-   the keys of the frame table. Returns true iff the kernel virtual address
-   of the first frame is less than that of the second frame. */
-bool
-frame_metadata_less (const struct hash_elem *a_, const struct hash_elem *b_,
-                     void *aux UNUSED)
-  {
-    struct frame_metadata *a =
-      hash_entry (a_, struct frame_metadata, hash_elem);
-    struct frame_metadata *b =
-      hash_entry (b_, struct frame_metadata, hash_elem);
-
-    return a->frame < b->frame;
-  }
-
-/* Returns the next recently used element after the one provided, which
-   is achieved by iterating through lru_list like a circular queue
-   (wrapping around the list at the tail). */
-static struct list_elem *
-lru_next (struct list_elem *e)
-{
-  if (!list_empty (&lru_list) && e == list_back (&lru_list))
-    return list_front (&lru_list);
-
-  return list_next (e);
-}
-
-/* Returns the previous recently used element after the one provided, which
-   is achieved by iterating through lru_list like a circular queue
-   (wrapping around the list at the head). */
-static struct list_elem *
-lru_prev (struct list_elem *e)
-{
-  if (!list_empty (&lru_list) && e == list_front (&lru_list))
-    return list_back (&lru_list);
-
-  return list_prev (e);
-}
-

src/vm/frame.h

@@ -1,11 +0,0 @@
-#ifndef VM_FRAME_H
-#define VM_FRAME_H
-
-#include "threads/thread.h"
-#include "threads/palloc.h"
-
-void frame_init (void);
-void *frame_alloc (enum palloc_flags, void *, struct thread *);
-void frame_free (void *frame);
-
-#endif /* vm/frame.h */

src/vm/page.c

@@ -1,20 +0,0 @@
-#include "page.h"
-
-/* Updates the 'owner' thread's page table entry for virtual address 'upage'
-   to have a present bit of 0 and stores the specified swap slot value in the
-   entry for later retrieval from disk. */
-void
-page_set_swap (struct thread *owner, void *upage, size_t swap_slot)
-{
-
-}
-
-/* Given that the page with user address 'upage' owned by 'owner' is flagged
-   to be in the swap disk via the owner's page table, returns its stored
-   swap slot. Otherwise panics the kernel. */
-size_t
-page_get_swap (struct thread *owner, void *upage)
-{
-
-}
-

src/vm/page.h

@@ -1,9 +0,0 @@
-#ifndef VM_PAGE_H
-#define VM_PAGE_H
-
-#include "threads/thread.h"
-
-void page_set_swap (struct thread *, void *, size_t);
-size_t page_get_swap (struct thread *, void *);
-
-#endif /* vm/frame.h */