5 files changed, 76 insertions, 8 deletions

diff --git a/include/litmus/fdso.h b/include/litmus/fdso.h
index b92c1a3f004f..552a1e731672 100644
--- a/include/litmus/fdso.h
+++ b/include/litmus/fdso.h
@@ -24,11 +24,12 @@ typedef enum  {
         IKGLP_SEM       = 3,
         KFMLP_SEM       = 4,
 
-        IKGLP_GPU_AFF_OBS = 5,
-        KFMLP_SIMPLE_GPU_AFF_OBS = 6,
-        KFMLP_GPU_AFF_OBS = 7,
+        IKGLP_SIMPLE_GPU_AFF_OBS = 5,
+        IKGLP_GPU_AFF_OBS = 6,
+        KFMLP_SIMPLE_GPU_AFF_OBS = 7,
+        KFMLP_GPU_AFF_OBS = 8,
         
-        MAX_OBJ_TYPE    = 7
+        MAX_OBJ_TYPE    = 8
 } obj_type_t;
 
 struct inode_obj_id {
diff --git a/include/litmus/ikglp_lock.h b/include/litmus/ikglp_lock.h
index c0cc04db1bc6..2a75a1719815 100644
--- a/include/litmus/ikglp_lock.h
+++ b/include/litmus/ikglp_lock.h
@@ -5,6 +5,12 @@
 #include <litmus/binheap.h>
 #include <litmus/locking.h>
 
+#ifdef CONFIG_LITMUS_AFFINITY_LOCKING
+#include <litmus/kexclu_affinity.h>
+
+struct ikglp_affinity;
+#endif
+
 typedef struct ikglp_heap_node
 {
         struct task_struct *task;
@@ -81,6 +87,10 @@ struct ikglp_semaphore
         struct fifo_queue *fifo_queues; // array nr_replicas in length
         struct binheap_handle priority_queue;   // max-heap, base prio
         struct binheap_handle donors;   // max-heap, base prio
+        
+#ifdef CONFIG_LITMUS_AFFINITY_LOCKING
+        struct ikglp_affinity *aff_obs;
+#endif  
 };
 
 static inline struct ikglp_semaphore* ikglp_from_lock(struct litmus_lock* lock)
@@ -94,4 +104,55 @@ int ikglp_close(struct litmus_lock* l);
 void ikglp_free(struct litmus_lock* l);
 struct litmus_lock* ikglp_new(int m, struct litmus_lock_ops*, void* __user arg);
 
+
+
+#if defined(CONFIG_LITMUS_AFFINITY_LOCKING) && defined(CONFIG_LITMUS_NVIDIA)
+
+struct ikglp_queue_info
+{
+        struct fifo_queue* q;
+        lt_t estimated_len;
+        int *nr_cur_users;
+};
+
+struct ikglp_affinity_ops
+{
+        struct fifo_queue* (*advise_enqueue)(struct ikglp_affinity* aff, struct task_struct* t);        // select FIFO
+        struct task_struct* (*advise_steal)(struct ikglp_affinity* aff, wait_queue_t** to_steal, struct fifo_queue** to_steal_from);    // select steal from FIFO
+        struct task_struct* (*advise_donee_selection)(struct ikglp_affinity* aff, wait_queue_t** donee, struct fifo_queue** donee_queue);       // select a donee
+        struct task_struct* (*advise_doner_to_fq)(struct ikglp_affinity* aff, ikglp_wait_state_t** donor);      // select a donor to move to PQ
+        
+        void (*notify_enqueue)(struct ikglp_affinity* aff, struct fifo_queue* fq, struct task_struct* t);       // fifo enqueue
+        void (*notify_dequeue)(struct ikglp_affinity* aff, struct fifo_queue* fq, struct task_struct* t);       // fifo dequeue
+        void (*notify_acquired)(struct ikglp_affinity* aff, struct fifo_queue* fq, struct task_struct* t);      // replica acquired
+        void (*notify_freed)(struct ikglp_affinity* aff, struct fifo_queue* fq, struct task_struct* t);         // replica freed
+        int (*replica_to_resource)(struct ikglp_affinity* aff, struct fifo_queue* fq);          // convert a replica # to a GPU (includes offsets and simult user folding)
+};
+
+struct ikglp_affinity
+{
+        struct affinity_observer obs;
+        struct ikglp_affinity_ops *ops; 
+        struct fifo_queue *q_info;
+        int *nr_cur_users_on_rsrc;
+        int offset;
+        int nr_simult;
+        int nr_rsrc;
+};
+
+static inline struct ikglp_affinity* ikglp_aff_obs_from_aff_obs(struct affinity_observer* aff_obs)
+{
+        return container_of(aff_obs, struct ikglp_affinity, obs);
+}
+
+int ikglp_aff_obs_close(struct affinity_observer*);
+void ikglp_aff_obs_free(struct affinity_observer*);
+struct affinity_observer* ikglp_gpu_aff_obs_new(struct affinity_observer_ops*,
+                                                                                                void* __user arg);
+struct affinity_observer* ikglp_simple_gpu_aff_obs_new(struct affinity_observer_ops*,
+                                                                                                void* __user arg);
+#endif
+
+
+
 #endif
diff --git a/include/litmus/kfmlp_lock.h b/include/litmus/kfmlp_lock.h
index 614cccad5307..6d7e24b2a3ad 100644
--- a/include/litmus/kfmlp_lock.h
+++ b/include/litmus/kfmlp_lock.h
@@ -6,6 +6,8 @@
 
 #ifdef CONFIG_LITMUS_AFFINITY_LOCKING
 #include <litmus/kexclu_affinity.h>
+
+struct kfmlp_affinity;
 #endif
 
 /* struct for semaphore with priority inheritance */
@@ -50,10 +52,9 @@ struct kfmlp_queue_info
 {
         struct kfmlp_queue* q;
         lt_t estimated_len;
+        int *nr_cur_users;
 };
 
-struct kfmlp_affinity;
-
 struct kfmlp_affinity_ops
 {
         struct kfmlp_queue* (*advise_enqueue)(struct kfmlp_affinity* aff, struct task_struct* t);
@@ -62,6 +63,7 @@ struct kfmlp_affinity_ops
         void (*notify_dequeue)(struct kfmlp_affinity* aff, struct kfmlp_queue* fq, struct task_struct* t);
         void (*notify_acquired)(struct kfmlp_affinity* aff, struct kfmlp_queue* fq, struct task_struct* t);
         void (*notify_freed)(struct kfmlp_affinity* aff, struct kfmlp_queue* fq, struct task_struct* t);
+        int (*replica_to_resource)(struct kfmlp_affinity* aff, struct kfmlp_queue* fq);
 };
 
 struct kfmlp_affinity
@@ -69,8 +71,10 @@ struct kfmlp_affinity
         struct affinity_observer obs;
         struct kfmlp_affinity_ops *ops; 
         struct kfmlp_queue_info *q_info;
-        struct kfmlp_queue_info *shortest_queue;
+        int *nr_cur_users_on_rsrc;
         int offset;
+        int nr_simult;
+        int nr_rsrc;
 };
 
 static inline struct kfmlp_affinity* kfmlp_aff_obs_from_aff_obs(struct affinity_observer* aff_obs)
diff --git a/include/litmus/nvidia_info.h b/include/litmus/nvidia_info.h
index 856c575374d3..580728051d4e 100644
--- a/include/litmus/nvidia_info.h
+++ b/include/litmus/nvidia_info.h
@@ -9,6 +9,7 @@
 
 //#define NV_DEVICE_NUM NR_LITMUS_SOFTIRQD
 #define NV_DEVICE_NUM CONFIG_NV_DEVICE_NUM
+#define NV_MAX_SIMULT_USERS CONFIG_NV_MAX_SIMULT_USERS
 
 int init_nvidia_info(void);
 
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 11f081527545..e832ffcba17c 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -59,10 +59,11 @@ struct affinity_observer_args
         int lock_od;
 };
 
-struct kfmlp_gpu_affinity_observer_args
+struct gpu_affinity_observer_args
 {
         struct affinity_observer_args obs;
         int replica_to_gpu_offset;
+        int nr_simult_users;
 };
 
 /* The definition of the data that is shared between the kernel and real-time