TODO: Fix ctrl_page bug

4 files changed, 96 insertions, 11 deletions

diff --git a/include/litmus/mc2_common.h b/include/litmus/mc2_common.h
index 7524ea79a1e9..118ff129cac9 100644
--- a/include/litmus/mc2_common.h
+++ b/include/litmus/mc2_common.h
@@ -19,6 +19,7 @@ struct mc2_task {
         enum crit_level crit;
         unsigned int res_id;
         uint32_t mode_mask;
+        int init_finished;
 };
 
 #ifdef __KERNEL__
diff --git a/litmus/mc2_common.c b/litmus/mc2_common.c
index cb6127ad57eb..730f99bcab54 100644
--- a/litmus/mc2_common.c
+++ b/litmus/mc2_common.c
@@ -67,6 +67,7 @@ asmlinkage long sys_set_mc2_task_param(pid_t pid, struct mc2_task __user * param
                 goto out_unlock;
         }
         
+        mp->init_finished = 0;
         //target->rt_param.plugin_state = mp;
         target->rt_param.mc2_data = mp;
 
diff --git a/litmus/reservation.c b/litmus/reservation.c
index d288178b9b5f..0d0c4930b872 100644
--- a/litmus/reservation.c
+++ b/litmus/reservation.c
@@ -199,9 +199,9 @@ static void sup_charge_budget(
                 /* charge all ACTIVE_IDLE up to the first ACTIVE reservation */
                 res = list_entry(pos, struct reservation, list);
                 if (res->state == RESERVATION_ACTIVE) {
-                        TRACE("sup_charge_budget ACTIVE R%u drain %llu\n", res->id, delta);
+                        //TRACE("sup_charge_budget ACTIVE R%u drain %llu\n", res->id, delta);
                         if (encountered_active == 0 && res->blocked_by_ghost == 0) {
-                                TRACE("DRAIN !!\n");
+                                //TRACE("DRAIN !!\n");
                                 res->ops->drain_budget(res, delta);
                                 encountered_active = 1;
                         }                       
@@ -215,8 +215,7 @@ static void sup_charge_budget(
                 {
                         /* make sure scheduler is invoked when this reservation expires
                          * its remaining budget */
-                         TRACE("requesting scheduler update for reservation %u in %llu nanoseconds\n",
-                                res->id, res->cur_budget);
+                         //TRACE("requesting scheduler update for reservation %u in %llu nanoseconds\n", res->id, res->cur_budget);
                          sup_scheduler_update_after(sup_env, res->cur_budget);
                 }
                 //if (encountered_active == 2)
@@ -625,7 +624,7 @@ int gmp_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("(gmp_update_time) now: %llu, current_time: %llu\n", now, gmp_env->env.current_time);
+        //TRACE("(gmp_update_time) now: %llu, current_time: %llu\n", now, gmp_env->env.current_time);
         if (unlikely(now <= gmp_env->env.current_time + EPSILON))
                 return 0;
 
diff --git a/litmus/sched_mc2.c b/litmus/sched_mc2.c
index b7813ae7d85e..497990090b7a 100644
--- a/litmus/sched_mc2.c
+++ b/litmus/sched_mc2.c
@@ -112,6 +112,7 @@ unsigned int res_reported;
 bool cpu_0_spin_flag;
 bool seen_once;
 bool cpu_0_task_exist;
+bool mode_changed;
 #define in_mode(t, modenum)     (tsk_mc2_data(t)->mode_mask & (1 << modenum))
 #define pending                 mode != requested_mode
 #define ready                   !res_reported
@@ -129,8 +130,10 @@ asmlinkage long sys_enact_mode(void)
         //lt_t now = litmus_clock();
         TRACE_TASK(current, "ENACTING MODE TASK\n");
         if (state->cpu == 0){
+                preempt_disable();
                 raw_spin_lock(&global_lock);
                 raw_spin_lock(&mode_lock); 
+                mode_changed = false;
                 if (pending){ //MCR has entered 
                         if (!seen_once){
                                 TRACE_TASK(current, "NOTICED MCR\n");
@@ -139,6 +142,7 @@ asmlinkage long sys_enact_mode(void)
                                 //after this jobs report themselves
                                 list_for_each(pos, &_global_env->active_reservations){
                                         res = list_entry(pos, struct reservation, list);
+                                        
                                         if (tsk_rt(res->tsk)->completed){
                                                 res->reported = 1;
                                                 res_reported--;
@@ -162,25 +166,48 @@ asmlinkage long sys_enact_mode(void)
                                 seen_once = true;
                         }
                         if( ready ){ //C is throttled
+                                lt_t new_mode_basetime = get_release(current);
+                                
                                 TRACE("Timer canceled\n");
                                 hrtimer_cancel(&state->timer);//stop listening to old mode timers
                                 mode = requested_mode;
                                 TRACE("Mode has been changed.\n");
+                                mode_changed = true;
                                 _global_env = &_global_env_modes[mode];
                                 //set res->reported for new global tasks
                                 list_for_each(pos, &_global_env->active_reservations){
                                         res = list_entry(pos, struct reservation, list);
+                                        release_at(res->tsk, new_mode_basetime);
                                         res->reported = 0;
                                 }
                                 list_for_each(pos, &_global_env->depleted_reservations){
                                         res = list_entry(pos, struct reservation, list);
+                                        release_at(res->tsk, new_mode_basetime);
                                         res->reported = 0;
                                 }
                                 list_for_each(pos, &_global_env->inactive_reservations){
                                         res = list_entry(pos, struct reservation, list);
+                                        release_at(res->tsk, new_mode_basetime);
                                         res->reported = 0;
                                 }
                                 //gmp_update_time(_global_env, now);
+                                raw_spin_lock(&state->lock);
+                
+                                state->sup_env = &state->sup_env_modes[mode];
+                                list_for_each(pos, &state->sup_env->active_reservations){
+                                        res = list_entry(pos, struct reservation, list);
+                                        release_at(res->tsk, new_mode_basetime);
+                                }
+                                list_for_each(pos, &state->sup_env->depleted_reservations){
+                                        res = list_entry(pos, struct reservation, list);
+                                        release_at(res->tsk, new_mode_basetime);
+                                }
+                                list_for_each(pos, &state->sup_env->inactive_reservations){
+                                        res = list_entry(pos, struct reservation, list);
+                                        release_at(res->tsk, new_mode_basetime);
+                                }
+                                raw_spin_unlock(&state->lock);
+                
                                 sched_trace_enact_mode(current);
                         }
                         
@@ -188,16 +215,42 @@ asmlinkage long sys_enact_mode(void)
                 }
                 raw_spin_unlock(&mode_lock);
                 raw_spin_unlock(&global_lock);
+                preempt_enable();
                 //release other CPUs
+                
                 cpu_0_spin_flag = !cpu_0_spin_flag;
         }
         else if (cpu_0_task_exist) {
                 //spin, wait for CPU 0 to stabilize mode decision
                 //before scheduling next hyperperiod
+                TRACE("CPU%d start spinning. %d\n",state->cpu, mode_changed);
                 if (state->spin_flag)
                         while(cpu_0_spin_flag);
                 else
                         while(!cpu_0_spin_flag);
+                TRACE("CPU%d flag check. %d\n",state->cpu, mode_changed);
+                if (mode_changed) {
+                        lt_t new_mode_basetime = get_release(current);
+                        TRACE("CPU%d mode changed\n",state->cpu);
+                        hrtimer_cancel(&state->timer); //stop listening to old mode timers
+                        //preempt_disable();
+                        raw_spin_lock(&state->lock);
+                        state->sup_env = &state->sup_env_modes[mode];
+                        list_for_each(pos, &state->sup_env->active_reservations){
+                                res = list_entry(pos, struct reservation, list);
+                                release_at(res->tsk, new_mode_basetime);
+                        }
+                        list_for_each(pos, &state->sup_env->depleted_reservations){
+                                res = list_entry(pos, struct reservation, list);
+                                release_at(res->tsk, new_mode_basetime);
+                        }
+                        list_for_each(pos, &state->sup_env->inactive_reservations){
+                                res = list_entry(pos, struct reservation, list);
+                                release_at(res->tsk, new_mode_basetime);
+                        }
+                        raw_spin_unlock(&state->lock);
+                        //preempt_enable();
+                }
                 state->spin_flag = !state->spin_flag;
         }
         else
@@ -224,6 +277,7 @@ asmlinkage long sys_request_mode(int new_mode){
                 return 0;
         }
         requested_mode = new_mode;
+        TRACE("MCR received\n");
         res_reported = mode_sizes[mode];
         seen_once = false;
         raw_spin_unlock(&mode_lock);
@@ -260,6 +314,21 @@ static enum crit_level get_task_crit_level(struct task_struct *tsk)
                 return mp->crit;
 }
 
+static int is_init_finished(struct task_struct *tsk)
+{
+        struct mc2_task *mp;
+        
+        if (!tsk || !is_realtime(tsk))
+                return 0;
+        
+        mp = tsk_rt(tsk)->mc2_data;
+        
+        if (!mp)
+                return 0;
+        else
+                return mp->init_finished;
+}
+
 /* task_depart - remove a task from its reservation
  *               If the job has remaining budget, convert it to a ghost job
  *               and update crit_entries[]
@@ -801,11 +870,19 @@ struct task_struct* mc2_dispatch(struct sup_reservation_environment* sup_env, st
                                         sup_scheduler_update_after(sup_env, res->cur_budget);
                                         return tsk;
                                 } else {
-                                        //ce = &state->crit_entries[lv];
-                                        sup_scheduler_update_after(sup_env, res->cur_budget);
-                                        res->blocked_by_ghost = 0;
-                                        res->is_ghost = NO_CPU;
-                                        return tsk;
+                                        TRACE_TASK(tsk, "@@@@@DISPATCH@@@@@@@ init_finished? %s\n", is_init_finished(tsk)?"true":"false");
+                                        if (!is_init_finished(tsk)) {
+                                                //ce = &state->crit_entries[lv];
+                                                sup_scheduler_update_after(sup_env, res->cur_budget);
+                                                res->blocked_by_ghost = 0;
+                                                res->is_ghost = NO_CPU;
+                                                return tsk;
+                                        } else if (res->mode == mode) {
+                                                sup_scheduler_update_after(sup_env, res->cur_budget);
+                                                res->blocked_by_ghost = 0;
+                                                res->is_ghost = NO_CPU;
+                                                return tsk;
+                                        }
                                 }
                         }
                 }
@@ -1106,7 +1183,7 @@ static void mc2_task_resume(struct task_struct  *tsk)
         if (tinfo->has_departed)
         {
                 /* We don't want to consider jobs before synchronous releases */
-                if (tsk_rt(tsk)->job_params.job_no > 5) {
+                if (tsk_rt(tsk)->job_params.job_no > 3) {
                         switch(get_task_crit_level(tsk)) {
                                 case CRIT_LEVEL_A:
                                         TS_RELEASE_LATENCY_A(get_release(tsk));
@@ -1120,6 +1197,8 @@ static void mc2_task_resume(struct task_struct  *tsk)
                                 default:
                                         break;
                         }
+                        TRACE_CUR("INIT_FINISHED is SET\n");
+                        tsk_mc2_data(tsk)->init_finished = 1;
                 }
 
                 raw_spin_lock(&state->lock);
@@ -1191,6 +1270,7 @@ static long mc2_admit_task(struct task_struct *tsk)
                 tinfo->has_departed = true;
                 tinfo->mc2_param.res_id = mp->res_id;
                 tinfo->mc2_param.mode_mask = mp->mode_mask;
+                tinfo->mc2_param.init_finished = 0;
                 TRACE_TASK(tsk, "mode_mask = %x\n", mp->mode_mask);
                 
                 TRACE_TASK(tsk, "Mode 0\n");
@@ -1234,7 +1314,9 @@ static long mc2_admit_task(struct task_struct *tsk)
                         tsk_rt(tsk)->plugin_state = tinfo;
                         tsk_rt(tsk)->task_params.budget_policy = NO_ENFORCEMENT;
                 }
+                TRACE_CUR("ctrl_page mode_poll_task %d, cpu = %d, tsk_rt->ctrl_page = %x\n", is_mode_poll_task(tsk), tinfo->cpu, tsk_rt(tsk)->ctrl_page);
                 if (is_mode_poll_task(tsk) && tinfo->cpu == 0) {
+                        TRACE_CUR("CPU0_TASK_EXIST set\n");
                         cpu_0_task_exist = true;
                 }
 
@@ -1253,6 +1335,8 @@ static long mc2_admit_task(struct task_struct *tsk)
                 tinfo->has_departed = true;     
                 tinfo->mc2_param.res_id = mp->res_id;
                 tinfo->mc2_param.mode_mask = mp->mode_mask;
+                tinfo->mc2_param.init_finished = 0;
+                
                 TRACE_TASK(tsk, "mode_mask = %x\n", mp->mode_mask);
                 
                 TRACE_TASK(tsk, "Mode 0\n");