Added TRACE calls to ikglp

2 files changed, 52 insertions, 29 deletions

diff --git a/litmus/ikglp_lock.c b/litmus/ikglp_lock.c
index 5099f6eae537..ae769bce58d6 100644
--- a/litmus/ikglp_lock.c
+++ b/litmus/ikglp_lock.c
@@ -269,10 +269,12 @@ static void ikglp_add_global_list(struct ikglp_semaphore *sem,
 
                 binheap_add(&node->node, &sem->top_m, ikglp_heap_node_t, node);
 
-//              TRACE_CUR("Top-M After (size = %d):\n", sem->top_m_size);
-//              print_global_list(sem->top_m.root, 1);
-//              TRACE_CUR("Not-Top-M After:\n");
-//              print_global_list(sem->not_top_m.root, 1);
+#if 0
+                TRACE_CUR("Top-M After (size = %d):\n", sem->top_m_size);
+                print_global_list(sem->top_m.root, 1);
+                TRACE_CUR("Not-Top-M After:\n");
+                print_global_list(sem->not_top_m.root, 1);
+#endif
         }
         else {
                 TRACE_CUR("Trivially adding %s/%d to not-top-m global list.\n",
@@ -282,8 +284,10 @@ static void ikglp_add_global_list(struct ikglp_semaphore *sem,
 
                 binheap_add(&node->node, &sem->not_top_m, ikglp_heap_node_t, node);
 
-//              TRACE_CUR("Not-Top-M After:\n");
-//              print_global_list(sem->not_top_m.root, 1);
+#if 0
+                TRACE_CUR("Not-Top-M After:\n");
+                print_global_list(sem->not_top_m.root, 1);
+#endif
         }
 }
 
@@ -324,10 +328,12 @@ static void ikglp_del_global_list(struct ikglp_semaphore *sem,
                         --(sem->top_m_size);
                 }
 
-//              TRACE_CUR("Top-M After (size = %d):\n", sem->top_m_size);
-//              print_global_list(sem->top_m.root, 1);
-//              TRACE_CUR("Not-Top-M After:\n");
-//              print_global_list(sem->not_top_m.root, 1);
+#if 0
+                TRACE_CUR("Top-M After (size = %d):\n", sem->top_m_size);
+                print_global_list(sem->top_m.root, 1);
+                TRACE_CUR("Not-Top-M After:\n");
+                print_global_list(sem->not_top_m.root, 1);
+#endif
         }
         else {
                 TRACE_CUR("%s/%d is in not-top-m\n", t->comm, t->pid);
@@ -336,8 +342,10 @@ static void ikglp_del_global_list(struct ikglp_semaphore *sem,
 
                 binheap_delete(&node->node, &sem->not_top_m);
 
-//              TRACE_CUR("Not-Top-M After:\n");
-//              print_global_list(sem->not_top_m.root, 1);
+#if 0
+                TRACE_CUR("Not-Top-M After:\n");
+                print_global_list(sem->not_top_m.root, 1);
+#endif
         }
 }
 
@@ -358,8 +366,10 @@ static void ikglp_add_donees(struct ikglp_semaphore *sem,
 
         binheap_add(&node->node, &sem->donees, ikglp_donee_heap_node_t, node);
 
-//      TRACE_CUR("donees After:\n");
-//      print_donees(sem, sem->donees.root, 1);
+#if 0
+        TRACE_CUR("donees After:\n");
+        print_donees(sem, sem->donees.root, 1);
+#endif
 }
 
 
@@ -466,7 +476,7 @@ static void ikglp_refresh_owners_prio_decrease(struct fifo_queue *fq,
         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);
-        fq->nest.hp_waiter_eff_prio = fq->hp_waiter;
+        fq->nest.hp_waiter_eff_prio = effective_priority(fq->hp_waiter);
         binheap_add(&fq->nest.hp_binheap_node, &tsk_rt(owner)->hp_blocked_tasks,
                                 struct nested_info, hp_binheap_node);
 
@@ -571,6 +581,8 @@ static void ikglp_remove_donation_from_fq_waiter(struct task_struct *t,
 
         raw_spin_lock(&tsk_rt(t)->hp_blocked_tasks_lock);
 
+        TRACE_CUR("Removing donation from fq waiter %s\%d\n", t->comm, t->pid);
+
         old_max_eff_prio = top_priority(&tsk_rt(t)->hp_blocked_tasks);
 
         binheap_delete(n, &tsk_rt(t)->hp_blocked_tasks);
@@ -590,6 +602,10 @@ static void ikglp_remove_donation_from_fq_waiter(struct task_struct *t,
                         decreased_prio = NULL;
                 }
 
+                // no need to propagate decreased inheritance to AUX
+                // or klmirqd tasks since they cannot (should not) inherit
+                // a priority directly from us while we suspend on a litmus
+                // lock.
                 tsk_rt(t)->inh_task = decreased_prio;
         }
 
@@ -863,7 +879,7 @@ static void ikglp_enqueue_on_donor(struct ikglp_semaphore *sem,
                         ikglp_refresh_owners_prio_increase(donee, donee_fq, sem, flags);  // unlocks sem->lock
                 }
                 else {
-                        TRACE_TASK(t, "%s/%d is the owner. Progatating priority immediatly.\n",
+                        TRACE_TASK(t, "%s/%d is the owner. Propagating priority immediatly.\n",
                                            donee->comm, donee->pid);
                         litmus->nested_increase_prio(donee, new_prio, &sem->lock, flags);  // unlocks sem->lock and donee's heap lock
                 }
@@ -907,6 +923,8 @@ int ikglp_lock(struct litmus_lock* l)
         lock_global_irqsave(dgl_lock, flags);
         lock_fine_irqsave(&sem->lock, flags);
 
+        TRACE_CUR("Requesting a replica from lock %d.\n", l->ident);
+
         if(sem->nr_in_fifos < sem->m) {
                 // enqueue somwhere
 #ifdef CONFIG_LITMUS_AFFINITY_LOCKING
@@ -920,6 +938,8 @@ int ikglp_lock(struct litmus_lock* l)
                         // take available resource
                         replica = ikglp_get_idx(sem, fq);
 
+                        TRACE_CUR("Getting replica %d\n", replica);
+
                         ikglp_get_immediate(t, fq, sem, flags);  // unlocks sem->lock
 
                         unlock_global_irqrestore(dgl_lock, flags);
@@ -927,6 +947,8 @@ int ikglp_lock(struct litmus_lock* l)
                         goto acquired;
                 }
                 else {
+                        TRACE_CUR("Will go on FQ somewhere.\n");
+
                         wait.task = t;   // THIS IS CRITICALLY IMPORTANT!!!
 
                         tsk_rt(t)->blocked_lock = (struct litmus_lock*)sem;  // record where we are blocked
@@ -939,6 +961,8 @@ int ikglp_lock(struct litmus_lock* l)
                 }
         }
         else {
+                TRACE_CUR("Going on a heap.\n");
+
                 // donor!
                 wait.task = t;   // THIS IS CRITICALLY IMPORTANT!!!
 
@@ -949,12 +973,14 @@ int ikglp_lock(struct litmus_lock* l)
                 set_task_state(t, TASK_UNINTERRUPTIBLE);
 
                 if(litmus->__compare(ikglp_mth_highest(sem), BASE, t, BASE)) {
+                        TRACE_CUR("Going on PQ heap.\n");
                         // enqueue on PQ
                         ikglp_enqueue_on_pq(sem, &wait);
                         unlock_fine_irqrestore(&sem->lock, flags);
                 }
                 else {
                         // enqueue as donor
+                        TRACE_CUR("Going on donor heap.\n");
                         ikglp_enqueue_on_donor(sem, &wait, flags);       // unlocks sem->lock
                 }
         }
@@ -962,6 +988,8 @@ int ikglp_lock(struct litmus_lock* l)
         unlock_global_irqrestore(dgl_lock, flags);
         raw_spin_unlock_irqrestore(&sem->real_lock, real_flags);
 
+        TRACE_CUR("Suspending for replica.\n");
+
         TS_LOCK_SUSPEND;
 
         suspend_for_lock();
@@ -1368,7 +1396,6 @@ int ikglp_unlock(struct litmus_lock* l)
                 ikglp_move_donor_to_fq(sem, fq_of_new_on_fq, donor_info);
         }
         else if(!binheap_empty(&sem->donors)) {  // No donor, so move any donor to FQ
-                                                                                         // move other donor to FQ
                 // Select a donor
 #ifdef CONFIG_LITMUS_AFFINITY_LOCKING
                 other_donor_info = (sem->aff_obs) ?
@@ -1405,6 +1432,7 @@ int ikglp_unlock(struct litmus_lock* l)
                                    ikglp_get_idx(sem, fq_of_new_on_fq),
                                    ikglp_get_idx(sem, fq));
 
+
                 ikglp_move_donor_to_fq(sem, fq_of_new_on_fq, other_donor_info);
         }
         else if(!binheap_empty(&sem->priority_queue)) {  // No donors, so move PQ
@@ -1476,8 +1504,10 @@ int ikglp_unlock(struct litmus_lock* l)
         // 't' must drop all priority and clean up data structures before hand-off.
 
         // DROP ALL INHERITANCE.  IKGLP MUST BE OUTER-MOST
+        // This kills any inheritance from a donor.
         raw_spin_lock(&tsk_rt(t)->hp_blocked_tasks_lock);
         {
+                TRACE_TASK(t, "discarding _all_ inheritance because IKGLP is outermost\n");
                 int count = 0;
                 while(!binheap_empty(&tsk_rt(t)->hp_blocked_tasks)) {
                         binheap_delete_root(&tsk_rt(t)->hp_blocked_tasks,
@@ -1498,7 +1528,7 @@ int ikglp_unlock(struct litmus_lock* l)
         //   if(to_steal), update owner's prio (hp_waiter has already been set)
         //
 
-        BUG_ON((other_donor_info != NULL) && (to_steal != NULL));
+        BUG_ON(other_donor_info && to_steal);
 
         if(other_donor_info) {
                 struct fifo_queue *other_fq = other_donor_info->donee_info->fq;
@@ -1520,7 +1550,7 @@ int ikglp_unlock(struct litmus_lock* l)
                         lock_fine_irqsave(&sem->lock, flags);  // there should be no contention!!!!
                 }
                 else {
-                        TRACE_TASK(t, "Donee %s/%d is an blocked in of fq %d.\n",
+                        TRACE_TASK(t, "Donee %s/%d is blocked in of fq %d.\n",
                                            donee->comm, donee->pid,
                                            ikglp_get_idx(sem, other_fq));
 
@@ -1701,6 +1731,8 @@ wake_kludge:
 
         raw_spin_unlock_irqrestore(&sem->real_lock, real_flags);
 
+        TRACE_CUR("done with freeing replica.\n");
+
 out:
         return err;
 }
@@ -2967,12 +2999,3 @@ struct affinity_observer* ikglp_simple_gpu_aff_obs_new(struct affinity_observer_
 }
 
 #endif
-
-
-
-
-
-
-
-
-
diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index b3281e40df52..0d8773b2495f 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -415,7 +415,7 @@ static noinline void job_completion(struct task_struct *t, int forced)
 
         sched_trace_task_completion(t, forced);
 
-        TRACE_TASK(t, "job_completion().\n");
+        TRACE_TASK(t, "job_completion() at %llu.\n", litmus_clock());
 
 #ifdef CONFIG_LITMUS_LOCKING
         if (!is_persistent(t) && tsk_rt(t)->inh_task) {