make klmirqd work like aux tasks. checkpoint.

this code is untested!

1 files changed, 38 insertions, 127 deletions

diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index 44c8336c5061..84aafca78cde 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -44,6 +44,7 @@
 
 #include <litmus/bheap.h>
 #include <litmus/binheap.h>
+#include <litmus/trace.h>
 
 #ifdef CONFIG_LITMUS_LOCKING
 #include <litmus/kfmlp_lock.h>
@@ -75,7 +76,6 @@
 
 #ifdef CONFIG_LITMUS_PAI_SOFTIRQD
 #include <linux/interrupt.h>
-#include <litmus/trace.h>
 #endif
 
 #ifdef CONFIG_LITMUS_NVIDIA
@@ -118,14 +118,6 @@ DEFINE_PER_CPU(cpu_entry_t, cedf_cpu_entries);
 #define test_will_schedule(cpu) \
         (atomic_read(&per_cpu(cedf_cpu_entries, cpu).will_schedule))
 
-#ifdef CONFIG_LITMUS_PAI_SOFTIRQD
-struct tasklet_head
-{
-        struct tasklet_struct *head;
-        struct tasklet_struct **tail;
-};
-#endif
-
 /*
  * In C-EDF there is a cedf domain _per_ cluster
  * The number of clusters is dynamically determined accordingly to the
@@ -1038,6 +1030,13 @@ static void cedf_task_wake_up(struct task_struct *task)
         }
 #endif
 
+#ifdef CONFIG_LITMUS_NVIDIA
+        if (tsk_rt(task)->held_gpus && !tsk_rt(task)->hide_from_gpu) {
+                TRACE_CUR("%s/%d is ready so gpu klmirqd tasks may not inherit.\n", task->comm, task->pid);
+                disable_gpu_owner(task);
+        }
+#endif
+
         cedf_job_arrival(task);
         raw_spin_unlock_irqrestore(&cluster->cluster_lock, flags);
 }
@@ -1064,6 +1063,14 @@ static void cedf_task_block(struct task_struct *t)
         }
 #endif
 
+#ifdef CONFIG_LITMUS_NVIDIA
+        if (tsk_rt(t)->held_gpus && !tsk_rt(t)->hide_from_gpu) {
+
+                TRACE_CUR("%s/%d is blocked so aux tasks may inherit.\n", t->comm, t->pid);
+                enable_gpu_owner(t);
+        }
+#endif
+
         raw_spin_unlock_irqrestore(&cluster->cluster_lock, flags);
 
         BUG_ON(!is_realtime(t));
@@ -1092,6 +1099,13 @@ static void cedf_task_exit(struct task_struct * t)
         }
 #endif
 
+#ifdef CONFIG_LITMUS_NVIDIA
+        /* make sure we clean up on our way out */
+        if(tsk_rt(t)->held_gpus) {
+                disable_gpu_owner(t);
+        }
+#endif
+
         unlink(t);
         if (tsk_rt(t)->scheduled_on != NO_CPU) {
                 cpu_entry_t *cpu;
@@ -1208,6 +1222,13 @@ static int __increase_priority_inheritance(struct task_struct* t,
                                 aux_task_owner_increase_priority(t);
                         }
 #endif
+
+#ifdef CONFIG_LITMUS_NVIDIA
+                        /* propagate to gpu klmirqd */
+                        if (tsk_rt(t)->held_gpus) {
+                                gpu_owner_increase_priority(t);
+                        }
+#endif
                 }
 #ifdef CONFIG_LITMUS_NESTED_LOCKING
         }
@@ -1237,16 +1258,6 @@ static void increase_priority_inheritance(struct task_struct* t, struct task_str
 
         __increase_priority_inheritance(t, prio_inh);
 
-#ifdef CONFIG_LITMUS_SOFTIRQD
-        if(tsk_rt(t)->cur_klmirqd != NULL)
-        {
-                TRACE_TASK(t, "%s/%d inherits a new priority!\n",
-                                   tsk_rt(t)->cur_klmirqd->comm, tsk_rt(t)->cur_klmirqd->pid);
-
-                __increase_priority_inheritance(tsk_rt(t)->cur_klmirqd, prio_inh);
-        }
-#endif
-
         raw_spin_unlock(&cluster->cluster_lock);
 
 #if defined(CONFIG_LITMUS_PAI_SOFTIRQD) && defined(CONFIG_LITMUS_NVIDIA)
@@ -1320,6 +1331,13 @@ static int __decrease_priority_inheritance(struct task_struct* t,
                 }
 #endif
 
+#ifdef CONFIG_LITMUS_NVIDIA
+                /* propagate to gpu */
+                if (tsk_rt(t)->held_gpus) {
+                        gpu_owner_decrease_priority(t);
+                }
+#endif
+
 #ifdef CONFIG_LITMUS_NESTED_LOCKING
         }
         else {
@@ -1346,16 +1364,6 @@ static void decrease_priority_inheritance(struct task_struct* t,
         raw_spin_lock(&cluster->cluster_lock);
         __decrease_priority_inheritance(t, prio_inh);
 
-#ifdef CONFIG_LITMUS_SOFTIRQD
-        if(tsk_rt(t)->cur_klmirqd != NULL)
-        {
-                TRACE_TASK(t, "%s/%d decreases in priority!\n",
-                                   tsk_rt(t)->cur_klmirqd->comm, tsk_rt(t)->cur_klmirqd->pid);
-
-                __decrease_priority_inheritance(tsk_rt(t)->cur_klmirqd, prio_inh);
-        }
-#endif
-
         raw_spin_unlock(&cluster->cluster_lock);
 
 #if defined(CONFIG_LITMUS_PAI_SOFTIRQD) && defined(CONFIG_LITMUS_NVIDIA)
@@ -1371,73 +1379,6 @@ static void decrease_priority_inheritance(struct task_struct* t,
 }
 
 
-
-
-
-#ifdef CONFIG_LITMUS_SOFTIRQD
-/* called with IRQs off */
-static void increase_priority_inheritance_klmirqd(struct task_struct* klmirqd,
-                                                                                          struct task_struct* old_owner,
-                                                                                          struct task_struct* new_owner)
-{
-        cedf_domain_t* cluster = task_cpu_cluster(klmirqd);
-
-        BUG_ON(!(tsk_rt(klmirqd)->is_proxy_thread));
-
-        raw_spin_lock(&cluster->cluster_lock);
-
-        if(old_owner != new_owner)
-        {
-                if(old_owner)
-                {
-                        // unreachable?
-                        tsk_rt(old_owner)->cur_klmirqd = NULL;
-                }
-
-                TRACE_TASK(klmirqd, "giving ownership to %s/%d.\n",
-                                   new_owner->comm, new_owner->pid);
-
-                tsk_rt(new_owner)->cur_klmirqd = klmirqd;
-        }
-
-        __decrease_priority_inheritance(klmirqd, NULL);  // kludge to clear out cur prio.
-
-        __increase_priority_inheritance(klmirqd,
-                        (tsk_rt(new_owner)->inh_task == NULL) ?
-                                new_owner :
-                                tsk_rt(new_owner)->inh_task);
-
-        raw_spin_unlock(&cluster->cluster_lock);
-}
-
-
-/* called with IRQs off */
-static void decrease_priority_inheritance_klmirqd(struct task_struct* klmirqd,
-                                                                                                   struct task_struct* old_owner,
-                                                                                                   struct task_struct* new_owner)
-{
-        cedf_domain_t* cluster = task_cpu_cluster(klmirqd);
-
-        BUG_ON(!(tsk_rt(klmirqd)->is_proxy_thread));
-
-        raw_spin_lock(&cluster->cluster_lock);
-
-    TRACE_TASK(klmirqd, "priority restored\n");
-
-        __decrease_priority_inheritance(klmirqd, new_owner);
-
-        tsk_rt(old_owner)->cur_klmirqd = NULL;
-
-        raw_spin_unlock(&cluster->cluster_lock);
-}
-#endif // CONFIG_LITMUS_SOFTIRQD
-
-
-
-
-
-
-
 #ifdef CONFIG_LITMUS_NESTED_LOCKING
 
 /* called with IRQs off */
@@ -1836,33 +1777,7 @@ static long cedf_activate_plugin(void)
         }
 
 #ifdef CONFIG_LITMUS_SOFTIRQD
-        {
-                /* distribute the daemons evenly across the clusters. */
-                int* affinity = kmalloc(NR_LITMUS_SOFTIRQD * sizeof(int), GFP_ATOMIC);
-                int num_daemons_per_cluster = NR_LITMUS_SOFTIRQD / num_clusters;
-                int left_over = NR_LITMUS_SOFTIRQD % num_clusters;
-
-                int daemon = 0;
-                for(i = 0; i < num_clusters; ++i)
-                {
-                        int num_on_this_cluster = num_daemons_per_cluster;
-                        if(left_over)
-                        {
-                                ++num_on_this_cluster;
-                                --left_over;
-                        }
-
-                        for(j = 0; j < num_on_this_cluster; ++j)
-                        {
-                                // first CPU of this cluster
-                                affinity[daemon++] = i*cluster_size;
-                        }
-                }
-
-                spawn_klmirqd(affinity);
-
-                kfree(affinity);
-        }
+        init_klmirqd();
 #endif
 
 #ifdef CONFIG_LITMUS_NVIDIA
@@ -1906,10 +1821,6 @@ static struct sched_plugin cedf_plugin __cacheline_aligned_in_smp = {
 #ifdef CONFIG_LITMUS_AFFINITY_LOCKING
         .allocate_aff_obs = cedf_allocate_affinity_observer,
 #endif
-#ifdef CONFIG_LITMUS_SOFTIRQD
-        .increase_prio_klmirqd = increase_priority_inheritance_klmirqd,
-        .decrease_prio_klmirqd = decrease_priority_inheritance_klmirqd,
-#endif
 #ifdef CONFIG_LITMUS_PAI_SOFTIRQD
         .enqueue_pai_tasklet = cedf_enqueue_pai_tasklet,
         .change_prio_pai_tasklet = cedf_change_prio_pai_tasklet,