1 files changed, 44 insertions, 2 deletions

diff --git a/litmus/locking.c b/litmus/locking.c
index 0b5e162c0c02..4b8382cd77d1 100644
--- a/litmus/locking.c
+++ b/litmus/locking.c
@@ -365,6 +365,18 @@ static void snprintf_dgl(char* buf, size_t bsz, struct litmus_lock* dgl_locks[],
 #endif
 
 
+static int failed_owner(struct litmus_lock *cur_lock, struct task_struct *t)
+{
+        struct task_struct *cur_owner = cur_lock->ops->get_owner(cur_lock);
+        printk(KERN_EMERG "lock %d expected owner %s/%d but got %s/%d.\n",
+                                        cur_lock->ident,
+                                        (t) ? t->comm : "null",
+                                        (t) ? t->pid : 0,
+                                        (cur_owner) ? cur_owner->comm : "null",
+                                        (cur_owner) ? cur_owner->pid : 0);
+        BUG();
+}
+
 /* only valid when locks are prioq locks!!!
  * THE BIG DGL LOCK MUST BE HELD! */
 int __attempt_atomic_dgl_acquire(struct litmus_lock *cur_lock, dgl_wait_state_t *dgl_wait)
@@ -386,7 +398,9 @@ int __attempt_atomic_dgl_acquire(struct litmus_lock *cur_lock, dgl_wait_state_t
 
                 l->ops->dgl_quick_lock(l, cur_lock, dgl_wait->task, &dgl_wait->wq_nodes[i]);
 
-                BUG_ON(!(l->ops->is_owner(l, dgl_wait->task)));
+                if(!(l->ops->is_owner(l, dgl_wait->task)))
+                        failed_owner(l, dgl_wait->task);
+                //BUG_ON(!(l->ops->is_owner(l, dgl_wait->task)));
         }
 
         return 0; /* success */
@@ -564,7 +578,9 @@ all_acquired:
         // SANITY CHECK FOR TESTING
         for(i = 0; i < dgl_wait->size; ++i) {
                 struct litmus_lock *l = dgl_wait->locks[i];
-                BUG_ON(!l->ops->is_owner(l, dgl_wait->task));
+                if(!(l->ops->is_owner(l, dgl_wait->task)))
+                        failed_owner(l, dgl_wait->task);
+                //BUG_ON(!l->ops->is_owner(l, dgl_wait->task));
         }
 
         TRACE_CUR("Acquired entire DGL\n");
@@ -830,8 +846,25 @@ void suspend_for_lock(void)
         }
 #endif
 
+#if defined(CONFIG_LITMUS_AFFINITY_LOCKING) && defined(CONFIG_LITMUS_NVIDIA)
+        // disable tracking
+        if(tsk_rt(t)->held_gpus) {
+                tsk_rt(t)->suspend_gpu_tracker_on_block = 1;
+        }
+#endif
+        
         schedule();
 
+        
+        /* TODO: Move the following to wake_up_for_lock()? */
+        
+#if defined(CONFIG_LITMUS_AFFINITY_LOCKING) && defined(CONFIG_LITMUS_NVIDIA)
+        // re-enable tracking
+        if(tsk_rt(t)->held_gpus) {
+                tsk_rt(t)->suspend_gpu_tracker_on_block = 0;
+        }
+#endif
+        
 #ifdef CONFIG_LITMUS_NVIDIA
         if (gpu_restore) {
                 /* restore our state */
@@ -847,6 +880,15 @@ void suspend_for_lock(void)
 #endif
 }
 
+int wake_up_for_lock(struct task_struct* t)
+{
+        int ret;
+        
+        ret = wake_up_process(t);
+        
+        return ret;
+}
+
 
 #else  // CONFIG_LITMUS_LOCKING