TODO: Fix condition checks in replicate_page_move_mapping()wip-shared-lib

6 files changed, 618 insertions, 15 deletions

diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index cac1c0904d5f..b16047b82472 100644
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -33,6 +33,8 @@ extern int migrate_page(struct address_space *,
                         struct page *, struct page *, enum migrate_mode);
 extern int migrate_pages(struct list_head *l, new_page_t new, free_page_t free,
                 unsigned long private, enum migrate_mode mode, int reason);
+extern int replicate_pages(struct list_head *l, new_page_t new, free_page_t free,
+                unsigned long private, enum migrate_mode mode, int reason);
 
 extern int migrate_prep(void);
 extern int migrate_prep_local(void);
@@ -50,7 +52,11 @@ static inline int migrate_pages(struct list_head *l, new_page_t new,
                 free_page_t free, unsigned long private, enum migrate_mode mode,
                 int reason)
         { return -ENOSYS; }
-
+static inline int replicate_pages(struct list_head *l, new_page_t new,
+                free_page_t free, unsigned long private, enum migrate_mode mode,
+                int reason)
+        { return -ENOSYS; }
+        
 static inline int migrate_prep(void) { return -ENOSYS; }
 static inline int migrate_prep_local(void) { return -ENOSYS; }
 
diff --git a/include/litmus/replicate_lib.h b/include/litmus/replicate_lib.h
index af2af36b6b79..480ce4631529 100644
--- a/include/litmus/replicate_lib.h
+++ b/include/litmus/replicate_lib.h
@@ -7,8 +7,12 @@
 

 struct shared_lib_page {

         struct page *p_page;

-        unsigned long pfn;

+        struct page *r_page;

+        unsigned long p_pfn;

+        unsigned long r_pfn;

         struct list_head list;

 };

 

+extern struct list_head shared_lib_pages;

+

 #endif

diff --git a/kernel/sched/litmus.c b/kernel/sched/litmus.c
index 9d58690cf51a..cd36358cee75 100644
--- a/kernel/sched/litmus.c
+++ b/kernel/sched/litmus.c
@@ -20,8 +20,9 @@ static void update_time_litmus(struct rq *rq, struct task_struct *p)
         /* task counter */
         p->se.sum_exec_runtime += delta;
         if (delta) {
-                TRACE_TASK(p, "charged %llu exec time (total:%llu, rem:%llu)\n",
-                        delta, p->rt_param.job_params.exec_time, budget_remaining(p));
+                //TRACE_TASK(p, "charged %llu exec time (total:%llu, rem:%llu)\n",
+                        //delta, p->rt_param.job_params.exec_time, budget_remaining(p));
+                ;
         }
         /* sched_clock() */
         p->se.exec_start = rq->clock;
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 402c495f62c6..8e7f5e2e68df 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -353,6 +353,10 @@ extern void putback_movable_page(struct page *page);
 extern struct page *new_alloc_page(struct page *page, unsigned long node, int **x);
 
 DECLARE_PER_CPU(struct list_head, shared_lib_page_list);
+#define INVALID_PFN                             (0xffffffff)
+LIST_HEAD(shared_lib_pages);
+//struct list_head shared_lib_pages = LIST_HEAD_INIT(shared_lib_pages);
+EXPORT_SYMBOL(shared_lib_pages);
 
 asmlinkage long sys_set_page_color(int cpu)
 {
@@ -366,8 +370,8 @@ asmlinkage long sys_set_page_color(int cpu)
         //struct list_head *shared_pagelist = this_cpu_ptr(&shared_lib_page_list);
                 
         LIST_HEAD(pagelist);
-        LIST_HEAD(shared_pagelist);
-        
+        LIST_HEAD(task_shared_pagelist);
+
         migrate_prep();
         
         rcu_read_lock();
@@ -408,10 +412,36 @@ asmlinkage long sys_set_page_color(int cpu)
                         
                         if (page_count(old_page) > 2 && vma_itr->vm_file != NULL && !(vma_itr->vm_flags&VM_WRITE)) {
                                 struct shared_lib_page *lib_page;
-                                lib_page = kmalloc(sizeof(struct shared_lib_page), GFP_KERNEL);
-                                lib_page->p_page = old_page;
-                                lib_page->pfn = page_to_pfn(old_page);
-                                list_add_tail(&lib_page->list, &shared_pagelist);                               
+                                int is_exist = 0;
+
+                                /* update PSL list */
+                                /* check if this page is in the PSL list */
+                                rcu_read_lock();
+                                list_for_each_entry(lib_page, &shared_lib_pages, list)
+                                {
+                                        if (page_to_pfn(old_page) == lib_page->p_pfn) {
+                                                is_exist = 1;
+                                                break;
+                                        }
+                                }
+                                rcu_read_unlock();
+        
+                                if (is_exist == 0) {
+                                        lib_page = kmalloc(sizeof(struct shared_lib_page), GFP_KERNEL);
+                                        lib_page->p_page = old_page;
+                                        lib_page->r_page = NULL;
+                                        lib_page->p_pfn = page_to_pfn(old_page);
+                                        lib_page->r_pfn = INVALID_PFN;
+                                        list_add_tail(&lib_page->list, &shared_lib_pages);
+                                        TRACE_TASK(current, "NEW PAGE %ld ADDED.\n", lib_page->p_pfn);
+                                }
+                                else {
+                                        TRACE_TASK(current, "FOUND PAGE %ld in the list.\n", lib_page->p_pfn);
+                                }
+                                
+                                /* add to task_shared_pagelist */
+                                list_add_tail(&old_page->lru, &task_shared_pagelist);
+                                
                                 nr_shared_pages++;
                                 TRACE_TASK(current, "SHARED\n");
                         }
@@ -428,7 +458,7 @@ asmlinkage long sys_set_page_color(int cpu)
                                 }
                                 //printk(KERN_INFO "PRIVATE _mapcount = %d, _count = %d\n", page_mapcount(old_page), page_count(old_page));
                                 put_page(old_page);
-                                TRACE_TASK(current, "PRIVATE\n");
+                                //TRACE_TASK(current, "PRIVATE\n");
                         }
                 }
                 TRACE_TASK(current, "PAGES_IN_VMA = %d size = %d KB\n", pages_in_vma, pages_in_vma*4);
@@ -454,13 +484,21 @@ asmlinkage long sys_set_page_color(int cpu)
         if (!list_empty(&pagelist)) {
                 ret = migrate_pages(&pagelist, new_alloc_page, NULL, node, MIGRATE_SYNC, MR_SYSCALL);
                 TRACE_TASK(current, "%ld pages not migrated.\n", ret);
-                printk(KERN_INFO "%ld pages not migrated.\n", ret);
                 nr_not_migrated = ret;
                 if (ret) {
                         putback_movable_pages(&pagelist);
                 }
         }
         
+        if (!list_empty(&task_shared_pagelist)) {
+                ret = replicate_pages(&task_shared_pagelist, new_alloc_page, NULL, node, MIGRATE_SYNC, MR_SYSCALL);
+                TRACE_TASK(current, "%ld shared pages not migrated.\n", ret);
+                nr_not_migrated += ret;
+                if (ret) {
+                        putback_movable_pages(&task_shared_pagelist);
+                }
+        }
+        
         /* handle sigpage and litmus ctrl_page */
 /*      vma_itr = current->mm->mmap;
         while (vma_itr != NULL) {
@@ -480,14 +518,14 @@ asmlinkage long sys_set_page_color(int cpu)
 
         flush_cache(1);
 /* for debug START */
-        TRACE_TASK(current, "SHARED PAGES\n");
+        TRACE_TASK(current, "PSL PAGES\n");
         {
                 struct shared_lib_page *lpage;