Fix edge cases in initialization and state tracking

Adds missing allocations in init and starts fixing some bad
tracking of container->scheduled in g_finish_switch(), plus
some fixes for migrating tasks and background scheduling.

1 files changed, 29 insertions, 13 deletions

diff --git a/litmus/sched_edfsc.c b/litmus/sched_edfsc.c
index 10ebf7c098f4..b7ae97d38267 100644
--- a/litmus/sched_edfsc.c
+++ b/litmus/sched_edfsc.c
@@ -73,6 +73,13 @@ u64 sys_util, future_sys_util;
 #define from_fp(a) ((a) >> FP_SHIFT)
 #define fp_div(a, b) (to_fp((a)) / (b))
 
+// We need these from litmus.c for partially initializing our container tasks
+struct release_heap* release_heap_alloc(int gfp_flags);
+void release_heap_free(struct release_heap* rh);
+struct bheap_node* bheap_node_alloc(int gfp_flags);
+void bheap_node_free(struct bheap_node* hn);
+
+
 /* Do a backwards comparison based on future_f_util so that heavier containers
  * will come first
  */
@@ -134,7 +141,7 @@ static void preempt(cpu_entry_t *entry)
  */
 
 static struct bheap_node* edfsc_cpu_heap_node;
-static struct bheap       edfsc_cpu_heap;
+static struct bheap edfsc_cpu_heap;
 
 static int cpu_lower_prio(struct bheap_node *_a, struct bheap_node *_b)
 {
@@ -1204,6 +1211,7 @@ static void edfsc_setup_domain_proc(void)
 static long edfsc_activate_plugin(void)
 {
         lt_t now;
+        int i;
         now = litmus_clock();
         /* TODO This will need to:
          * - Initialize the containers and container tasks
@@ -1212,6 +1220,9 @@ static long edfsc_activate_plugin(void)
          *   be reusable if we don't destroy them when the plugin is deactivated)
          * - ...
          */
+        for (i = 0; i < num_online_cpus(); i++)
+                requeue(&container_tasks[i]);
+
         // Start the container boundary timer
         hrtimer_start(&container_release_timer,
                         ns_to_ktime(now + LITMUS_QUANTUM_LENGTH_NS),
@@ -1306,12 +1317,14 @@ static int __init init_edfsc(void)
                         HRTIMER_MODE_ABS_PINNED);
         container_release_timer.function = container_boundary;
 
-        container_tasks = kmalloc(sizeof(struct task_struct) * num_online_cpus(), GFP_KERNEL);  
+        container_tasks = kmalloc(sizeof(struct task_struct) * num_online_cpus(), GFP_KERNEL);
         container_domains = kmalloc(sizeof(cont_domain_t) * num_online_cpus(), GFP_KERNEL);
-        container_list = kmalloc(sizeof(cont_domain_t*) * num_online_cpus(), GFP_KERNEL);       
-        
+        container_list = kmalloc(sizeof(cont_domain_t*) * num_online_cpus(), GFP_KERNEL);
         edfsc_cpu_heap_node = kmalloc(sizeof(struct bheap_node) * num_online_cpus(), GFP_KERNEL);
 
+        memset(container_tasks, 0, sizeof(struct task_struct) * num_online_cpus());
+        memset(container_domains, 0, sizeof(cont_domain_t) * num_online_cpus());
+
         // Initialize container domains
         for (i = 0; i < num_online_cpus(); i++) {
                 edf_domain_init(&container_domains[i].domain, c_check_resched, NULL);
@@ -1320,7 +1333,7 @@ static int __init init_edfsc(void)
                 hrtimer_init(&(container_domains[i].idle_enforcement_timer), CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
                 container_domains[i].idle_enforcement_timer.function = on_idle_enforcement_timeout;
 
-                container_tasks[i].policy = SCHED_LITMUS;
+
                 tsk_rt(&container_tasks[i])->scheduled_on = NO_CPU;
                 tsk_rt(&container_tasks[i])->task_params.exec_cost = LITMUS_QUANTUM_LENGTH_NS / 2;
                 tsk_rt(&container_tasks[i])->task_params.period =
@@ -1332,15 +1345,19 @@ static int __init init_edfsc(void)
                 tsk_rt(&container_tasks[i])->domain = &gsched_domain;
                 tsk_rt(&container_tasks[i])->edfsc_params.domain = &container_domains[i];
                 tsk_rt(&container_tasks[i])->edfsc_params.can_release = 0;
-
                 tsk_rt(&container_tasks[i])->sporadic_release = 0;
-
-                tsk_rt(&container_tasks[i])->heap_node = kmalloc(sizeof(struct bheap_node), GFP_KERNEL);
-                bheap_node_init(&tsk_rt(&container_tasks[i])->heap_node, &container_tasks[i]);
-                requeue(&container_tasks[i]);
-                
                 tsk_rt(&container_tasks[i])->edfsc_params.id = i;
-                // TODO maybe more to do?
+                tsk_rt(&container_tasks[i])->heap_node = bheap_node_alloc(GFP_ATOMIC);
+                tsk_rt(&container_tasks[i])->rel_heap = release_heap_alloc(GFP_ATOMIC);
+
+                if (!tsk_rt(&container_tasks[i])->heap_node || !tsk_rt(&container_tasks[i])->rel_heap) {
+                        printk(KERN_WARNING "litmus: no more heap node memory!?\n");
+                        return -ENOMEM;
+                } else {
+                        bheap_node_init(&tsk_rt(&container_tasks[i])->heap_node, &container_tasks[i]);
+                }
+
+                container_tasks[i].policy = SCHED_LITMUS;
 
                 // Populate the container_list while we're at it.
                 container_list[i] = &container_domains[i];
@@ -1355,7 +1372,6 @@ static int __init init_edfsc(void)
                 entry->scheduled = NULL;
         }
 
-
         return register_sched_plugin(&edfsc_plugin);
 }