WIP snapshot

2 files changed, 31 insertions, 11 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index b1fd83dbfb47..1f5327f8c012 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4660,9 +4660,6 @@ static int __sched_setscheduler(struct task_struct *p, int policy,
         struct rq *rq;
         int reset_on_fork;
 
-        if (litmus->pre_setsched)
-                litmus->pre_setsched(p, policy);
-
         /* may grab non-irq protected spin_locks */
         BUG_ON(in_interrupt());
 recheck:
@@ -4853,6 +4850,13 @@ do_sched_setscheduler(pid_t pid, int policy, struct sched_param __user *param)
         if (copy_from_user(&lparam, param, sizeof(struct sched_param)))
                 return -EFAULT;
 
+#ifdef CONFIG_LITMUS_LOCKING
+        /* Hack to allow plugin to call into schedule
+         * prio to a setscheduler() call. */
+        if (is_realtime(current))
+                litmus->pre_setsched(current, policy);
+#endif
+
         rcu_read_lock();
         retval = -ESRCH;
         p = find_process_by_pid(pid);
diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index f9df2b098493..58c748774a95 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -995,14 +995,30 @@ static void cedf_task_block(struct task_struct *t)
 #ifdef CONFIG_LITMUS_LOCKING
 static void cedf_pre_setsched(struct task_struct *t, int policy)
 {
-        /* we can only handle current atm */
-        if (is_realtime(t) && t == current) {
-                TRACE_CUR("cedf_pre_setsched\n");
-
-                /* Pretend to issue a request to make sure
-                 * we are no longer a priority donor. */
-                priodon_become_eligible();
-                priodon_complete_request();
+
+        unsigned long flags;
+        cedf_domain_t *cluster = task_cpu_cluster(t);
+
+        int delay_donor_exit = 0;
+
+        while (1) {
+                raw_spin_lock_irqsave(&cluster->cluster_lock, flags);
+
+                TRACE_CUR("cedf_pre_setsched wait:%u pend:%d donor:%u req:%u\n",
+                          tsk_rt(t)->waiting_eligible,
+                          tsk_rt(t)->pending_on, tsk_rt(t)->is_donor,
+                          tsk_rt(t)->request_incomplete);
+
+                delay_donor_exit = tsk_rt(current)->is_donor;
+
+                raw_spin_unlock_irqrestore(&cluster->cluster_lock, flags);
+
+                if (!delay_donor_exit)
+                        break;
+
+                TRACE_CUR("donor exit delay\n");
+                set_current_state(TASK_INTERRUPTIBLE);
+                schedule_timeout(HZ);
         }
 }
 #endif