Manually patched mc^2 related codewip-mc2-cache-slack

8 files changed, 1757 insertions, 7 deletions

diff --git a/include/litmus/mc2_common.h b/include/litmus/mc2_common.h
new file mode 100644
index 000000000000..e3c0af28f1b9
--- /dev/null
+++ b/include/litmus/mc2_common.h
@@ -0,0 +1,31 @@
+/*
+ * MC^2 common data structures
+ */
+ 
+#ifndef __UNC_MC2_COMMON_H__
+#define __UNC_MC2_COMMON_H__
+
+enum crit_level {
+        CRIT_LEVEL_A = 0,
+        CRIT_LEVEL_B = 1,
+        CRIT_LEVEL_C = 2,
+        NUM_CRIT_LEVELS = 3,
+};
+
+struct mc2_task {
+        enum crit_level crit;
+        unsigned int res_id;
+};
+
+#ifdef __KERNEL__
+
+#include <litmus/reservation.h>
+
+#define tsk_mc2_data(t)         (tsk_rt(t)->mc2_data)
+
+long mc2_task_client_init(struct task_client *tc, struct mc2_task *mc2_param, struct task_struct *tsk,
+                                                        struct reservation *res);
+        
+#endif /* __KERNEL__ */
+
+#endif
\ No newline at end of file
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index e626bbbe60d5..26dfa33c1e5e 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -206,6 +206,7 @@ struct rt_job {
 };
 
 struct pfair_param;
+struct mc2_task;
 
 /*      RT task parameters for scheduling extensions
  *      These parameters are inherited during clone and therefore must
@@ -322,6 +323,9 @@ struct rt_param {
 
         /* Pointer to the page shared between userspace and kernel. */
         struct control_page * ctrl_page;
+
+        /* Mixed-criticality specific data */
+        struct mc2_task* mc2_data;
 };
 
 #endif
diff --git a/include/litmus/unistd_32.h b/include/litmus/unistd_32.h
index 5f6a2749c6a7..202f439a62ae 100644
--- a/include/litmus/unistd_32.h
+++ b/include/litmus/unistd_32.h
@@ -19,5 +19,6 @@
 #define __NR_null_call          __LSC(11)
 #define __NR_reservation_create __LSC(12)
 #define __NR_reservation_destroy __LSC(13)
+#define __NR_set_mc2_task_param __LSC(14)
 
-#define NR_litmus_syscalls 14
+#define NR_litmus_syscalls 15
diff --git a/include/litmus/unistd_64.h b/include/litmus/unistd_64.h
index 3e6b1d330336..ba2c91c5bf8c 100644
--- a/include/litmus/unistd_64.h
+++ b/include/litmus/unistd_64.h
@@ -33,6 +33,7 @@ __SYSCALL(__NR_null_call, sys_null_call)
 __SYSCALL(__NR_reservation_create, sys_reservation_create)
 #define __NR_reservation_destroy                __LSC(13)
 __SYSCALL(__NR_reservation_destroy, sys_reservation_destroy)
+#define __NR_set_mc2_task_param                 __LSC(14)
+__SYSCALL(__NR_set_mc2_task_param, sys_set_mc2_task_param)
 
-
-#define NR_litmus_syscalls 14
+#define NR_litmus_syscalls 15
diff --git a/litmus/Makefile b/litmus/Makefile
index 05021f553eda..70c77b3e9b53 100644
--- a/litmus/Makefile
+++ b/litmus/Makefile
@@ -35,4 +35,5 @@ obj-$(CONFIG_SCHED_OVERHEAD_TRACE) += trace.o
 
 obj-y += reservation.o polling_reservations.o
 
-obj-y += sched_pres.o
\ No newline at end of file
+obj-y += sched_pres.o
+obj-y += mc2_common.o sched_mc2.o
diff --git a/litmus/mc2_common.c b/litmus/mc2_common.c
new file mode 100644
index 000000000000..a8ea5d9889f3
--- /dev/null
+++ b/litmus/mc2_common.c
@@ -0,0 +1,78 @@
+/*
+ * litmus/mc2_common.c
+ *
+ * Common functions for MC2 plugin.
+ */
+
+#include <linux/percpu.h>
+#include <linux/sched.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <asm/uaccess.h>
+
+#include <litmus/litmus.h>
+#include <litmus/sched_plugin.h>
+#include <litmus/sched_trace.h>
+
+#include <litmus/mc2_common.h>
+
+long mc2_task_client_init(struct task_client *tc, struct mc2_task *mc2_param, struct task_struct *tsk, struct reservation *res)
+{
+        task_client_init(tc, tsk, res);
+        if ((mc2_param->crit < CRIT_LEVEL_A) ||
+                (mc2_param->crit > CRIT_LEVEL_C))
+                return -EINVAL;
+        
+        TRACE_TASK(tsk, "mc2_task_client_init: crit_level = %d\n", mc2_param->crit);
+        
+        return 0;
+}
+
+asmlinkage long sys_set_mc2_task_param(pid_t pid, struct mc2_task __user * param)
+{
+        struct task_struct *target;
+        int retval = -EINVAL;
+        struct mc2_task *mp = kzalloc(sizeof(*mp), GFP_KERNEL);
+        
+        if (!mp)
+                return -ENOMEM;
+
+        printk("Setting up mc^2 task parameters for process %d.\n", pid);
+
+        if (pid < 0 || param == 0) {
+                goto out;
+        }
+        if (copy_from_user(mp, param, sizeof(*mp))) {
+                retval = -EFAULT;
+                goto out;
+        }
+
+        /* Task search and manipulation must be protected */
+        read_lock_irq(&tasklist_lock);
+        if (!(target = find_task_by_vpid(pid))) {
+                retval = -ESRCH;
+                goto out_unlock;
+        }
+
+        if (is_realtime(target)) {
+                /* The task is already a real-time task.
+                 * We cannot not allow parameter changes at this point.
+                 */
+                retval = -EBUSY;
+                goto out_unlock;
+        }
+        if (mp->crit < CRIT_LEVEL_A || mp->crit >= NUM_CRIT_LEVELS) {
+                printk(KERN_INFO "litmus: real-time task %d rejected "
+                        "because of invalid criticality level\n", pid);
+                goto out_unlock;
+        }
+        
+        //target->rt_param.plugin_state = mp;
+        target->rt_param.mc2_data = mp;
+
+        retval = 0;
+out_unlock:
+        read_unlock_irq(&tasklist_lock);
+out:
+        return retval;
+}
\ No newline at end of file
diff --git a/litmus/reservation.c b/litmus/reservation.c
index 08c74f9005b3..d11003af279a 100644
--- a/litmus/reservation.c
+++ b/litmus/reservation.c
@@ -217,7 +217,7 @@ static void sup_charge_budget(
                         /* stop at the first ACTIVE reservation */
                         //break;
         }
-        TRACE("finished charging budgets\n");
+        //TRACE("finished charging budgets\n");
 }
 
 static void sup_replenish_budgets(struct sup_reservation_environment* sup_env)
@@ -234,7 +234,7 @@ static void sup_replenish_budgets(struct sup_reservation_environment* sup_env)
                         break;
                 }
         }
-        TRACE("finished replenishing budgets\n");
+        //TRACE("finished replenishing budgets\n");
 
         /* request a scheduler update at the next replenishment instant */