Add MC2 plugin

4 files changed, 11 insertions, 5 deletions

diff --git a/litmus/Makefile b/litmus/Makefile
index 05021f553eda..997524f91363 100644
--- a/litmus/Makefile
+++ b/litmus/Makefile
@@ -19,6 +19,7 @@ obj-y     = sched_plugin.o litmus.o \
             binheap.o \
             ctrldev.o \
             uncachedev.o \
+            cache_proc.o \
             sched_gsn_edf.o \
             sched_psn_edf.o \
             sched_pfp.o
@@ -35,4 +36,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/litmus.c b/litmus/litmus.c
index 0b87e040cb73..8a2446f26f72 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -646,7 +646,7 @@ static void __init litmus_enable_perfcounters_v7(void *_ignore)
         asm volatile("mcr p15, 0, %0, c9, c12, 0" : : "r"(enable_val));
 
         /* enables counters (cycle counter and event 1) */
-        asm volatile("mcr p15, 0, %0, c9, c12, 1" : : "r"(0x80000001));
+    asm volatile("mcr p15, 0, %0, c9, c12, 1" : : "r"(0x80000001));
 }
 
 static void __init litmus_enable_perfcounters(void)
diff --git a/litmus/reservation.c b/litmus/reservation.c
index 0bc551e2e67b..0e43479ff2e1 100644
--- a/litmus/reservation.c
+++ b/litmus/reservation.c
@@ -211,7 +211,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)
@@ -228,7 +228,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 */
         res = list_first_entry_or_null(&sup_env->depleted_reservations,
@@ -246,7 +246,7 @@ void sup_update_time(
         /* If the time didn't advance, there is nothing to do.
          * This check makes it safe to call sup_advance_time() potentially
          * multiple times (e.g., via different code paths. */
-        TRACE("(sup_update_time) now: %llu, current_time: %llu\n", now, sup_env->env.current_time);
+        //TRACE("(sup_update_time) now: %llu, current_time: %llu\n", now, sup_env->env.current_time);
         if (unlikely(now <= sup_env->env.current_time))
                 return;
 
diff --git a/litmus/sched_mc2.c b/litmus/sched_mc2.c
index ab35008668d6..1e5b28ba0ac3 100644
--- a/litmus/sched_mc2.c
+++ b/litmus/sched_mc2.c
@@ -381,6 +381,8 @@ static void mc2_task_new(struct task_struct *tsk, int on_runqueue,
         task_new_legacy_task_model_updates(tsk);
 }
 
+static long mc2_reservation_destroy(unsigned int reservation_id, int cpu);
+
 static void mc2_task_exit(struct task_struct *tsk)
 {
         unsigned long flags;
@@ -404,6 +406,8 @@ static void mc2_task_exit(struct task_struct *tsk)
         } else
                 raw_spin_unlock_irqrestore(&state->lock, flags);
 
+        mc2_reservation_destroy(tsk->pid, tinfo->cpu);
+        
         kfree(tsk_rt(tsk)->plugin_state);
         tsk_rt(tsk)->plugin_state = NULL;
 }