Added hooks for IKGLP affinity and a little logic.

simple IKGLP is already done.  it does:
1) auto gpu de/registration.
2) distruption amongst simultanous users across queues
3) calls default IKGLP routines when appropriate.

Remaining work:
1) FQ advisement.
2) Donor stealing advisement.
3) Donee selection advisement.

1 files changed, 21 insertions, 18 deletions

diff --git a/litmus/kfmlp_lock.c b/litmus/kfmlp_lock.c
index d0a6bd364c43..0b64977789a6 100644
--- a/litmus/kfmlp_lock.c
+++ b/litmus/kfmlp_lock.c
@@ -5,13 +5,13 @@
 #include <litmus/sched_plugin.h>
 #include <litmus/fdso.h>
 
-#include <litmus/kfmlp_lock.h>
-
 #if defined(CONFIG_LITMUS_AFFINITY_LOCKING) && defined(CONFIG_LITMUS_NVIDIA)
 #include <litmus/gpu_affinity.h>
 #include <litmus/nvidia_info.h>
 #endif
 
+#include <litmus/kfmlp_lock.h>
+
 static inline int kfmlp_get_idx(struct kfmlp_semaphore* sem,
                                                                 struct kfmlp_queue* queue)
 {
@@ -508,6 +508,10 @@ struct litmus_lock* kfmlp_new(struct litmus_lock_ops* ops, void* __user args)
 
         sem->shortest_queue = &sem->queues[0];
 
+#ifdef CONFIG_LITMUS_AFFINITY_LOCKING
+        sem->aff_obs = NULL;
+#endif
+
         return &sem->litmus_lock;
 }
 
@@ -584,7 +588,7 @@ static struct affinity_observer* kfmlp_aff_obs_new(struct affinity_observer_ops*
         }
 
         if(aff_args.nr_simult_users > NV_MAX_SIMULT_USERS) {
-                TRACE_CUR("System does not support #simult_users >%d.  %d requested.\n",
+                TRACE_CUR("System does not support #simult_users > %d. %d requested.\n",
                                   NV_MAX_SIMULT_USERS, aff_args.nr_simult_users);
                 return(NULL);
         }
@@ -628,7 +632,6 @@ static struct affinity_observer* kfmlp_aff_obs_new(struct affinity_observer_ops*
         // attach observer to the lock
         spin_lock_irqsave(&sem->lock, flags);
         sem->aff_obs = kfmlp_aff;
-        //kfmlp_aff->shortest_queue = &kfmlp_aff->q_info[kfmlp_get_idx(sem, sem->shortest_queue)];
         spin_unlock_irqrestore(&sem->lock, flags);
 
         return &kfmlp_aff->obs;
@@ -646,20 +649,20 @@ static int gpu_replica_to_resource(struct kfmlp_affinity* aff,
 
 // Smart KFMLP Affinity
 
-static inline struct kfmlp_queue_info* kfmlp_aff_find_shortest(struct kfmlp_affinity* aff)
-{
-        struct kfmlp_semaphore *sem = kfmlp_from_lock(aff->obs.lock);
-        struct kfmlp_queue_info *shortest = &aff->q_info[0];
-        int i;
-
-        for(i = 1; i < sem->num_resources; ++i) {
-                if(aff->q_info[i].estimated_len < shortest->estimated_len) {
-                        shortest = &aff->q_info[i];
-                }
-        }
-
-        return(shortest);
-}
+//static inline struct kfmlp_queue_info* kfmlp_aff_find_shortest(struct kfmlp_affinity* aff)
+//{
+//      struct kfmlp_semaphore *sem = kfmlp_from_lock(aff->obs.lock);
+//      struct kfmlp_queue_info *shortest = &aff->q_info[0];
+//      int i;
+//
+//      for(i = 1; i < sem->num_resources; ++i) {
+//              if(aff->q_info[i].estimated_len < shortest->estimated_len) {
+//                      shortest = &aff->q_info[i];
+//              }
+//      }
+//
+//      return(shortest);
+//}
 
 struct kfmlp_queue* gpu_kfmlp_advise_enqueue(struct kfmlp_affinity* aff, struct task_struct* t)
 {