Integrate LITMUS^RT scheduling class with sched_setscheduler

1 files changed, 32 insertions, 2 deletions

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index d54b6d6cfc2c..afc134d73fcc 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -89,6 +89,7 @@
 #include <litmus/litmus.h>
 #include <litmus/trace.h>
 #include <litmus/sched_trace.h>
+#include <litmus/sched_plugin.h>
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/sched.h>
@@ -3909,7 +3910,9 @@ __setscheduler(struct rq *rq, struct task_struct *p, int policy, int prio)
         p->normal_prio = normal_prio(p);
         /* we are holding p->pi_lock already */
         p->prio = rt_mutex_getprio(p);
-        if (rt_prio(p->prio))
+        if (p->policy == SCHED_LITMUS)
+                p->sched_class = &litmus_sched_class;
+        else if (rt_prio(p->prio))
                 p->sched_class = &rt_sched_class;
         else
                 p->sched_class = &fair_sched_class;
@@ -3940,6 +3943,7 @@ static int __sched_setscheduler(struct task_struct *p, int policy,
         const struct sched_class *prev_class;
         struct rq *rq;
         int reset_on_fork;
+        int litmus_task = 0;
 
         /* may grab non-irq protected spin_locks */
         BUG_ON(in_interrupt());
@@ -3954,7 +3958,7 @@ recheck:
 
                 if (policy != SCHED_FIFO && policy != SCHED_RR &&
                                 policy != SCHED_NORMAL && policy != SCHED_BATCH &&
-                                policy != SCHED_IDLE)
+                                policy != SCHED_IDLE && policy != SCHED_LITMUS)
                         return -EINVAL;
         }
 
@@ -3969,6 +3973,8 @@ recheck:
                 return -EINVAL;
         if (rt_policy(policy) != (param->sched_priority != 0))
                 return -EINVAL;
+        if (policy == SCHED_LITMUS && policy == p->policy)
+                return -EINVAL;
 
         /*
          * Allow unprivileged RT tasks to decrease priority:
@@ -4012,6 +4018,12 @@ recheck:
                         return retval;
         }
 
+        if (policy == SCHED_LITMUS) {
+                retval = litmus_admit_task(p);
+                if (retval)
+                        return retval;
+        }
+
         /*
          * make sure no PI-waiters arrive (or leave) while we are
          * changing the priority of the task:
@@ -4068,10 +4080,25 @@ recheck:
 
         p->sched_reset_on_fork = reset_on_fork;
 
+        if (p->policy == SCHED_LITMUS) {
+                litmus_exit_task(p);
+                litmus_task = 1;
+        }
+
         oldprio = p->prio;
         prev_class = p->sched_class;
         __setscheduler(rq, p, policy, param->sched_priority);
 
+        if (policy == SCHED_LITMUS) {
+#ifdef CONFIG_SMP
+                p->rt_param.stack_in_use = running ? rq->cpu : NO_CPU;
+#else
+                p->rt_param.stack_in_use = running ? 0 : NO_CPU;
+#endif
+                p->rt_param.present = running;
+                litmus->task_new(p, on_rq, running);
+        }
+
         if (running)
                 p->sched_class->set_curr_task(rq);
         if (on_rq)
@@ -4082,6 +4109,9 @@ recheck:
 
         rt_mutex_adjust_pi(p);
 
+        if (litmus_task)
+                litmus_dealloc(p);
+
         return 0;
 }