Reset way tracker state between activations.

3 files changed, 18 insertions, 6 deletions

diff --git a/include/litmus/way_tracker.h b/include/litmus/way_tracker.h
index eb78f1deb208..cd61073725ed 100644
--- a/include/litmus/way_tracker.h
+++ b/include/litmus/way_tracker.h
@@ -5,6 +5,7 @@
 struct task_struct;
 void color_page_info_take_ways(struct task_struct*);
 void color_page_info_release_ways(struct task_struct*);
+void reset_way_tracker(void);
 
 
 #endif
diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index 046359bfffdb..e52eb42a3610 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -29,6 +29,7 @@
 #include <litmus/ce_domain.h>
 #include <litmus/dgl.h>
 #include <litmus/color.h>
+#include <litmus/way_tracker.h>
 
 struct mc_signal {
         int                     update:1;
@@ -1417,7 +1418,7 @@ static struct task_struct* mc_schedule(struct task_struct* prev)
                 }
         }
 
-        if (next && tsk_mc_crit(next) == CRIT_LEVEL_B && lock_cache) {
+        if (next && tsk_mc_crit(next) == CRIT_LEVEL_B && lock_cache && get_rt_job(next) > 1) {
                 start = litmus_clock();
                 work = color_sched_in_task(next);
                 tsk_rt(next)->load = litmus_clock() - start;
@@ -1522,6 +1523,8 @@ static long mc_activate_plugin(void)
         int cpu, n = 0;
         long ret;
 
+        reset_way_tracker();
+
         interrupt_cpu = atomic_read(&release_master_cpu);
 
         for_each_online_cpu(cpu) {
diff --git a/litmus/way_tracker.c b/litmus/way_tracker.c
index 6afccc7ea5f7..a9e8ef62f37e 100644
--- a/litmus/way_tracker.c
+++ b/litmus/way_tracker.c
@@ -76,9 +76,20 @@ void color_page_info_release_ways(struct task_struct *t)
         }
 }
 
+void reset_way_tracker(void)
+{
+        int color, unused;
+
+        for (color = 0; color < color_cache_info.nr_colors; ++color) {
+                unused = sizeof(unsigned long)*8 - color_cache_info.ways;
+                ways[color] = ULONG_MAX >> unused;
+        }
+
+}
+
 static int __init init_way_tracker(void)
 {
-        int color, size, unused;
+        int size;
 
         BUG_ON(!color_cache_info.nr_colors);
         BUG_ON(color_cache_info.ways > sizeof(unsigned long)*8);
@@ -88,10 +99,7 @@ static int __init init_way_tracker(void)
         size = sizeof(unsigned long) * color_cache_info.nr_colors;
         ways = kmalloc(size, GFP_ATOMIC);
 
-        for (color = 0; color < color_cache_info.nr_colors; ++color) {
-                unused = sizeof(unsigned long)*8 - color_cache_info.ways;
-                ways[color] = ULONG_MAX >> unused;
-        }
+        reset_way_tracker();
 
         raw_spin_lock_init(&lock);