Call curr_plugin->finish_switch() after every task switch.

GSN-EDF needs to be called after every task switch. This patch changes the
existing plugins to handle the changed behavior.

6 files changed, 15 insertions, 5 deletions

diff --git a/include/linux/sched_plugin.h b/include/linux/sched_plugin.h
index 59e9e2f353..5c223695ab 100644
--- a/include/linux/sched_plugin.h
+++ b/include/linux/sched_plugin.h
@@ -38,9 +38,8 @@ typedef reschedule_check_t (*scheduler_tick_t) (void);
 typedef int (*schedule_t) (struct task_struct * prev, 
                            struct task_struct ** next,
                            runqueue_t * rq);
-/* clean up after the task switch has occured
- * it is guaranteed that the function is only called if prev is a real-time
- * task
+/* Clean up after the task switch has occured.
+ * This function is called after every (even non-rt) task switch.
  */
 typedef void (*finish_switch_t)(struct task_struct *prev);
 
diff --git a/kernel/sched.c b/kernel/sched.c
index aa4a9e9426..1e1a9cfd4d 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1846,8 +1846,7 @@ static inline void finish_task_switch(struct rq *rq, struct task_struct *prev)
         /* Requeue previous real-time task before we drop the rq lock, cause
          * that may lead to a preemption.
          */
-        if (is_realtime(prev) && prev_state == TASK_RUNNING)
-                curr_sched_plugin->finish_switch(prev);
+        curr_sched_plugin->finish_switch(prev);
         sched_trace_task_scheduled(current);
         finish_lock_switch(rq, prev);
         if (mm)
diff --git a/kernel/sched_edf_hsb.c b/kernel/sched_edf_hsb.c
index 5ba9be8acf..d190426ff8 100644
--- a/kernel/sched_edf_hsb.c
+++ b/kernel/sched_edf_hsb.c
@@ -1438,6 +1438,9 @@ static inline void hsb_add_ready(struct task_struct *t)
  */
 static void hsb_finish_switch(struct task_struct *prev) 
 {
+        if (!is_realtime(prev) || !is_running(prev))
+                return;
+
         TRACE("finish switch for %d\n", prev->pid);
 
         if (is_be(prev)) {
diff --git a/kernel/sched_global_edf.c b/kernel/sched_global_edf.c
index ac4201a872..0781de139e 100644
--- a/kernel/sched_global_edf.c
+++ b/kernel/sched_global_edf.c
@@ -255,6 +255,9 @@ static int gedf_schedule(struct task_struct * prev,
  */
 static void gedf_finish_switch(struct task_struct *prev) 
 {
+        if (!is_realtime(prev) || !is_running(prev))
+                return;
+
         /*printk(KERN_INFO "gedf finish switch for %d\n", prev->pid);*/
         if (get_rt_flags(prev) == RT_F_SLEEP || 
             get_rt_mode() != MODE_RT_RUN) {
diff --git a/kernel/sched_part_edf.c b/kernel/sched_part_edf.c
index 3a93e5aa34..cdc75165b2 100644
--- a/kernel/sched_part_edf.c
+++ b/kernel/sched_part_edf.c
@@ -167,6 +167,9 @@ static void part_edf_finish_switch(struct task_struct *prev)
 {
         edf_domain_t*   edf = &__get_cpu_var(part_edf_domains).domain;
 
+        if (!is_realtime(prev) || !is_running(prev))
+                return;
+
         if (get_rt_flags(prev) == RT_F_SLEEP || 
             get_rt_mode() != MODE_RT_RUN) {
                 /* this task has expired
diff --git a/kernel/sched_pfair.c b/kernel/sched_pfair.c
index 1c36ba5892..5f6cf1f496 100644
--- a/kernel/sched_pfair.c
+++ b/kernel/sched_pfair.c
@@ -288,6 +288,9 @@ out:
 
 static void pfair_finish_task_switch(struct task_struct *t)
 {
+        if (!is_realtime(t) || !is_running(prev))
+                return;
+
         queue_lock(&pfair.pfair_lock);
         /* Release in real-time mode only,
          * if the mode is non real-time, then