9 files changed, 227 insertions, 42 deletions

diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index 3b7d36b921d3..5291b703ed3f 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -19,7 +19,7 @@
  * This may need to be greater than __NR_last_syscall+1 in order to
  * account for the padding in the syscall table
  */
-#define __NR_syscalls  (388 + NR_litmus_syscalls + 2)
+#define __NR_syscalls  (388 + NR_litmus_syscalls + 0)
 
 
 /*
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index 6c2ad82fd2c8..55dc86323c86 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -415,7 +415,8 @@
                 CALL(sys_set_mc2_task_param)
                 CALL(sys_set_page_color)
 /* 405 */       CALL(sys_test_call)
-
+                CALL(sys_run_test)
+                CALL(sys_lock_buffer)
 
 #ifndef syscalls_counted
 .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
diff --git a/arch/x86/syscalls/syscall_32.tbl b/arch/x86/syscalls/syscall_32.tbl
index 075709a93d34..b303a9b2183a 100644
--- a/arch/x86/syscalls/syscall_32.tbl
+++ b/arch/x86/syscalls/syscall_32.tbl
@@ -383,3 +383,5 @@
 374     i386    set_mc2_task_param      sys_set_mc2_task_param
 375     i386    set_page_color          sys_set_page_color
 376     i386    test_call               sys_test_call
+377     i386    run_test                sys_run_test
+378     i386    lock_buffer             sys_lock_buffer
diff --git a/arch/x86/syscalls/syscall_64.tbl b/arch/x86/syscalls/syscall_64.tbl
index e8fdeecd3d21..5f24a80930cc 100644
--- a/arch/x86/syscalls/syscall_64.tbl
+++ b/arch/x86/syscalls/syscall_64.tbl
@@ -348,7 +348,8 @@
 366     common  set_mc2_task_param      sys_set_mc2_task_param
 367     common  set_page_color          sys_set_page_color
 368     common  test_call               sys_test_call
-
+369     common  run_test                sys_run_test
+370     common  lock_buffer             sys_lock_buffer
 
 #
 # x32-specific system call numbers start at 512 to avoid cache impact
diff --git a/include/litmus/cache_proc.h b/include/litmus/cache_proc.h
index 962851da34cc..e9440de504fc 100644
--- a/include/litmus/cache_proc.h
+++ b/include/litmus/cache_proc.h
@@ -7,6 +7,7 @@ void litmus_setup_lockdown(void __iomem*, u32);
 void enter_irq_mode(void);
 void exit_irq_mode(void);
 void flush_cache(int all);
+void lock_cache(int cpu, u32 val);
 
 extern struct page *new_alloc_page_color(unsigned long color);
 
diff --git a/include/litmus/unistd_32.h b/include/litmus/unistd_32.h
index 0000010f7d95..86bbbb8d33ea 100644
--- a/include/litmus/unistd_32.h
+++ b/include/litmus/unistd_32.h
@@ -23,5 +23,7 @@
 #define __NR_set_mc2_task_param __LSC(15)
 #define __NR_set_page_color             __LSC(16)
 #define __NR_test_call          __LSC(17)
+#define __NR_run_test           __LSC(18)
+#define __NR_lock_buffer        __LSC(19)
 
-#define NR_litmus_syscalls      18
+#define NR_litmus_syscalls      20
diff --git a/include/litmus/unistd_64.h b/include/litmus/unistd_64.h
index 1a741bd3e5da..4b96e7c259d1 100644
--- a/include/litmus/unistd_64.h
+++ b/include/litmus/unistd_64.h
@@ -30,8 +30,21 @@ __SYSCALL(__NR_release_ts, sys_release_ts)
 #define __NR_null_call                          __LSC(11)
 __SYSCALL(__NR_null_call, sys_null_call)
 #define __NR_get_current_budget                 __LSC(12)
-__SYSCALL(____NR_get_current_budget, sys_get_current_budget)
-#define __NR_test_call                          __LSC(13)
+__SYSCALL(__NR_get_current_budget, sys_get_current_budget)
+#define __NR_reservation_create         __LSC(13)
+__SYSCALL(__NR_reservation_create, sys_reservation_create)
+#define __NR_reservation_destroy        __LSC(14)
+__SYSCALL(__NR_reservation_destroy, sys_reservation_destroy)
+#define __NR_set_mc2_task_param         __LSC(15)
+__SYSCALL(__NR_set_mc2_task_param,      sys_set_mc2_task_param)
+#define __NR_set_page_color                     __LSC(16)
+__SYSCALL(__NR_set_page_color,          sys_set_page_color)
+#define __NR_test_call                          __LSC(17)
 __SYSCALL(__NR_test_call, sys_test_call)
+#define __NR_run_test                           __LSC(18)
+__SYSCALL(__NR_run_test, sys_run_test)
+#define __NR_lock_buffer                        __LSC(19)
+__SYACALL(__NR_lock_buffer, sys_lock_buffer)
 
-#define NR_litmus_syscalls 14
+
+#define NR_litmus_syscalls 20
diff --git a/litmus/cache_proc.c b/litmus/cache_proc.c
index 01350294afaf..397214f2b8cc 100644
--- a/litmus/cache_proc.c
+++ b/litmus/cache_proc.c
@@ -1,3 +1,5 @@
+#include <asm/uaccess.h>

+#include <linux/uaccess.h>

 #include <linux/init.h>

 #include <linux/types.h>

 #include <linux/kernel.h>

@@ -7,6 +9,7 @@
 #include <linux/io.h>

 #include <linux/mutex.h>

 #include <linux/time.h>

+#include <linux/random.h>

 

 #include <litmus/litmus_proc.h>

 #include <litmus/sched_trace.h>

@@ -21,6 +24,14 @@
 #define LOCK_ALL        (~UNLOCK_ALL)

 #define MAX_NR_WAYS     16

 #define MAX_NR_COLORS   16

+#define CACHELINE_SIZE 32

+#define INTS_IN_CACHELINE (CACHELINE_SIZE/sizeof(int))

+#define CACHELINES_IN_1KB (1024 / sizeof(cacheline_t))

+

+typedef struct cacheline

+{

+        int line[INTS_IN_CACHELINE];

+} __attribute__((aligned(CACHELINE_SIZE))) cacheline_t;

 

 void mem_lock(u32 lock_val, int cpu);

 

@@ -1121,6 +1132,135 @@ void flush_cache(int all)
         raw_spin_unlock_irqrestore(&cache_lock, flags);

 }

 

+/* src = shared, dst = local */

+#if 0 // random

+asmlinkage long sys_run_test(int type, int size, cacheline_t *src, cacheline_t *dst, lt_t __user *ts)

+{

+        /* size is in KB */

+        long ret = 0;

+        lt_t t1, t2;

+        int numlines = size * CACHELINES_IN_1KB;

+        int next, sum = 0, ran;

+        unsigned long flags;

+        

+        get_random_bytes(&ran, sizeof(int));

+        next = ran % ((size*1024)/sizeof(cacheline_t));

+        

+        //preempt_disable();

+        if (type == 1) {

+                int i, j;

+                color_read_in_mem_lock(0x0000FFF0, 0x0000000f, (void*)src, (void*)src + size*1024);

+                color_read_in_mem_lock(0x0000FF0F, 0x0000000f, (void*)dst, (void*)dst + size*1024);

+                

+                local_irq_save(flags);

+                t1 = litmus_clock();

+                for (i = 0; i < numlines; i++) {

+                        next = src[next].line[0];

+                        for (j = 1; j < INTS_IN_CACHELINE; j++) {

+                                dst[next].line[j] = src[next].line[j]; // read

+                                //src[next].line[j] = dst[next].line[j]; // write

+                        }                       

+                }

+                t2 = litmus_clock();

+                local_irq_restore(flags);

+                sum = next + (int)t2;

+                t2 -= t1;

+                ret = put_user(t2, ts);

+        }

+        else {

+                int i, j;

+                color_read_in_mem_lock(0x0000FF0F, 0x0000000f, (void*)dst, (void*)dst + size*1024);

+                local_irq_save(flags);

+                t1 = litmus_clock();

+                for (i = 0; i < numlines; i++) {

+                        next = src[next].line[0];

+                        for (j = 1; j < INTS_IN_CACHELINE; j++) {

+                                dst[next].line[j] = src[next].line[j]; //read

+                                //src[next].line[j] = dst[next].line[j]; //write

+                        }                       

+                }

+                t2 = litmus_clock();

+                local_irq_restore(flags);

+                sum = next + (int)t2;

+                t2 -= t1;

+                ret = put_user(t2, ts);

+                v7_flush_kern_dcache_area(src, size*1024);

+        }

+        //preempt_enable();

+        flush_cache(1);

+

+        return ret;

+}

+#else

+// sequential

+asmlinkage long sys_run_test(int type, int size, cacheline_t *src, cacheline_t *dst, lt_t __user *ts)

+{

+        /* size is in KB */

+        long ret = 0;

+        lt_t t1, t2;

+        int numlines = size * CACHELINES_IN_1KB;

+        int sum = 0;

+        unsigned long flags;

+        

+        //preempt_disable();

+        if (type == 1) {

+                int i, j;

+                color_read_in_mem_lock(0x0000FFF0, 0x0000000f, (void*)src, (void*)src + size*1024);

+                color_read_in_mem_lock(0x0000FF0F, 0x0000000f, (void*)dst, (void*)dst + size*1024);

+                

+                local_irq_save(flags);

+                t1 = litmus_clock();

+                for (i = 0; i < numlines; i++) {

+                        for (j = 0; j < INTS_IN_CACHELINE; j++) {

+                                //dst[i].line[j] = src[i].line[j]; // read

+                                src[i].line[j] = dst[i].line[j]; // write

+                        }                       

+                }

+                t2 = litmus_clock();

+                local_irq_restore(flags);

+                sum = (int)(t1 + t2);

+                t2 -= t1;

+                ret = put_user(t2, ts);

+        }

+        else {

+                int i, j;

+                color_read_in_mem_lock(0x0000FF0F, 0x0000000f, (void*)dst, (void*)dst + size*1024);

+                local_irq_save(flags);

+                t1 = litmus_clock();

+                for (i = 0; i < numlines; i++) {

+                        for (j = 0; j < INTS_IN_CACHELINE; j++) {

+                                //dst[i].line[j] = src[i].line[j]; //read

+                                src[i].line[j] = dst[i].line[j]; //write

+                        }                       

+                }

+                t2 = litmus_clock();

+                local_irq_restore(flags);

+                sum = (int)(t1 + t2);

+                t2 -= t1;

+                ret = put_user(t2, ts);

+                v7_flush_kern_dcache_area(src, size*1024);

+        }

+        //preempt_enable();

+        flush_cache(1);

+

+        return ret;

+}

+#endif

+

+asmlinkage long sys_lock_buffer(void* vaddr, size_t size, u32 lock_way, u32 unlock_way)

+{

+        /* size is in bytes */

+        long ret = 0;

+        int i;

+        u32 lock_val, unlock_val;

+        

+        lock_val = ~lock_way & 0x0000ffff;

+        unlock_val = ~unlock_way & 0x0000ffff;

+        color_read_in_mem_lock(lock_val, unlock_val, (void*)vaddr, (void*)vaddr + size);

+        

+        return ret;

+}

+

 #define TRIALS 1000

 

 static int perf_test(void) {

diff --git a/litmus/litmus.c b/litmus/litmus.c
index 0f122e1e7ec1..ddb80e1aae12 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -356,17 +356,26 @@ 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;
+        int nr_pages = 0, nr_shared_pages = 0, nr_failed = 0, nr_not_migrated = 0;
         unsigned long node;
         enum crit_level lv;
+        struct mm_struct *mm;
                 
         LIST_HEAD(pagelist);
         LIST_HEAD(shared_pagelist);
         
+        migrate_prep();
         
-        down_read(&current->mm->mmap_sem);
+        rcu_read_lock();
+        get_task_struct(current);
+        rcu_read_unlock();
+        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 = current->mm->mmap;
+        vma_itr = mm->mmap;
         while (vma_itr != NULL) {
                 unsigned int num_pages = 0, i;
                 struct page *old_page = NULL;
@@ -376,7 +385,6 @@ asmlinkage long sys_set_page_color(int cpu)
                 //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);
                         
@@ -393,7 +401,7 @@ asmlinkage long sys_set_page_color(int cpu)
                         
                         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) {
+                        //if (page_mapcount(old_page) == 1) {
                                 ret = isolate_lru_page(old_page);
                                 if (!ret) {
                                         list_add_tail(&old_page->lru, &pagelist);
@@ -406,12 +414,14 @@ 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);
-                        }
+                        //}
+                        /*
                         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);
                         }
+                        */
                 }
                 
                 vma_itr = vma_itr->vm_next;
@@ -432,11 +442,12 @@ asmlinkage long sys_set_page_color(int cpu)
                 node = 8;
         else
                 node = cpu*2 + lv;
-                //node= 0;
                 
         if (!list_empty(&pagelist)) {
-                ret = migrate_pages(&pagelist, new_alloc_page, NULL, node, MIGRATE_ASYNC, MR_SYSCALL);
+                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);
                 }
@@ -453,7 +464,7 @@ asmlinkage long sys_set_page_color(int cpu)
                 vma_itr = vma_itr->vm_next;
         }
 */
-        up_read(&current->mm->mmap_sem);
+        up_read(&mm->mmap_sem);
 
 /*      
         list_for_each_entry(page_itr, &shared_pagelist, lru) {
@@ -461,7 +472,7 @@ asmlinkage long sys_set_page_color(int cpu)
         }
 */      
         TRACE_TASK(current, "nr_pages = %d nr_failed = %d\n", nr_pages, nr_failed);
-        printk(KERN_INFO "node = %ld, nr_pages = %d, nr_shared_pages = %d, nr_failed = %d\n", node, nr_pages, nr_shared_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()));
         flush_cache(1);
         
@@ -477,34 +488,48 @@ asmlinkage long sys_test_call(unsigned int param)
         
         TRACE_CUR("test_call param = %d\n", param);
         
-        down_read(&current->mm->mmap_sem);
-        vma_itr = current->mm->mmap;
-        while (vma_itr != NULL) {
-                printk(KERN_INFO "--------------------------------------------\n");
-                printk(KERN_INFO "vm_start : %lx\n", vma_itr->vm_start);
-                printk(KERN_INFO "vm_end   : %lx\n", vma_itr->vm_end);
-                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);
+        if (param == 0) {
+                down_read(&current->mm->mmap_sem);
+                vma_itr = current->mm->mmap;
+                while (vma_itr != NULL) {
+                        printk(KERN_INFO "--------------------------------------------\n");
+                        printk(KERN_INFO "vm_start : %lx\n", vma_itr->vm_start);
+                        printk(KERN_INFO "vm_end   : %lx\n", vma_itr->vm_end);
+                        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;
+                flush_cache(1);
+                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);
                 }
-                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);
-        
         return ret;
 }