1 files changed, 28 insertions, 83 deletions

diff --git a/litmus/litmus.c b/litmus/litmus.c
index 90e21eeadabb..400fd1472705 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -37,9 +37,6 @@
 #include <trace/events/litmus.h>
 #endif
 
-//#define TRACE(fmt, args...) do {} while (false)
-//#define TRACE_TASK(fmt, args...) do {} while (false)
-
 extern void l2c310_flush_all(void);
 
 /* Number of RT tasks that exist in the system */
@@ -354,12 +351,24 @@ extern int isolate_lru_page(struct page *page);
 extern void putback_movable_page(struct page *page);
 extern struct page *new_alloc_page(struct page *page, unsigned long node, int **x);
 
+/*
+ * sys_set_page_color
+ * @cpu: CPU number to assign page colors.
+ * Syscall for recoloring pages
+ * Returns -1           on error.
+ *         N            on success. N is the number of pages that could not
+ *                  be moved. A return of zero means that all pages
+ *                  were successfully moved. Currently, two pages
+ *                  cannot be moved, signal handler and litmus ctrl
+ *                  pages.
+ * Only mc2 tasks may be configured with this system call.
+ * Use static linking to isolate all pages.
+ */
 asmlinkage long sys_set_page_color(int cpu)
 {
         long ret = 0;
-        //struct page *page_itr = NULL;
         struct vm_area_struct *vma_itr = NULL;
-        int nr_pages = 0, nr_shared_pages = 0, nr_failed = 0, nr_not_migrated = 0;
+        int nr_pages = 0, nr_failed = 0, nr_not_migrated = 0;
         unsigned long node;
         enum crit_level lv;
         struct mm_struct *mm;
@@ -375,19 +384,13 @@ asmlinkage long sys_set_page_color(int cpu)
         mm = get_task_mm(current);
         put_task_struct(current);
 
-        //down_read(&current->mm->mmap_sem);
         down_read(&mm->mmap_sem);
-        //TRACE_TASK(current, "SYSCALL set_page_color\n");
         vma_itr = mm->mmap;
         while (vma_itr != NULL) {
                 unsigned int num_pages = 0, i;
                 struct page *old_page = NULL;
                 
                 num_pages = (vma_itr->vm_end - vma_itr->vm_start) / PAGE_SIZE;
-                // print vma flags
-                //printk(KERN_INFO "flags: 0x%lx\n", vma_itr->vm_flags);
-                //printk(KERN_INFO "start - end: 0x%lx - 0x%lx (%lu)\n", vma_itr->vm_start, vma_itr->vm_end, (vma_itr->vm_end - vma_itr->vm_start)/PAGE_SIZE);
-                //printk(KERN_INFO "vm_page_prot: 0x%lx\n", vma_itr->vm_page_prot);
                 for (i = 0; i < num_pages; i++) {
                         old_page = follow_page(vma_itr, vma_itr->vm_start + PAGE_SIZE*i, FOLL_GET|FOLL_SPLIT);
                         
@@ -401,30 +404,15 @@ asmlinkage long sys_set_page_color(int cpu)
                                 put_page(old_page);
                                 continue;
                         }
-                        
-                        //TRACE_TASK(current, "addr: %08x, pfn: %x, _mapcount: %d, _count: %d\n", vma_itr->vm_start + PAGE_SIZE*i, __page_to_pfn(old_page), page_mapcount(old_page), page_count(old_page));
-                        
-                        //if (page_mapcount(old_page) == 1) {
-                                ret = isolate_lru_page(old_page);
-                                if (!ret) {
-                                        list_add_tail(&old_page->lru, &pagelist);
-                                        inc_zone_page_state(old_page, NR_ISOLATED_ANON + !PageSwapBacked(old_page));
-                                        nr_pages++;
-                                } else {
-                                        //TRACE_TASK(current, "isolate_lru_page failed\n");
-                                        //TRACE_TASK(current, "page_lru = %d PageLRU = %d\n", page_lru(old_page), PageLRU(old_page));
-                                        nr_failed++;
-                                }
-                                //printk(KERN_INFO "PRIVATE _mapcount = %d, _count = %d\n", page_mapcount(old_page), page_count(old_page));
-                                put_page(old_page);
-                        //}
-                        /*
-                        else {
-                                nr_shared_pages++;
-                                //printk(KERN_INFO "SHARED _mapcount = %d, _count = %d\n", page_mapcount(old_page), page_count(old_page));
-                                put_page(old_page);
+                        ret = isolate_lru_page(old_page);
+                        if (!ret) {
+                                list_add_tail(&old_page->lru, &pagelist);
+                                inc_zone_page_state(old_page, NR_ISOLATED_ANON + !PageSwapBacked(old_page));
+                                nr_pages++;
+                        } else {
+                                nr_failed++;
                         }
-                        */
+                        put_page(old_page);
                 }
                 
                 vma_itr = vma_itr->vm_next;
@@ -434,7 +422,7 @@ asmlinkage long sys_set_page_color(int cpu)
         if (tsk_rt(current)->mc2_data)
                 lv = tsk_rt(current)->mc2_data->crit;
         else
-                BUG();//lv = 0;
+                BUG(); //lv = 0;
         
         if (cpu == -1)
                 node = 8;
@@ -444,34 +432,16 @@ 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);
                 }
         }
-        
-        /* handle sigpage and litmus ctrl_page */
-/*      vma_itr = current->mm->mmap;
-        while (vma_itr != NULL) {
-                if (vma_itr->vm_start == tsk_rt(current)->addr_ctrl_page) {
-                        TRACE("litmus ctrl_page = %08x\n", vma_itr->vm_start);
-                        vma_itr->vm_page_prot = PAGE_SHARED;
-                        break;
-                }
-                vma_itr = vma_itr->vm_next;
-        }
-*/
+
         up_read(&mm->mmap_sem);
 
-/*      
-        list_for_each_entry(page_itr, &shared_pagelist, lru) {
-                TRACE("S Anon=%d, pfn = %lu, _mapcount = %d, _count = %d\n", PageAnon(page_itr), __page_to_pfn(page_itr), page_mapcount(page_itr), page_count(page_itr));
-        }
-*/      
-        TRACE_TASK(current, "nr_pages = %d nr_failed = %d\n", nr_pages, nr_failed);
-        printk(KERN_INFO "node = %ld, nr_migrated_pages = %d, nr_shared_pages = %d, nr_failed = %d\n", node, nr_pages-nr_not_migrated, nr_failed-2, nr_failed);
-        //printk(KERN_INFO "node = %d\n", cpu_to_node(smp_processor_id()));
+        TRACE_TASK(current, "node = %ld, nr_migrated_pages = %d, nr_pages = %d nr_failed = %d\n", node, nr_pages-nr_not_migrated, nr_pages, nr_failed);
+
         return ret;
 }
 
@@ -479,12 +449,12 @@ asmlinkage long sys_set_page_color(int cpu)
 asmlinkage long sys_test_call(unsigned int param)
 {
         long ret = 0;
-        unsigned long flags;
         struct vm_area_struct *vma_itr = NULL;
         
         TRACE_CUR("test_call param = %d\n", param);
         
         if (param == 0) {
+                /* Print page information */
                 down_read(&current->mm->mmap_sem);
                 vma_itr = current->mm->mmap;
                 while (vma_itr != NULL) {
@@ -494,37 +464,12 @@ asmlinkage long sys_test_call(unsigned int param)
                         printk(KERN_INFO "vm_flags : %lx\n", vma_itr->vm_flags);
                         printk(KERN_INFO "vm_prot  : %x\n", pgprot_val(vma_itr->vm_page_prot));
                         printk(KERN_INFO "VM_SHARED? %ld\n", vma_itr->vm_flags & VM_SHARED);
-        /*              if (vma_itr->vm_file) {
-                                struct file *fp = vma_itr->vm_file;
-                                unsigned long fcount = atomic_long_read(&(fp->f_count));
-                                printk(KERN_INFO "f_count : %ld\n", fcount);
-                                if (fcount > 1) {
-                                        vma_itr->vm_page_prot = pgprot_noncached(vma_itr->vm_page_prot);
-                                }
-                        }
-                        printk(KERN_INFO "vm_prot2 : %x\n", pgprot_val(vma_itr->vm_page_prot));
-        */              
                         vma_itr = vma_itr->vm_next;
                 }
                 printk(KERN_INFO "--------------------------------------------\n");
                 up_read(&current->mm->mmap_sem);
-                
-                local_irq_save(flags);
-                l2c310_flush_all();
-                local_irq_restore(flags);
-        }
-        else if (param == 1) {
-                int i;
-                for (i = 0; i < 4; i++) {
-                        lock_cache(i, 0x00003fff);
-                }
-        }
-        else if (param == 2) {
-                int i;
-                for (i = 0; i < 4; i++) {
-                        lock_cache(i, 0xffffffff);
-                }
         }
+
         return ret;
 }