Merge pull request #95 from ToolmanP/boweraccess

Lab5: BowerAccess Lab

Author: ToolmanP

Lab5/filelist.mk

@@ -7,5 +7,6 @@ FS_WRAPPER := $(FS_BASE_DIR)/fs_wrapper.c
 FS_OPS := $(FS_BASE_DIR)/fs_wrapper_ops.c
 FSM := $(FSM_DIR)/fsm.c
 FSM_CLIENT_CAP := $(FSM_DIR)/fsm_client_cap.c
+FS_FILE_FAULT := $(FS_BASE_DIR)/fs_page_fault.c
 
-FILES := $(FS_VNODE) $(FS_WRAPPER) $(FS_OPS) $(FSM) $(FSM_CLIENT_CAP)
+FILES := $(FS_VNODE) $(FS_WRAPPER) $(FS_OPS) $(FSM) $(FSM_CLIENT_CAP) $(FS_FILE_FAULT)

Lab5/kernel/include/mm/vmspace.h

@@ -34,6 +34,15 @@ struct vmregion {
         vmr_prop_t perm;
         struct pmobject *pmo;
         struct list_head cow_private_pages;
+        /* for Lab5, llm page lru list */
+        struct list_head llm_pages;
+        int num_llm_pages;
+};
+
+#define MAX_LLM_PAGE_NUM 16
+struct llm_page {
+        struct list_head node;
+        vaddr_t vaddr;
 };
 
 /* This struct represents one virtual address space */
@@ -60,7 +69,6 @@ struct vmspace {
         unsigned char history_cpus[PLAT_CPU_NUM];
 
         struct vmregion *heap_boundary_vmr;
-
         /* Records size of memory mapped. Protected by pgtbl_lock. */
         long rss;
 };

Lab5/kernel/include/object/memory.h

@@ -41,6 +41,8 @@ struct pmobject {
          */
         void *private;
         struct list_head mapping_list;
+        /* Lab5, counting page faults */
+        long page_faults;
 };
 
 /* kernel internal interfaces */

Lab5/kernel/include/object/user_fault.h

@@ -62,5 +62,8 @@ void handle_user_fault(struct pmobject *pmo, vaddr_t fault_va);
 int sys_user_fault_register(cap_t notific_cap, vaddr_t msg_buffer);
 int sys_user_fault_map(badge_t client_badge, vaddr_t fault_va, vaddr_t remap_va,
                        bool copy, unsigned long perm);
+/* Syscall for Lab5 only */
+int sys_user_fault_map_batched(badge_t client_badge, vaddr_t fault_va, vaddr_t remap_va,
+        bool copy, unsigned long perm, bool completed, vaddr_t orig_fault_va);
 
 #endif /* OBJECT_USER_FAULT_H */