error checking in ikglp

4 files changed, 38 insertions, 26 deletions

diff --git a/litmus/aux_tasks.c b/litmus/aux_tasks.c
index 42dee40f8b58..0d837c6bf9f8 100644
--- a/litmus/aux_tasks.c
+++ b/litmus/aux_tasks.c
@@ -513,6 +513,8 @@ static long __do_disable_aux_tasks(int flags)
                                                         TRACE_CUR("prior error (%d) masks new error (%d)\n", retval, temp_retval);
                                                 }
                                         }
+
+                                        tsk_rt(t)->task_params.period = 0;
                                 }
 
                                 tsk_rt(t)->is_aux_task = 0;
diff --git a/litmus/ikglp_lock.c b/litmus/ikglp_lock.c
index c11152c05efb..d9316766c71b 100644
--- a/litmus/ikglp_lock.c
+++ b/litmus/ikglp_lock.c
@@ -93,11 +93,16 @@ static inline int ikglp_get_idx(struct ikglp_semaphore *sem,
 static inline struct fifo_queue* ikglp_get_queue(struct ikglp_semaphore *sem,
                                                                                                  struct task_struct *holder)
 {
+        struct fifo_queue *fq = NULL;
         int i;
-        for(i = 0; i < sem->nr_replicas; ++i)
-                if(sem->fifo_queues[i].owner == holder)
-                        return(&sem->fifo_queues[i]);
-        return(NULL);
+        for(i = 0; i < sem->nr_replicas; ++i) {
+                if(sem->fifo_queues[i].owner == holder) {
+                        fq = &sem->fifo_queues[i];
+                        break;
+                }
+        }
+
+        return(fq);
 }
 
 
@@ -622,6 +627,12 @@ static void ikglp_refresh_owners_prio_increase(struct task_struct *t,
 
 //                      TRACE_TASK(owner, "Heap Before:\n");
 //                      print_hp_waiters(tsk_rt(owner)->hp_blocked_tasks.root, 0);
+                        if (unlikely(binheap_empty(&tsk_rt(owner)->hp_blocked_tasks))) {
+                                TRACE_TASK(owner, "not drawing inheritance from fq %d.\n", ikglp_get_idx(sem, fq));
+                                raw_spin_unlock(&tsk_rt(owner)->hp_blocked_tasks_lock);
+                                WARN_ON(1);
+                                return;
+                        }
 
                         old_max_eff_prio = top_priority(&tsk_rt(owner)->hp_blocked_tasks);
 
@@ -699,6 +710,14 @@ static void ikglp_refresh_owners_prio_decrease(struct fifo_queue *fq,
 
         raw_spin_lock(&tsk_rt(owner)->hp_blocked_tasks_lock);
 
+        if (unlikely(binheap_empty(&tsk_rt(owner)->hp_blocked_tasks))) {
+                TRACE_TASK(owner, "not drawing inheritance from fq %d.\n", ikglp_get_idx(sem, fq));
+                raw_spin_unlock(&tsk_rt(owner)->hp_blocked_tasks_lock);
+                unlock_fine_irqrestore(&sem->lock, flags);
+                WARN_ON(1);
+                return;
+        }
+
         old_max_eff_prio = top_priority(&tsk_rt(owner)->hp_blocked_tasks);
 
         binheap_delete(&fq->nest.hp_binheap_node, &tsk_rt(owner)->hp_blocked_tasks);
@@ -1310,7 +1329,8 @@ static void ikglp_move_pq_to_fq(struct ikglp_semaphore *sem,
 }
 
 static ikglp_wait_state_t* ikglp_find_hp_waiter_to_steal(
-        struct ikglp_semaphore* sem)
+        struct ikglp_semaphore* sem,
+        struct fifo_queue* skip)
 {
         /* must hold sem->lock */
 
@@ -1320,7 +1340,7 @@ static ikglp_wait_state_t* ikglp_find_hp_waiter_to_steal(
         int i;
 
         for(i = 0; i < sem->nr_replicas; ++i) {
-                if( (sem->fifo_queues[i].count > 1) &&
+                if( (sem->fifo_queues[i].count > 1) && (&sem->fifo_queues[i] != skip) &&
                    (!fq || litmus->compare(sem->fifo_queues[i].hp_waiter, fq->hp_waiter)) ) {
 
                         TRACE_CUR("hp_waiter on fq %d (%s/%d) has higher prio than hp_waiter on fq %d (%s/%d)\n",
@@ -1614,8 +1634,8 @@ void ikglp_move_next_to_fq(struct ikglp_semaphore *sem,
                                                                                          // Select a donor
 #ifdef CONFIG_LITMUS_AFFINITY_LOCKING
                 other_donor_info = (sem->aff_obs) ?
-                sem->aff_obs->ops->advise_donor_to_fq(sem->aff_obs, fq) :
-                binheap_top_entry(&sem->donors, ikglp_wait_state_t, node);
+                        sem->aff_obs->ops->advise_donor_to_fq(sem->aff_obs, fq) :
+                        binheap_top_entry(&sem->donors, ikglp_wait_state_t, node);
 #else
                 other_donor_info = binheap_top_entry(&sem->donors, ikglp_wait_state_t, node);
 #endif
@@ -1685,10 +1705,10 @@ void ikglp_move_next_to_fq(struct ikglp_semaphore *sem,
 
 #ifdef CONFIG_LITMUS_AFFINITY_LOCKING
                 fq_wait = (sem->aff_obs) ?
-                sem->aff_obs->ops->advise_steal(sem->aff_obs, fq) :
-                ikglp_find_hp_waiter_to_steal(sem);
+                        sem->aff_obs->ops->advise_steal(sem->aff_obs, fq) :
+                        ikglp_find_hp_waiter_to_steal(sem, fq);
 #else
-                fq_wait = ikglp_find_hp_waiter_to_steal(sem);
+                fq_wait = ikglp_find_hp_waiter_to_steal(sem, fq);
 #endif
 
                 if(fq_wait) {
@@ -3326,7 +3346,7 @@ ikglp_wait_state_t* simple_gpu_ikglp_advise_steal(struct ikglp_affinity* aff,
 {
         struct ikglp_semaphore *sem = ikglp_from_lock(aff->obs.lock);
         //      TRACE_CUR("Simple GPU ikglp advise_steal invoked\n");
-        return ikglp_find_hp_waiter_to_steal(sem);
+        return ikglp_find_hp_waiter_to_steal(sem, NULL);
 }
 
 ikglp_donee_heap_node_t* simple_gpu_ikglp_advise_donee_selection(struct ikglp_affinity* aff, struct task_struct* donor)
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 6c0ad0b4513a..924853c82343 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -476,9 +476,9 @@ static void reinit_litmus_state(struct task_struct* p, int restore)
 #ifdef CONFIG_REALTIME_AUX_TASKS
         /* also clear out the aux_data. the !restore case is only called on
          * fork (initial thread creation). */
-        if (!restore) {
+//      if (!restore) {
                 memset(&p->aux_data, 0, sizeof(p->aux_data));
-        }
+//      }
 #endif
 
 
diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index a42c06c0ad14..b931c83579bc 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -1777,16 +1777,6 @@ static void cedf_task_exit(struct task_struct * t)
         cedf_change_prio_pai_tasklet(t, NULL);
 #endif
 
-        /*
-BUG: t is forced to exit by another task.
-meanwhile, the scheduler selects to migrate to be scheduled
-
--- this triggers BAD BAD BAD
-
-if (current != t) and t is linked (but not scheduled?), do something.
-
-*/
-
         /* unlink if necessary */
         raw_readyq_lock_irqsave(&cluster->cluster_lock, flags);
 
@@ -1887,8 +1877,8 @@ static long cedf_admit_task(struct task_struct* tsk)
         struct budget_tracker_ops* ops = NULL;
 
         if (remote_cluster(task_cpu(tsk)) != task_cpu_cluster(tsk)) {
-                printk("rejected admit: incorrect cluster.\n");
-                return -EINVAL;
+//              printk("rejected admit: incorrect cluster.\n");
+//              return -EINVAL;
         }
 
         if (budget_enforced(tsk) || budget_signalled(tsk)) {