Generalize IKGLP implementation

Generalized the IKGLP implementation to support non-optimal
configurations.  Parameters allow the IKGLP to be configured
as FIFO queues (aka KFMLP), a single priority queue, or
a hybrid (optimal IKGLP).  The maximum number of users within
the FIFO queues is also parameterized, allowing more than 'm'
replica holders to hold replicas concurrently (this breaks
optimality though).

Also fixed a bug in locking.c where DGL prority inheritance
is determined.

4 files changed, 43 insertions, 29 deletions

diff --git a/include/litmus/ikglp_lock.h b/include/litmus/ikglp_lock.h
index f9178d3dfba9..91a905a5d101 100644
--- a/include/litmus/ikglp_lock.h
+++ b/include/litmus/ikglp_lock.h
@@ -58,7 +58,7 @@ struct fifo_queue
         ikglp_donee_heap_node_t donee_heap_node;
 
         struct task_struct* hp_waiter;
-        int count; /* number of waiters + holder */
+        unsigned int count; /* number of waiters + holder */
 
         struct nested_info nest;
 };
@@ -70,14 +70,14 @@ struct ikglp_semaphore
         raw_spinlock_t  lock;
         raw_spinlock_t  real_lock;
 
-        int nr_replicas; // AKA k
-        int m;
+        unsigned int nr_replicas; // AKA k
+        unsigned int max_fifo_len; // max len of a fifo queue
 
-        int max_fifo_len; // max len of a fifo queue
-        int nr_in_fifos;
+        unsigned int max_in_fifos; // AKA m
+        unsigned int nr_in_fifos;
 
         struct binheap top_m;  // min heap, base prio
-        int top_m_size;  // number of nodes in top_m
+        unsigned int top_m_size;  // number of nodes in top_m
 
         struct binheap not_top_m; // max heap, base prio
 
@@ -103,7 +103,7 @@ int ikglp_lock(struct litmus_lock* l);
 int ikglp_unlock(struct litmus_lock* l);
 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);
+struct litmus_lock* ikglp_new(unsigned int m, struct litmus_lock_ops*, void* __user arg);
 
 
 
@@ -113,8 +113,8 @@ struct ikglp_queue_info
 {
         struct fifo_queue* q;
         lt_t estimated_len;
-        int *nr_cur_users;
-        int64_t *nr_aff_users;
+        unsigned int *nr_cur_users;
+        unsigned int *nr_aff_users;
 };
 
 struct ikglp_affinity_ops
@@ -138,12 +138,13 @@ struct ikglp_affinity
         struct affinity_observer obs;
         struct ikglp_affinity_ops *ops;
         struct ikglp_queue_info *q_info;
-        int *nr_cur_users_on_rsrc;
-        int64_t *nr_aff_on_rsrc;
-        int offset;
-        int nr_simult;
-        int nr_rsrc;
-        int relax_max_fifo_len;
+        unsigned int *nr_cur_users_on_rsrc;
+        unsigned int *nr_aff_on_rsrc;
+        unsigned int offset;
+        unsigned int nr_simult;
+        unsigned int nr_rsrc;
+
+        int relax_max_fifo_len:1;
 };
 
 static inline struct ikglp_affinity* ikglp_aff_obs_from_aff_obs(struct affinity_observer* aff_obs)
diff --git a/include/litmus/kfmlp_lock.h b/include/litmus/kfmlp_lock.h
index 3609a3a20424..2af953852e02 100644
--- a/include/litmus/kfmlp_lock.h
+++ b/include/litmus/kfmlp_lock.h
@@ -16,7 +16,7 @@ struct kfmlp_queue
         wait_queue_head_t wait;
         struct task_struct* owner;
         struct task_struct* hp_waiter;
-        int count; /* number of waiters + holder */
+        unsigned int count; /* number of waiters + holder */
 };
 
 struct kfmlp_semaphore
@@ -25,7 +25,7 @@ struct kfmlp_semaphore
 
         spinlock_t      lock;
 
-        int num_resources; /* aka k */
+        unsigned int num_resources; /* aka k */
 
         struct kfmlp_queue *queues; /* array */
         struct kfmlp_queue *shortest_queue; /* pointer to shortest queue */
@@ -52,7 +52,7 @@ struct kfmlp_queue_info
 {
         struct kfmlp_queue* q;
         lt_t estimated_len;
-        int *nr_cur_users;
+        unsigned int *nr_cur_users;
 };
 
 struct kfmlp_affinity_ops
@@ -71,10 +71,10 @@ struct kfmlp_affinity
         struct affinity_observer obs;
         struct kfmlp_affinity_ops *ops;
         struct kfmlp_queue_info *q_info;
-        int *nr_cur_users_on_rsrc;
-        int offset;
-        int nr_simult;
-        int nr_rsrc;
+        unsigned int *nr_cur_users_on_rsrc;
+        unsigned int offset;
+        unsigned int nr_simult;
+        unsigned int nr_rsrc;
 };
 
 static inline struct kfmlp_affinity* kfmlp_aff_obs_from_aff_obs(struct affinity_observer* aff_obs)
@@ -86,10 +86,9 @@ int kfmlp_aff_obs_close(struct affinity_observer*);
 void kfmlp_aff_obs_free(struct affinity_observer*);
 
 #ifdef CONFIG_LITMUS_NVIDIA
-struct affinity_observer* kfmlp_gpu_aff_obs_new(struct affinity_observer_ops*,
-                                                                                        void* __user arg);
-struct affinity_observer* kfmlp_simple_gpu_aff_obs_new(struct affinity_observer_ops*,
-                                                                                                void* __user arg);
+struct affinity_observer* kfmlp_gpu_aff_obs_new(
+        struct affinity_observer_ops*, void* __user arg);
+struct affinity_observer* kfmlp_simple_gpu_aff_obs_new(struct affinity_observer_ops*, void* __user arg);
 #endif
 
 #endif  /* end affinity */
diff --git a/include/litmus/locking.h b/include/litmus/locking.h
index fc437811d2b6..b9c6a2b1d01e 100644
--- a/include/litmus/locking.h
+++ b/include/litmus/locking.h
@@ -66,8 +66,9 @@ typedef struct dgl_wait_state {
 } dgl_wait_state_t;
 
 void wake_or_wait_on_next_lock(dgl_wait_state_t *dgl_wait);
-void select_next_lock(dgl_wait_state_t* dgl_wait /*, struct litmus_lock* prev_lock*/);
+struct litmus_lock* select_next_lock(dgl_wait_state_t* dgl_wait /*, struct litmus_lock* prev_lock*/);
 
+void init_dgl_wait_state(dgl_wait_state_t* dgl_wait);
 void init_dgl_waitqueue_entry(wait_queue_t *wq_node, dgl_wait_state_t* dgl_wait);
 int dgl_wake_up(wait_queue_t *wq_node, unsigned mode, int sync, void *key);
 struct task_struct* __waitqueue_dgl_remove_first(wait_queue_head_t *wq, dgl_wait_state_t** dgl_wait);
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 716fc034c5f4..c4cba8551c47 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -119,11 +119,24 @@ struct affinity_observer_args
 struct gpu_affinity_observer_args
 {
         struct affinity_observer_args obs;
-        int replica_to_gpu_offset;
-        int nr_simult_users;
+        unsigned int replica_to_gpu_offset;
+        unsigned int rho;
         int relaxed_rules;
 };
 
+
+#define IKGLP_M_IN_FIFOS (0u)
+#define IKGLP_UNLIMITED_IN_FIFOS (~0u)
+#define IKGLP_OPTIMAL_FIFO_LEN (0u)
+#define IKGLP_UNLIMITED_FIFO_LEN (~0u)
+
+struct ikglp_args
+{
+        unsigned int nr_replicas;
+        unsigned int max_in_fifos;
+        unsigned int max_fifo_len;
+};
+
 /* The definition of the data that is shared between the kernel and real-time
  * tasks via a shared page (see litmus/ctrldev.c).
  *