Integrate LITMUS^RT with try_to_wake_up() path

1 files changed, 20 insertions, 1 deletions

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index b6ff5df94241..e91eb050d2fb 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -86,6 +86,7 @@
 #include "../workqueue_internal.h"
 #include "../smpboot.h"
 
+#include <litmus/litmus.h>
 #include <litmus/trace.h>
 #include <litmus/sched_trace.h>
 void litmus_tick(struct rq*, struct task_struct*);
@@ -1464,7 +1465,12 @@ static void ttwu_queue(struct task_struct *p, int cpu)
         struct rq *rq = cpu_rq(cpu);
 
 #if defined(CONFIG_SMP)
-        if (sched_feat(TTWU_QUEUE) && !cpus_share_cache(smp_processor_id(), cpu)) {
+        /*
+         * LITMUS^RT: whether to send an IPI to the remote CPU is plugin
+         * specific.
+         */
+        if (!is_realtime(p) &&
+            sched_feat(TTWU_QUEUE) && !cpus_share_cache(smp_processor_id(), cpu)) {
                 sched_clock_cpu(cpu); /* sync clocks x-cpu */
                 ttwu_queue_remote(p, cpu);
                 return;
@@ -1497,6 +1503,9 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
         unsigned long flags;
         int cpu, success = 0;
 
+        if (is_realtime(p))
+                TRACE_TASK(p, "try_to_wake_up() state:%d\n", p->state);
+
         smp_wmb();
         raw_spin_lock_irqsave(&p->pi_lock, flags);
         if (!(p->state & state))
@@ -1520,6 +1529,12 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
          */
         smp_rmb();
 
+        /* LITMUS^RT: once the task can be safely referenced by this
+         * CPU, don't mess with Linux load balancing stuff.
+         */
+        if (is_realtime(p))
+                goto litmus_out_activate;
+
         p->sched_contributes_to_load = !!task_contributes_to_load(p);
         p->state = TASK_WAKING;
 
@@ -1531,12 +1546,16 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
                 wake_flags |= WF_MIGRATED;
                 set_task_cpu(p, cpu);
         }
+
+litmus_out_activate:
 #endif /* CONFIG_SMP */
 
         ttwu_queue(p, cpu);
 stat:
         ttwu_stat(p, cpu, wake_flags);
 out:
+        if (is_realtime(p))
+                TRACE_TASK(p, "try_to_wake_up() done state:%d\n", p->state);
         raw_spin_unlock_irqrestore(&p->pi_lock, flags);
 
         return success;