Merge branch 'wip-cedf-merge-master'

2 files changed, 31 insertions, 13 deletions

diff --git a/litmus/litmus.c b/litmus/litmus.c
index 8b8f2c171a5e..5bf848386e1c 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -582,8 +582,10 @@ static int proc_read_cluster_size(char *page, char **start,
                 len = snprintf(page, PAGE_SIZE, "L2\n");
         else if (cluster_cache_index == 3)
                 len = snprintf(page, PAGE_SIZE, "L3\n");
-        else /* (cluster_cache_index == 1) */
+        else if (cluster_cache_index == 1)
                 len = snprintf(page, PAGE_SIZE, "L1\n");
+        else
+                len = snprintf(page, PAGE_SIZE, "ALL\n");
 
         return len;
 }
@@ -617,6 +619,8 @@ static int proc_write_cluster_size(struct file *file,
                 cluster_cache_index = 3;
         else if (!strcmp(cache_name, "L1"))
                 cluster_cache_index = 1;
+        else if (!strcmp(cache_name, "ALL"))
+                cluster_cache_index = num_online_cpus();
         else
                 printk(KERN_INFO "Cluster '%s' is unknown.\n", cache_name);
 
diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index 76706a29245e..e57a11afda16 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -12,10 +12,14 @@
  *   the programmer needs to be aware of the topology to place tasks
  *   in the desired cluster
  * - default clustering is around L2 cache (cache index = 2)
- *   supported clusters are: L1 (private cache: pedf), L2, L3
+ *   supported clusters are: L1 (private cache: pedf), L2, L3, ALL (all
+ *   online_cpus are placed in a single cluster).
  *
  *   For details on functions, take a look at sched_gsn_edf.c
  *
+ * Currently, we do not support changes in the number of online cpus.
+ * If the num_online_cpus() dynamically changes, the plugin is broken.
+ *
  * This version uses the simple approach and serializes all scheduling
  * decisions by the use of a queue lock. This is probably not the
  * best way to do it, but it should suffice for now.
@@ -642,17 +646,23 @@ static long cedf_activate_plugin(void)
         if(!zalloc_cpumask_var(&mask, GFP_ATOMIC))
                 return -ENOMEM;
 
-        chk = get_shared_cpu_map(mask, 0, cluster_cache_index);
-        if (chk) {
-                /* if chk != 0 then it is the max allowed index */
-                printk(KERN_INFO "C-EDF: Cannot support cache index = %d\n",
-                                cluster_cache_index);
-                printk(KERN_INFO "C-EDF: Using cache index = %d\n",
-                                chk);
-                cluster_cache_index = chk;
-        }
+        if (unlikely(cluster_cache_index == num_online_cpus())) {
+
+                cluster_size = num_online_cpus();
+        } else {
 
-        cluster_size = cpumask_weight(mask);
+                chk = get_shared_cpu_map(mask, 0, cluster_cache_index);
+                if (chk) {
+                        /* if chk != 0 then it is the max allowed index */
+                        printk(KERN_INFO "C-EDF: Cannot support cache index = %d\n",
+                                        cluster_cache_index);
+                        printk(KERN_INFO "C-EDF: Using cache index = %d\n",
+                                        chk);
+                        cluster_cache_index = chk;
+                }
+
+                cluster_size = cpumask_weight(mask);
+        }
 
         if ((num_online_cpus() % cluster_size) != 0) {
                 /* this can't be right, some cpus are left out */
@@ -695,7 +705,11 @@ static long cedf_activate_plugin(void)
 
                         /* this cpu isn't in any cluster */
                         /* get the shared cpus */
-                        get_shared_cpu_map(mask, cpu, cluster_cache_index);
+                        if (unlikely(cluster_cache_index == num_online_cpus()))
+                                cpumask_copy(mask, cpu_online_mask);
+                        else
+                                get_shared_cpu_map(mask, cpu, cluster_cache_index);
+
                         cpumask_copy(cedf[i].cpu_map, mask);
 #ifdef VERBOSE_INIT
                         print_cluster_topology(mask, cpu);