Implement GPU-affinity-aware kfmlp (untested)

1 files changed, 13 insertions, 0 deletions

diff --git a/litmus/locking.c b/litmus/locking.c
index 6d28efe97c91..ef13062913ce 100644
--- a/litmus/locking.c
+++ b/litmus/locking.c
@@ -10,6 +10,10 @@
 #include <linux/uaccess.h>
 #endif
 
+#if defined(CONFIG_LITMUS_AFFINITY_LOCKING) && defined(CONFIG_LITMUS_NVIDIA)
+#include <litmus/gpu_affinity.h>
+#endif
+
 static int create_generic_lock(void** obj_ref, obj_type_t type, void* __user arg);
 static int open_generic_lock(struct od_table_entry* entry, void* __user arg);
 static int close_generic_lock(struct od_table_entry* entry);
@@ -50,6 +54,7 @@ static  int create_generic_lock(void** obj_ref, obj_type_t type, void* __user ar
                 INIT_BINHEAP_NODE(&lock->nest.hp_binheap_node);
                 WARN_ON(!(lock->nest.hp_waiter_ptr));
 #endif
+                lock->type = type;              
                 lock->ident = atomic_inc_return(&lock_id_gen);
                 *obj_ref = lock;
     }
@@ -292,6 +297,14 @@ static long do_litmus_dgl_lock(dgl_wait_state_t *dgl_wait)
 
                 TRACE_CUR("As many as %d locks in DGL are pending. Suspending.\n",
                                   dgl_wait->nr_remaining);
+                
+#if defined(CONFIG_LITMUS_AFFINITY_LOCKING) && defined(CONFIG_LITMUS_NVIDIA)
+                // KLUDGE: don't count this suspension as time in the critical gpu
+                // critical section
+                if(tsk_rt(dgl_wait->task)->held_gpus) {
+                        tsk_rt(dgl_wait->task)->suspend_gpu_tracker_on_block = 1;
+                }
+#endif          
 
                 // note reverse order.  see comments in select_next_lock for reason.
                 for(i = dgl_wait->size - 1; i >= 0; --i) {