Merge branch 'wip-edf-wm' into wip-semi-part

This version of litmus2010 contains the implementation of three
semi-partitioned scheduling algorithms: EDF-fm, EDF-WM, and NPS-F.

Conflicts:
	include/litmus/rt_param.h
	litmus/Makefile

2 files changed, 72 insertions, 10 deletions

diff --git a/include/litmus/rt_domain.h b/include/litmus/rt_domain.h
index 59e6b54e9281..ac249292e866 100644
--- a/include/litmus/rt_domain.h
+++ b/include/litmus/rt_domain.h
@@ -143,12 +143,26 @@ static inline struct task_struct* take_ready(rt_domain_t* rt)
 static inline void add_release(rt_domain_t* rt, struct task_struct *task)
 {
         unsigned long flags;
-        /* first we need the write lock for rt_ready_queue */
         raw_spin_lock_irqsave(&rt->tobe_lock, flags);
         __add_release(rt, task);
         raw_spin_unlock_irqrestore(&rt->tobe_lock, flags);
 }
 
+#ifdef CONFIG_RELEASE_MASTER
+void __add_release_on(rt_domain_t* rt, struct task_struct *task,
+                      int target_cpu);
+
+static inline void add_release_on(rt_domain_t* rt,
+                                  struct task_struct *task,
+                                  int target_cpu)
+{
+        unsigned long flags;
+        raw_spin_lock_irqsave(&rt->tobe_lock, flags);
+        __add_release_on(rt, task, target_cpu);
+        raw_spin_unlock_irqrestore(&rt->tobe_lock, flags);
+}
+#endif
+
 static inline int __jobs_pending(rt_domain_t* rt)
 {
         return !bheap_empty(&rt->ready_queue);
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index be8f5528ff87..6f43deacb3e1 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -1,3 +1,5 @@
+#include <linux/threads.h>
+
 /*
  * Definition of the scheduler plugin interface.
  *
@@ -34,7 +36,7 @@ typedef enum {
 } budget_policy_t;
 
 
-/* Parameters for EDF-Fm scheduling algorithm.
+/* The parameters for EDF-Fm scheduling algorithm.
  * Each task may be fixed or migratory. Migratory tasks may
  * migrate on 2 (contiguous) CPU only. NR_CPUS_EDF_FM = 2.
  */
@@ -58,7 +60,7 @@ struct edffm_params {
         lt_t            fraction[2][NR_CPUS_EDF_FM];
 };
 
-/* NPS-F semi-part. plugin.
+/* Parameters for NPS-F semi-partitioned scheduling algorithm.
  * Each (cpu, budget) entry defines the share ('budget' in ns, a % of
  * the slot_length) of the notional processor on the CPU 'cpu'.
  * This structure is used by the library - syscall interface in order
@@ -69,6 +71,36 @@ struct npsf_budgets {
         lt_t    budget;
 };
 
+/* The parameters for the EDF-WM semi-partitioned scheduler.
+ * Each task may be split across multiple cpus. Each per-cpu allocation
+ * is called a 'slice'.
+ */
+#define MAX_EDF_WM_SLICES 24
+#define MIN_EDF_WM_SLICE_SIZE 50000 /* .05 millisecond = 50us */
+
+struct edf_wm_slice {
+        /* on which CPU is this slice allocated */
+        unsigned int cpu;
+        /* relative deadline from job release (not from slice release!) */
+        lt_t deadline;
+        /* budget of this slice; must be precisely enforced */
+        lt_t budget;
+        /* offset of this slice relative to the job release */
+        lt_t offset;
+};
+
+/* If a job is not sliced across multiple CPUs, then
+ * count is set to zero and none of the slices is used.
+ * This implies that count == 1 is illegal.
+ */
+struct edf_wm_params {
+        /* enumeration of all slices */
+        struct edf_wm_slice slices[MAX_EDF_WM_SLICES];
+
+        /* how many slices are defined? */
+        unsigned int count;
+};
+
 struct rt_task {
         lt_t            exec_cost;
         lt_t            period;
@@ -81,11 +113,16 @@ struct rt_task {
         union {
                 /* EDF-Fm; defined in sched_edf_fm.c */
                 struct edffm_params fm;
-                /* NPS-F: id for the server (notional processor) that holds
+
+                /* NPS-F; defined in sched_npsf.c
+                 * id for the server (notional processor) that holds
                  * this task; the same npfs_id can be assigned to "the same"
                  * server split on different cpus
-                 * */
+                 */
                 int npsf_id;
+
+                /* EDF-WM; defined in sched_edf_wm.c */
+                struct edf_wm_params wm;
         } semi_part;
 };
 
@@ -234,12 +271,23 @@ struct rt_param {
 
         /* runtime info for the semi-part plugins */
         union {
+                /* EDF-Fm runtime information
+                 * number of jobs handled by this cpu
+                 * (to determine next cpu for a migrating task)
+                 */
+                unsigned int    cpu_job_no[NR_CPUS_EDF_FM];
+
+                /* EDF-WM runtime information */
                 struct {
-                        /* EDF-fm: number of jobs handled by this cpu
-                         * (to determine next cpu for a migrating task)
-                         */
-                        unsigned int    cpu_job_no[NR_CPUS_EDF_FM];
-                } fm;
+                        /* at which exec time did the current slice start? */
+                        lt_t exec_time;
+                        /* when did the job suspend? */
+                        lt_t suspend_time;
+                        /* cached job parameters */
+                        lt_t job_release, job_deadline;
+                        /* pointer to the current slice */
+                        struct edf_wm_slice* slice;
+                } wm;
         } semi_part;
 };