4 files changed, 104 insertions, 8 deletions

diff --git a/include/litmus/fdso.h b/include/litmus/fdso.h
index e1a0ac24b8a2..f7887288d8f5 100644
--- a/include/litmus/fdso.h
+++ b/include/litmus/fdso.h
@@ -35,7 +35,9 @@ typedef enum  {
         KFMLP_SIMPLE_GPU_AFF_OBS        = 11,
         KFMLP_GPU_AFF_OBS                       = 12,
 
-        MAX_OBJ_TYPE    = 12
+        PRIOQ_MUTEX = 13,
+        
+        MAX_OBJ_TYPE    = 13
 } obj_type_t;
 
 struct inode_obj_id {
@@ -84,6 +86,6 @@ static inline void* od_lookup(int od, obj_type_t type)
 #define lookup_ics(od)     ((struct ics*)           od_lookup(od, ICS_ID))
 
 #define lookup_fifo_mutex(od)((struct litmus_lock*)  od_lookup(od, FIFO_MUTEX))
-
+#define lookup_prioq_mutex(od)((struct litmus_lock*)  od_lookup(od, PRIOQ_MUTEX))
 
 #endif
diff --git a/include/litmus/locking.h b/include/litmus/locking.h
index cc62fa0cb044..660bfc7f8174 100644
--- a/include/litmus/locking.h
+++ b/include/litmus/locking.h
@@ -11,6 +11,7 @@ struct nested_info
         struct litmus_lock *lock;
         struct task_struct *hp_waiter_eff_prio;
         struct task_struct **hp_waiter_ptr;
+        struct task_struct **owner_ptr;
     struct binheap_node hp_binheap_node;
 };
 
@@ -30,6 +31,8 @@ struct litmus_lock_proc_ops {
         void (*remove)(struct litmus_lock *l);
 };
 
+
+
 /* Generic base struct for LITMUS^RT userspace semaphores.
  * This structure should be embedded in protocol-specific semaphores.
  */
@@ -41,10 +44,8 @@ struct litmus_lock {
 
 #ifdef CONFIG_LITMUS_NESTED_LOCKING
         struct nested_info nest;
-//#ifdef CONFIG_DEBUG_SPINLOCK
         char cheat_lockdep[2];
         struct lock_class_key key;
-//#endif
 #endif
 
         struct litmus_lock_proc_ops *proc;
@@ -71,7 +72,32 @@ void select_next_lock(dgl_wait_state_t* dgl_wait /*, struct litmus_lock* prev_lo
 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);
 void __waitqueue_dgl_remove_first(wait_queue_head_t *wq, dgl_wait_state_t** dgl_wait, struct task_struct **task);
+
+
+int __attempt_atomic_dgl_acquire(struct litmus_lock *cur_lock, dgl_wait_state_t *dgl_wait);
+#endif
+
+
+
+
+static inline struct task_struct* get_queued_task(wait_queue_t* q)
+{
+        struct task_struct *queued;
+#ifdef CONFIG_LITMUS_DGL_SUPPORT
+        if(q->func == dgl_wake_up) {
+                dgl_wait_state_t *dgl_wait = (dgl_wait_state_t*) q->private;
+                queued = dgl_wait->task;
+        }
+        else {
+                queued = (struct task_struct*) q->private;
+        }
+#else
+        queued = (struct task_struct*) q->private;
 #endif
+        return queued;
+}
+
+
 
 typedef int (*lock_op_t)(struct litmus_lock *l);
 typedef lock_op_t lock_close_t;
@@ -94,16 +120,22 @@ struct litmus_lock_ops {
         /* The lock is no longer being referenced (mandatory method). */
         lock_free_t deallocate;
 
+        
 #ifdef CONFIG_LITMUS_NESTED_LOCKING
         void (*propagate_increase_inheritance)(struct litmus_lock* l, struct task_struct* t, raw_spinlock_t* to_unlock, unsigned long irqflags);
         void (*propagate_decrease_inheritance)(struct litmus_lock* l, struct task_struct* t, raw_spinlock_t* to_unlock, unsigned long irqflags);
 #endif
 
+        
 #ifdef CONFIG_LITMUS_DGL_SUPPORT
         raw_spinlock_t* (*get_dgl_spin_lock)(struct litmus_lock *l);
         int (*dgl_lock)(struct litmus_lock *l, dgl_wait_state_t* dgl_wait, wait_queue_t* wq_node);
         int (*is_owner)(struct litmus_lock *l, struct task_struct *t);
         void (*enable_priority)(struct litmus_lock *l, dgl_wait_state_t* dgl_wait);
+        
+        int (*dgl_can_quick_lock)(struct litmus_lock *l, struct task_struct *t);
+        void (*dgl_quick_lock)(struct litmus_lock *l, struct litmus_lock *cur_lock,
+                  struct task_struct* t, wait_queue_t *q);
 #endif
 };
 
diff --git a/include/litmus/prioq_lock.h b/include/litmus/prioq_lock.h
new file mode 100644
index 000000000000..f3c11d241991
--- /dev/null
+++ b/include/litmus/prioq_lock.h
@@ -0,0 +1,61 @@
+#ifndef LITMUS_PRIOQ_H
+#define LITMUS_PRIOQ_H
+
+#include <litmus/litmus.h>
+#include <litmus/binheap.h>
+#include <litmus/locking.h>
+
+/* struct for semaphore with priority inheritance */
+struct prioq_mutex {
+        struct litmus_lock litmus_lock;
+
+        /* current resource holder */
+        struct task_struct *owner;
+
+        /* highest-priority waiter */
+        struct task_struct *hp_waiter;
+
+        /* priority-ordered queue of waiting tasks.
+         * Ironically, we don't use a binheap because that would make DGL
+         * implementation a LOT harder. */
+        wait_queue_head_t       wait;
+
+        /* we do some nesting within spinlocks, so we can't use the normal
+         sleeplocks found in wait_queue_head_t. */
+        raw_spinlock_t          lock;
+};
+
+static inline struct prioq_mutex* prioq_mutex_from_lock(struct litmus_lock* lock)
+{
+        return container_of(lock, struct prioq_mutex, litmus_lock);
+}
+
+#ifdef CONFIG_LITMUS_DGL_SUPPORT
+int prioq_mutex_is_owner(struct litmus_lock *l, struct task_struct *t);
+int prioq_mutex_dgl_lock(struct litmus_lock *l, dgl_wait_state_t* dgl_wait, wait_queue_t* wq_node);
+void prioq_mutex_enable_priority(struct litmus_lock *l, dgl_wait_state_t* dgl_wait);
+void prioq_mutex_dgl_quick_lock(struct litmus_lock *l, struct litmus_lock *cur_lock,
+                                                                struct task_struct* t, wait_queue_t *q);
+int prioq_mutex_dgl_can_quick_lock(struct litmus_lock *l, struct task_struct *t);
+#endif
+
+void prioq_mutex_propagate_increase_inheritance(struct litmus_lock* l,
+                                                                                          struct task_struct* t,
+                                                                                          raw_spinlock_t* to_unlock,
+                                                                                          unsigned long irqflags);
+
+void prioq_mutex_propagate_decrease_inheritance(struct litmus_lock* l,
+                                                                                          struct task_struct* t,
+                                                                                          raw_spinlock_t* to_unlock,
+                                                                                          unsigned long irqflags);
+
+
+int prioq_mutex_lock(struct litmus_lock* l);
+int prioq_mutex_unlock(struct litmus_lock* l);
+int prioq_mutex_close(struct litmus_lock* l);
+void prioq_mutex_free(struct litmus_lock* l);
+struct litmus_lock* prioq_mutex_new(struct litmus_lock_ops*);
+
+
+#endif
+
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 144be3b6ee3d..716fc034c5f4 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -312,10 +312,6 @@ struct rt_param {
 
         gpu_migration_dist_t    gpu_migration;
         int                             last_gpu;
-
-        notify_rsrc_exit_t      rsrc_exit_cb;
-        void* rsrc_exit_cb_args;
-
         lt_t accum_gpu_time;
         lt_t gpu_time_stamp;
 
@@ -323,6 +319,11 @@ struct rt_param {
 #endif
 #endif
 
+#ifdef CONFIG_LITMUS_AFFINITY_LOCKING
+        notify_rsrc_exit_t  rsrc_exit_cb;
+        void* rsrc_exit_cb_args;
+#endif
+
 #ifdef CONFIG_LITMUS_LOCKING
         /* Is the task being priority-boosted by a locking protocol? */
         unsigned int            priority_boosted:1;