P-FP: add release master support

1 files changed, 28 insertions, 9 deletions

diff --git a/litmus/sched_pfp.c b/litmus/sched_pfp.c
index fb7433dacf40..926c391e7c34 100644
--- a/litmus/sched_pfp.c
+++ b/litmus/sched_pfp.c
@@ -389,12 +389,6 @@ static unsigned int pfp_get_srp_prio(struct task_struct* t)
         return get_priority(t);
 }
 
-static long pfp_activate_plugin(void)
-{
-        get_srp_prio = pfp_get_srp_prio;
-        return 0;
-}
-
 /* ******************** FMLP support ********************** */
 
 /* struct for semaphore with priority inheritance */
@@ -593,10 +587,35 @@ static long pfp_allocate_lock(struct litmus_lock **lock, int type,
 
 static long pfp_admit_task(struct task_struct* tsk)
 {
-        return task_cpu(tsk) == tsk->rt_param.task_params.cpu
-                && get_priority(tsk) > 0 ? 0 : -EINVAL;
+        if (task_cpu(tsk) == tsk->rt_param.task_params.cpu &&
+#ifdef CONFIG_RELEASE_MASTER
+            /* don't allow tasks on release master CPU */
+            task_cpu(tsk) != remote_dom(task_cpu(tsk))->release_master &&
+#endif
+            get_priority(tsk) > 0)
+                return 0;
+        else
+                return -EINVAL;
 }
 
+static long pfp_activate_plugin(void)
+{
+#ifdef CONFIG_RELEASE_MASTER
+        int cpu;
+
+        for_each_online_cpu(cpu) {
+                remote_dom(cpu)->release_master = atomic_read(&release_master_cpu);
+        }
+#endif
+
+#ifdef CONFIG_LITMUS_LOCKING
+        get_srp_prio = pfp_get_srp_prio;
+#endif
+
+        return 0;
+}
+
+
 /*      Plugin object   */
 static struct sched_plugin pfp_plugin __cacheline_aligned_in_smp = {
         .plugin_name            = "P-FP",
@@ -608,9 +627,9 @@ static struct sched_plugin pfp_plugin __cacheline_aligned_in_smp = {
         .task_wake_up           = pfp_task_wake_up,
         .task_block             = pfp_task_block,
         .admit_task             = pfp_admit_task,
+        .activate_plugin        = pfp_activate_plugin,
 #ifdef CONFIG_LITMUS_LOCKING
         .allocate_lock          = pfp_allocate_lock,
-        .activate_plugin        = pfp_activate_plugin,
 #endif
 };