Added mode 0 reservation for all tasks

6 files changed, 162 insertions, 34 deletions

diff --git a/include/litmus/reservation.h b/include/litmus/reservation.h
index 3c54ce0f0545..ee3aac23c4eb 100644
--- a/include/litmus/reservation.h
+++ b/include/litmus/reservation.h
@@ -137,6 +137,7 @@ struct reservation {
 
         /* for mode change */
         int reported;
+        int mode;
         //under mc2 assume only 1 task per reservation
         //multiple reservation per task
         struct task_struct *tsk;
diff --git a/kernel/sched/litmus.c b/kernel/sched/litmus.c
index 9d58690cf51a..60be718b36d3 100644
--- a/kernel/sched/litmus.c
+++ b/kernel/sched/litmus.c
@@ -20,8 +20,9 @@ static void update_time_litmus(struct rq *rq, struct task_struct *p)
         /* task counter */
         p->se.sum_exec_runtime += delta;
         if (delta) {
-                TRACE_TASK(p, "charged %llu exec time (total:%llu, rem:%llu)\n",
-                        delta, p->rt_param.job_params.exec_time, budget_remaining(p));
+                //TRACE_TASK(p, "charged %llu exec time (total:%llu, rem:%llu)\n",
+                //      delta, p->rt_param.job_params.exec_time, budget_remaining(p));
+                ;
         }
         /* sched_clock() */
         p->se.exec_start = rq->clock;
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 3cf784b19034..7fccc585dedd 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -374,7 +374,7 @@ asmlinkage long sys_set_page_color(int cpu)
 
         //down_read(&current->mm->mmap_sem);
         down_read(&mm->mmap_sem);
-        TRACE_TASK(current, "SYSCALL set_page_color\n");
+        //TRACE_TASK(current, "SYSCALL set_page_color\n");
         vma_itr = mm->mmap;
         while (vma_itr != NULL) {
                 unsigned int num_pages = 0, i;
@@ -399,7 +399,7 @@ asmlinkage long sys_set_page_color(int cpu)
                                 continue;
                         }
                         
-                        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));
+                        //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) {
                                 ret = isolate_lru_page(old_page);
@@ -408,8 +408,8 @@ asmlinkage long sys_set_page_color(int cpu)
                                         inc_zone_page_state(old_page, NR_ISOLATED_ANON + !PageSwapBacked(old_page));
                                         nr_pages++;
                                 } else {
-                                        TRACE_TASK(current, "isolate_lru_page failed\n");
-                                        TRACE_TASK(current, "page_lru = %d PageLRU = %d\n", page_lru(old_page), PageLRU(old_page));
+                                        //TRACE_TASK(current, "isolate_lru_page failed\n");
+                                        //TRACE_TASK(current, "page_lru = %d PageLRU = %d\n", page_lru(old_page), PageLRU(old_page));
                                         nr_failed++;
                                 }
                                 //printk(KERN_INFO "PRIVATE _mapcount = %d, _count = %d\n", page_mapcount(old_page), page_count(old_page));
diff --git a/litmus/polling_reservations.c b/litmus/polling_reservations.c
index 4a2fee575127..1cfd09169959 100644
--- a/litmus/polling_reservations.c
+++ b/litmus/polling_reservations.c
@@ -31,9 +31,9 @@ static void periodic_polling_client_arrives(
                                 res->next_replenishment = res->env->time_zero + instances * pres->period;
                         }
                                 
-                        TRACE("ENV_TIME_ZERO %llu\n", res->env->time_zero);
-                        TRACE("pol-res: R%d activate tmp=%llu instances=%llu period=%llu nextrp=%llu cur=%llu\n",
-                                res->id, tmp, instances, pres->period, res->next_replenishment,
+                        TRACE("ENV_TIME_ZERO %llu in mode %d\n", res->env->time_zero, res->mode);
+                        TRACE("pol-res: mode %d R%d activate tmp=%llu instances=%llu period=%llu nextrp=%llu cur=%llu\n",
+                                res->mode, res->id, tmp, instances, pres->period, res->next_replenishment,
                                 res->env->current_time);
 
                         res->env->change_state(res->env, res,
diff --git a/litmus/reservation.c b/litmus/reservation.c
index a17343efdbae..d288178b9b5f 100644
--- a/litmus/reservation.c
+++ b/litmus/reservation.c
@@ -169,7 +169,7 @@ struct reservation* sup_find_by_id(struct sup_reservation_environment* sup_env,
         unsigned int id)
 {
         struct reservation *res;
-
+        BUG_ON(!sup_env);
         list_for_each_entry(res, &sup_env->active_reservations, list) {
                 if (res->id == id)
                         return res;
diff --git a/litmus/sched_mc2.c b/litmus/sched_mc2.c
index 1cb8e56e4ada..b7813ae7d85e 100644
--- a/litmus/sched_mc2.c
+++ b/litmus/sched_mc2.c
@@ -276,7 +276,7 @@ static void task_departs(struct task_struct *tsk, int job_complete)
         BUG_ON(!is_realtime(tsk));
 
         for(i = 0; i < NR_MODES; i++){
-                if (! in_mode(tsk, i) )
+                if (! in_mode(tsk, i) && i != 0)
                         continue;       
                 res    = tinfo->res_info[i].client.reservation;
                 client = &tinfo->res_info[i].client;
@@ -329,7 +329,7 @@ static void task_arrives(struct mc2_cpu_state *state, struct task_struct *tsk)
         TRACE_TASK(tsk, "CLIENT ARRIVES at %llu\n", litmus_clock());
         
         for(i = 0; i < NR_MODES; i++){
-                if (! in_mode(tsk, i) )
+                if (! in_mode(tsk, i) && i != 0)
                         continue;       
                 res    = tinfo->res_info[i].client.reservation;
                 client = &tinfo->res_info[i].client;
@@ -464,7 +464,7 @@ static void mc2_update_timer_and_unlock(struct mc2_cpu_state *state)
          * may raise a softirq, which in turn may wake ksoftirqd. */
         raw_spin_unlock(&global_lock);
         raw_spin_unlock(&state->lock);
-                
+
         if (update <= now || reschedule[state->cpu]) {
                 reschedule[state->cpu] = 0;
                 litmus_reschedule(state->cpu);
@@ -974,6 +974,8 @@ static struct task_struct* mc2_schedule(struct task_struct * prev)
 
         if (!state->scheduled) {
                 raw_spin_lock(&global_lock);
+                if (is_realtime(prev))
+                        gmp_update_time(_global_env, now);
                 state->scheduled = mc2_global_dispatch(state);
                 raw_spin_unlock(&global_lock);
         }
@@ -1012,10 +1014,11 @@ static struct task_struct* mc2_schedule(struct task_struct * prev)
         if (prev != state->scheduled && is_realtime(prev)) {
                 struct mc2_task_state* tinfo = get_mc2_state(prev);
                 struct reservation* res = tinfo->res_info[mode].client.reservation;
-                TRACE_TASK(prev, "PREV JOB scheduled_on = P%d\n", res->scheduled_on);
                 TRACE_TASK(prev, "PREEPT_COUNT %d\n", preempt_count());
-                if (res)
+                if (res) {
+                        TRACE_TASK(prev, "PREV JOB was scheduled_on = P%d\n", res->scheduled_on);
                         res->scheduled_on = NO_CPU;
+                }
                 TRACE_TASK(prev, "descheduled at %llu.\n", litmus_clock());
                 /* if prev is preempted and a global task, find the lowest cpu and reschedule */
                 if (tinfo->has_departed == false && get_task_crit_level(prev) == CRIT_LEVEL_C) {
@@ -1189,7 +1192,23 @@ static long mc2_admit_task(struct task_struct *tsk)
                 tinfo->mc2_param.res_id = mp->res_id;
                 tinfo->mc2_param.mode_mask = mp->mode_mask;
                 TRACE_TASK(tsk, "mode_mask = %x\n", mp->mode_mask);
-                for(i = 0; i < NR_MODES; i++){
+                
+                TRACE_TASK(tsk, "Mode 0\n");
+                res = sup_find_by_id(&(state->sup_env_modes[0]), mp->res_id);
+        
+                /* found the appropriate reservation */
+                if (res) {
+                        TRACE_TASK(tsk, "SUP FOUND RES ID in mode 0\n");                        
+                        
+                        /* initial values */
+                        err = err? err:mc2_task_client_init(&tinfo->res_info[0], &tinfo->mc2_param, tsk, res);
+                }
+                else {
+                        //failed to find an expected reservation
+                        err = -ESRCH;
+                }
+                        
+                for(i = 1; i < NR_MODES; i++){
                         if (!in_mode(tsk, i)){
                                 //task not present in mode
                                 continue;
@@ -1199,7 +1218,7 @@ static long mc2_admit_task(struct task_struct *tsk)
         
                         /* found the appropriate reservation */
                         if (res) {
-                                TRACE_TASK(tsk, "SUP FOUND RES ID\n");                  
+                                TRACE_TASK(tsk, "SUP FOUND RES ID in mode %d\n", i);                    
                                 
                                 /* initial values */
                                 err = err? err:mc2_task_client_init(&tinfo->res_info[i], &tinfo->mc2_param, tsk, res);
@@ -1234,14 +1253,31 @@ 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;
+                TRACE_TASK(tsk, "mode_mask = %x\n", mp->mode_mask);
+                
+                TRACE_TASK(tsk, "Mode 0\n");
+                res = gmp_find_by_id(&(_global_env_modes[0]), mp->res_id);
         
-                for(i = 0; i < NR_MODES; i++){
-                        if (!in_mode(tsk, i)) continue;
-                        res = gmp_find_by_id(_global_env, mp->res_id);
+                /* found the appropriate reservation */
+                if (res) {
+                        TRACE_TASK(tsk, "GMP FOUND RES ID in mode 0\n");                        
+                        
+                        /* initial values */
+                        err = err? err:mc2_task_client_init(&tinfo->res_info[0], &tinfo->mc2_param, tsk, res);
+                }
+                else {
+                        //failed to find an expected reservation
+                        err = -ESRCH;
+                }
+                
+                for(i = 1; i < NR_MODES; i++){
+                        if (!in_mode(tsk, i)) 
+                                continue;
+                        res = gmp_find_by_id(&(_global_env_modes[i]), mp->res_id);
 
                         /* found the appropriate reservation (or vCPU) */
                         if (res) {
-                                TRACE_TASK(tsk, "GMP FOUND RES ID\n");
+                                TRACE_TASK(tsk, "GMP FOUND RES ID in mode %d\n", i);
                                 
                                 /* initial values */
                                 err = err? err:mc2_task_client_init(&tinfo->res_info[i], &tinfo->mc2_param, tsk, res);
@@ -1323,11 +1359,10 @@ static void mc2_task_new(struct task_struct *tsk, int on_runqueue,
         //BUG_ON(!res);
         // the current mode doesn't have this task.
         // do not update timer and set the next release time.
-        if (!res) {
-
-        }
 
         //res = res_find_by_id(state, tinfo->mc2_param.res_id);
+        BUG_ON(!res);
+        
         release = res->next_replenishment;
         
         if (on_runqueue || is_running) {
@@ -1380,16 +1415,17 @@ static long mc2_reservation_destroy(unsigned int reservation_id, int cpu)
         int i;
         
         if (cpu == -1) {
+                struct next_timer_event *event, *e_next;
                 local_irq_save(flags);
                 raw_spin_lock(&global_lock);
 
                 /* if the reservation is global reservation */
                 //state = local_cpu_state();
                 //delete reservation id in all modes
-                for(i = 0; i < NR_MODES; i++){
+                for(i = 0; i < NR_MODES; i++) {
                         //raw_spin_lock(&state->lock);
                 
-                        list_for_each_entry_safe(res, next, &_global_env->depleted_reservations, list) {
+                        list_for_each_entry_safe(res, next, &_global_env_modes[i].depleted_reservations, list) {
                                 if (res->id == reservation_id) {
                                         list_del(&res->list);
                                         kfree(res);
@@ -1398,7 +1434,7 @@ static long mc2_reservation_destroy(unsigned int reservation_id, int cpu)
                                 }
                         }
                         if (!found) {
-                                list_for_each_entry_safe(res, next, &_global_env->inactive_reservations, list) {
+                                list_for_each_entry_safe(res, next, &_global_env_modes[i].inactive_reservations, list) {
                                         if (res->id == reservation_id) {
                                                 list_del(&res->list);
                                                 kfree(res);
@@ -1408,7 +1444,7 @@ static long mc2_reservation_destroy(unsigned int reservation_id, int cpu)
                                 }
                         }
                         if (!found) {
-                                list_for_each_entry_safe(res, next, &_global_env->active_reservations, list) {
+                                list_for_each_entry_safe(res, next, &_global_env_modes[i].active_reservations, list) {
                                         if (res->id == reservation_id) {
                                                 list_del(&res->list);
                                                 kfree(res);
@@ -1419,7 +1455,15 @@ static long mc2_reservation_destroy(unsigned int reservation_id, int cpu)
                         }
 
                         //raw_spin_unlock(&state->lock);
+                        list_for_each_entry_safe(event, e_next, &_global_env_modes[i].next_events, list) {
+                                if (event->id == reservation_id) {
+                                        list_del(&event->list);
+                                        TRACE("EVENT id %d deleted\n", event->id);
+                                        kfree(event);
+                                } 
+                        }
                 }
+                
                 raw_spin_unlock(&global_lock);
                 local_irq_restore(flags);
         } else {
@@ -1430,7 +1474,7 @@ static long mc2_reservation_destroy(unsigned int reservation_id, int cpu)
                         raw_spin_lock(&state->lock);
                         
         //              res = sup_find_by_id(state->sup_env, reservation_id);
-                        sup_env = state->sup_env;
+                        sup_env = &(state->sup_env_modes[i]);
                         list_for_each_entry_safe(res, next, &sup_env->depleted_reservations, list) {
                                 if (res->id == reservation_id) {
 /*
@@ -1444,6 +1488,7 @@ static long mc2_reservation_destroy(unsigned int reservation_id, int cpu)
                                         kfree(res);
                                         found = 1;
                                         ret = 0;
+                                        TRACE_CUR("FOUND id %d mode %d\n",res->id, res->mode);
                                 }
                         }
                         if (!found) {
@@ -1459,6 +1504,7 @@ static long mc2_reservation_destroy(unsigned int reservation_id, int cpu)
                                                 kfree(res);
                                                 found = 1;
                                                 ret = 0;
+                                                TRACE_CUR("FOUND id %d mode %d\n",res->id, res->mode);
                                         }
                                 }
                         }
@@ -1475,6 +1521,7 @@ static long mc2_reservation_destroy(unsigned int reservation_id, int cpu)
                                                 kfree(res);
                                                 found = 1;
                                                 ret = 0;
+                                                TRACE_CUR("FOUND id %d mode %d\n",res->id, res->mode);
                                         }
                                 }
                         }
@@ -1594,7 +1641,7 @@ static long create_polling_reservation(
         int res_type,
         struct reservation_config *config)
 {
-        struct mc2_cpu_state *state;
+        struct mc2_cpu_state *state = NULL;
         //struct reservation* res = NULL;
         struct polling_reservation *pres;
         unsigned long flags;
@@ -1637,11 +1684,47 @@ static long create_polling_reservation(
         if (!pres)
                 return -ENOMEM;
 
+        TRACE("CREATE_POLLING_RESERVATION id %d mode %d\n", config->id, config->mode);
         if (config->cpu != -1) {
-                
+                int i, is_exist = 0;
                 //raw_spin_lock_irqsave(&_global_env.lock, flags);
                 state = cpu_state_for(config->cpu);
                 raw_spin_lock_irqsave(&state->lock, flags);
+                
+                /* check if it is the first creation of reservartion */
+                for (i = 0; i < NR_MODES; i++) {
+                        if( sup_find_by_id(&(state->sup_env_modes[i]), config->id) )
+                                is_exist = 1;
+                }
+                if (!is_exist && config->mode != 0) {
+                        /* create mode 0 reservation first */
+                        struct polling_reservation *pres_0 = kzalloc(sizeof(*pres_0), GFP_ATOMIC);
+                        
+                        TRACE_CUR("The first mode_num = %d\n",config->mode);
+                        
+                        if (!pres_0) {
+                                raw_spin_unlock_irqrestore(&state->lock, flags);
+                                kfree(pres);
+                                return -ENOMEM;
+                        }
+                        polling_reservation_init(pres_0, use_edf, periodic,
+                                config->polling_params.budget,
+                                config->polling_params.period,
+                                config->polling_params.relative_deadline,
+                                config->polling_params.offset);
+                        pres_0->res.id = config->id;
+                        pres_0->res.blocked_by_ghost = 0;
+                        pres_0->res.is_ghost = NO_CPU;
+                        pres_0->res.mode = config->mode;
+
+                        if (!use_edf)
+                                pres_0->res.priority = config->priority;
+                        sup_add_new_reservation(&(state->sup_env_modes[0]), &pres_0->res);
+                        TRACE_CUR("SUP reservation created R%d for mode 0 priority : %llu\n", config->id, pres_0->res.priority);
+                        pres_0->res.reported = 0;
+                        pres_0->res.tsk = current;
+                }
+
                 //force reservation id unique inside of res_config->mode
                 if( sup_find_by_id(&(state->sup_env_modes[config->mode]), config->id) ){
                         resExist = true;
@@ -1655,6 +1738,7 @@ static long create_polling_reservation(
                         pres->res.id = config->id;
                         pres->res.blocked_by_ghost = 0;
                         pres->res.is_ghost = NO_CPU;
+                        pres->res.mode = config->mode;
                         /*if (config->priority == LITMUS_MAX_PRIORITY) {
                                 level_a_priorities[config->cpu]++;
                                 pres->res.priority = level_a_priorities[config->cpu];
@@ -1663,7 +1747,7 @@ static long create_polling_reservation(
                                 pres->res.priority = config->priority;
                         sup_add_new_reservation(&(state->sup_env_modes[config->mode]), &pres->res);
                         err = config->id;
-                        TRACE_CUR("reservation created R%d for mode %d priority : %llu\n", config->id, config->mode, pres->res.priority);
+                        TRACE_CUR("SUP reservation created R%d for mode %d priority : %llu\n", config->id, config->mode, pres->res.priority);
                 } else {
                         err = -EEXIST;
                 }
@@ -1672,8 +1756,45 @@ static long create_polling_reservation(
                 //raw_spin_unlock_irqrestore(&_global_env.lock, flags);
 
         } else {
+                int i, is_exist = 0;
                 raw_spin_lock_irqsave(&global_lock, flags);
                 
+                /* check if it is the first creation of reservartion */
+                for (i = 0; i < NR_MODES; i++) {
+                        if(gmp_find_by_id(&(_global_env_modes[i]), config->id))
+                                is_exist = 1;
+                }
+                if (!is_exist && config->mode != 0) {
+                        /* create mode 0 reservation first */
+                        struct polling_reservation *pres_0 = kzalloc(sizeof(*pres_0), GFP_ATOMIC);
+                        
+                        TRACE_CUR("The first mode_num = %d\n",config->mode);
+                        
+                        if (!pres_0) {
+                                raw_spin_unlock_irqrestore(&global_lock, flags);
+                                kfree(pres);
+                                return -ENOMEM;
+                        }
+                        polling_reservation_init(pres_0, use_edf, periodic,
+                                config->polling_params.budget,
+                                config->polling_params.period,
+                                config->polling_params.relative_deadline,
+                                config->polling_params.offset);
+                        pres_0->res.id = config->id;
+                        pres_0->res.blocked_by_ghost = 0;
+                        pres_0->res.scheduled_on = NO_CPU;
+                        pres_0->res.is_ghost = NO_CPU;
+                        pres_0->res.mode = config->mode;
+
+                        if (!use_edf)
+                                pres_0->res.priority = config->priority;
+                        gmp_add_new_reservation(&(_global_env_modes[0]), &pres_0->res);
+                        TRACE_CUR("GMP reservation created R%d for mode 0 priority : %llu\n", config->id, pres_0->res.priority);
+                        pres_0->res.reported = 0;
+                        pres_0->res.tsk = current;
+                }
+
+                
                 //force id's unique within desired mode
                 if (gmp_find_by_id(&(_global_env_modes[config->mode]), config->id)){
                         resExist = true;
@@ -1688,9 +1809,11 @@ static long create_polling_reservation(
                         pres->res.blocked_by_ghost = 0;
                         pres->res.scheduled_on = NO_CPU;
                         pres->res.is_ghost = NO_CPU;
+                        pres->res.mode = config->mode;
                         if (!use_edf)
                                 pres->res.priority = config->priority;
                         gmp_add_new_reservation(&(_global_env_modes[config->mode]), &pres->res);
+                        TRACE_CUR("GMP reservation created R%d for mode %d priority : %llu\n", config->id, config->mode, pres->res.priority);
                         err = config->id;
                 } else {
                         err = -EEXIST;
@@ -1807,6 +1930,7 @@ static long create_table_driven_reservation(
                         td_res->res.id = config->id;
                         td_res->res.priority = config->priority;
                         td_res->res.blocked_by_ghost = 0;
+                        td_res->res.mode = config->mode;
                         sup_add_new_reservation(&(state->sup_env_modes[config->mode]), &td_res->res);
                         err = config->id;
                 } else {
@@ -1835,10 +1959,12 @@ static long mc2_reservation_create(int res_type, void* __user _config)
         struct reservation_config config;
 
         TRACE("Attempt to create reservation (%d)\n", res_type);
-
+        
         if (copy_from_user(&config, _config, sizeof(config)))
                 return -EFAULT;
 
+        TRACE("Attempt to create reservation id %d mode %d\n", config.id, config.mode);
+
         if (config.cpu != -1) {
                 if (config.cpu < 0 || !cpu_online(config.cpu)) {
                         printk(KERN_ERR "invalid polling reservation (%u): "
@@ -2006,7 +2132,7 @@ static long mc2_deactivate_plugin(void)
                 for(i = 0; i < NR_MODES; i++){
                         /* Delete all reservations --- assumes struct reservation
                          * is prefix of containing struct. */
-                        state->sup_env = &state->sup_env_modes[i];
+                        state->sup_env = &(state->sup_env_modes[i]);
                         while (!list_empty(&state->sup_env->active_reservations)) {
                                 res = list_first_entry(
                                         &state->sup_env->active_reservations,